improvements/fixings

diff --git a/include/enotify.php b/include/enotify.php
index 0e91ca7..0777a72 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -31,7 +31,7 @@ use Friendica\Protocol\Activity;
 function notification($params)
 {
        /** @var string the common prefix of a notification subject */
-       $SUBJECT_PREFIX = DI::l10n()->t('[Friendica:Notify]');
+       $subjectPrefix = DI::l10n()->t('[Friendica:Notify]');
 
        // Temporary logging for finding the origin
        if (!isset($params['uid'])) {
@@ -109,7 +109,7 @@ function notification($params)
                $itemlink = $siteurl.'/message/'.$params['item']['id'];
                $params["link"] = $itemlink;
 
-               $subject = $l10n->t( '%s New mail received at %s', $SUBJECT_PREFIX, $sitename);
+               $subject = $l10n->t( '%s New mail received at %s', $subjectPrefix, $sitename);
 
                $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
                $epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]');
@@ -198,11 +198,11 @@ function notification($params)
                // Before this we have the name of the replier on the subject rendering
                // different subjects for messages on the same thread.
                if ($params['activity']['explicit_tagged']) {
-                       $subject = $l10n->t('%s %s tagged you', $SUBJECT_PREFIX, $params['source_name']);
+                       $subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']);
 
                        $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
                } else {
-                       $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $SUBJECT_PREFIX, $parent_id, $params['source_name']);
+                       $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $subjectPrefix, $parent_id, $params['source_name']);
 
                        $preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']);
                }
@@ -216,7 +216,7 @@ function notification($params)
        }
 
        if ($params['type'] == Notify\Type::WALL) {
-               $subject = $l10n->t('%s %s posted to your profile wall', $SUBJECT_PREFIX, $params['source_name']);
+               $subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']);
 
                $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]',
@@ -231,7 +231,7 @@ function notification($params)
        }
 
        if ($params['type'] == Notify\Type::SHARE) {
-               $subject = $l10n->t('%s Friendica:Notify] %s shared a new post', $SUBJECT_PREFIX, $params['source_name']);
+               $subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $params['source_name']);
 
                $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url].',
@@ -246,7 +246,7 @@ function notification($params)
        }
 
        if ($params['type'] == Notify\Type::POKE) {
-               $subject = $l10n->t('%s %1$s poked you', $SUBJECT_PREFIX, $params['source_name']);
+               $subject = $l10n->t('%s %1$s poked you', $subjectPrefix, $params['source_name']);
 
                $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].',
@@ -266,7 +266,7 @@ function notification($params)
 
        if ($params['type'] == Notify\Type::TAG_SHARE) {
                $itemlink =  $params['link'];
-               $subject = $l10n->t('%s %s tagged your post', $SUBJECT_PREFIX, $params['source_name']);
+               $subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']);
 
                $preamble = $l10n->t('%1$s tagged your post at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('%1$s tagged [url=%2$s]your post[/url]',
@@ -281,7 +281,7 @@ function notification($params)
 
        if ($params['type'] == Notify\Type::INTRO) {
                $itemlink = $params['link'];
-               $subject = $l10n->t('%s Introduction received', $SUBJECT_PREFIX);
+               $subject = $l10n->t('%s Introduction received', $subjectPrefix);
 
                $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
@@ -298,7 +298,7 @@ function notification($params)
                switch ($params['verb']) {
                        case Activity::FRIEND:
                                // someone started to share with user (mostly OStatus)
-                               $subject = $l10n->t('%s A new person is sharing with you', $SUBJECT_PREFIX);
+                               $subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix);
 
                                $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
                                $epreamble = $l10n->t('%1$s is sharing with you at %2$s',
@@ -308,7 +308,7 @@ function notification($params)
                                break;
                        case Activity::FOLLOW:
                                // someone started to follow the user (mostly OStatus)
-                               $subject = $l10n->t('%s You have a new follower', $SUBJECT_PREFIX);
+                               $subject = $l10n->t('%s You have a new follower', $subjectPrefix);
 
                                $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
                                $epreamble = $l10n->t('You have a new follower at %2$s : %1$s',
@@ -324,7 +324,7 @@ function notification($params)
 
        if ($params['type'] == Notify\Type::SUGGEST) {
                $itemlink =  $params['link'];
-               $subject = $l10n->t('%s Friend suggestion received', $SUBJECT_PREFIX);
+               $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
 
                $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
                $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
@@ -345,7 +345,7 @@ function notification($params)
        if ($params['type'] == Notify\Type::CONFIRM) {
                if ($params['verb'] == Activity::FRIEND) { // mutual connection
                        $itemlink =  $params['link'];
-                       $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX);
+                       $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
 
                        $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
                        $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
@@ -360,7 +360,7 @@ function notification($params)
                        $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
                } else { // ACTIVITY_FOLLOW
                        $itemlink =  $params['link'];
-                       $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX);
+                       $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
 
                        $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
                        $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',