add the module to the page title

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 027293d4f3a9b3c957046cb6f415c55ce2bf5750..e02c61383136f5350b01af64928883c5715e924c 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -20,7 +20,11 @@ function notification($params) {
        $siteurl = $a->get_baseurl(true);
        $thanks = t('Thank You,');
        $sitename = $a->config['sitename'];
-       $site_admin = sprintf( t('%s Administrator'), $sitename);
+       if (!x($a->config['admin_name'])) {
+           $site_admin = sprintf( t('%s Administrator'), $sitename);
+       } else {
+           $site_admin = sprintf( t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
+       }
        $nickname = "";
 
        $sender_name = $sitename;
@@ -297,7 +301,7 @@ function notification($params) {
        if($params['type'] == NOTIFY_CONFIRM) {
                if ($params['verb'] == ACTIVITY_FRIEND ){ // mutual connection
                        $subject = sprintf( t('[Friendica:Notify] Connection accepted'));
-                       $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename);
+                       $preamble = sprintf( t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
                        $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'),
                                                                        $itemlink,
                                                                        '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
@@ -310,7 +314,7 @@ function notification($params) {
                        $itemlink =  $params['link'];
                } else { // ACTIVITY_FOLLOW
                        $subject = sprintf( t('[Friendica:Notify] Connection accepted'));
-                       $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename);
+                       $preamble = sprintf( t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
                        $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'),
                                                                        $itemlink,
                                                                        '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');