From 951b7179af35dd5a0a1544b76b9e04c66c9bae44 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:30:34 +0100 Subject: [PATCH] Move [Friendica:Notify] to a own PREFIX variable --- include/enotify.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 96630ca3ec..0e91ca7da1 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -30,6 +30,9 @@ use Friendica\Protocol\Activity; */ function notification($params) { + /** @var string the common prefix of a notification subject */ + $SUBJECT_PREFIX = DI::l10n()->t('[Friendica:Notify]'); + // Temporary logging for finding the origin if (!isset($params['uid'])) { Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]); @@ -106,7 +109,7 @@ function notification($params) $itemlink = $siteurl.'/message/'.$params['item']['id']; $params["link"] = $itemlink; - $subject = $l10n->t('[Friendica:Notify] New mail received at %s', $sitename); + $subject = $l10n->t( '%s New mail received at %s', $SUBJECT_PREFIX, $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]'); @@ -195,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('[Friendica:Notify] %s tagged you', $params['source_name']); + $subject = $l10n->t('%s %s tagged you', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename); } else { - $subject = $l10n->t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']); + $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $SUBJECT_PREFIX, $parent_id, $params['source_name']); $preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']); } @@ -213,7 +216,7 @@ function notification($params) } if ($params['type'] == Notify\Type::WALL) { - $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']); + $subject = $l10n->t('%s %s posted to your profile wall', $SUBJECT_PREFIX, $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]', @@ -228,7 +231,7 @@ function notification($params) } if ($params['type'] == Notify\Type::SHARE) { - $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']); + $subject = $l10n->t('%s Friendica:Notify] %s shared a new post', $SUBJECT_PREFIX, $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].', @@ -243,7 +246,7 @@ function notification($params) } if ($params['type'] == Notify\Type::POKE) { - $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']); + $subject = $l10n->t('%s %1$s poked you', $SUBJECT_PREFIX, $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].', @@ -263,7 +266,7 @@ function notification($params) if ($params['type'] == Notify\Type::TAG_SHARE) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] %s tagged your post', $params['source_name']); + $subject = $l10n->t('%s %s tagged your post', $SUBJECT_PREFIX, $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]', @@ -278,7 +281,7 @@ function notification($params) if ($params['type'] == Notify\Type::INTRO) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Introduction received'); + $subject = $l10n->t('%s Introduction received', $SUBJECT_PREFIX); $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.', @@ -295,7 +298,7 @@ function notification($params) switch ($params['verb']) { case Activity::FRIEND: // someone started to share with user (mostly OStatus) - $subject = $l10n->t('[Friendica:Notify] A new person is sharing with you'); + $subject = $l10n->t('%s A new person is sharing with you', $SUBJECT_PREFIX); $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', @@ -305,7 +308,7 @@ function notification($params) break; case Activity::FOLLOW: // someone started to follow the user (mostly OStatus) - $subject = $l10n->t('[Friendica:Notify] You have a new follower'); + $subject = $l10n->t('%s You have a new follower', $SUBJECT_PREFIX); $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', @@ -321,7 +324,7 @@ function notification($params) if ($params['type'] == Notify\Type::SUGGEST) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Friend suggestion received'); + $subject = $l10n->t('%s Friend suggestion received', $SUBJECT_PREFIX); $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.', @@ -342,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('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); $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].', @@ -357,7 +360,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } else { // ACTIVITY_FOLLOW $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); $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].',