mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

[ticket/11959] List the last user with "and" instead of a comma.

Browse Source 
PHPBB3-11959
This commit is contained in:
Cesar G 2013-12-01 12:20:43 -08:00
parent 126ee37f66
commit b32a66ca78
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/language/en/common.php
View File

@ -424,29 +424,38 @@ $lang = array_merge($lang, array(
'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.',
'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.',
'NOTIFICATIONS' => 'Notifications', 'NOTIFICATIONS' => 'Notifications',
// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
'NOTIFICATION_BOOKMARK' => array( 'NOTIFICATION_BOOKMARK' => array(
1 => '%1$s replied to the topic “%2$s” you have bookmarked.', 1 => '%1$s replied to the topic “%3$s” you have bookmarked.',
2 => '%1$s and %2$s replied to the topic “%3$s” you have bookmarked.',
), ),
// X, Y, Z and 2 others replied to the topic “Test” you have bookmarked.
'NOTIFICATION_BOOKMARK_TRIMMED' => array( 'NOTIFICATION_BOOKMARK_TRIMMED' => array(
2 => '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.', 2 => '%1$s and %4$d others replied to the topic “%3$s” you have bookmarked.',
), ),
'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.', 'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.',
'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.', 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.',
'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".',
// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
'NOTIFICATION_POST' => array( 'NOTIFICATION_POST' => array(
1 => '%1$s replied to the topic “%2$s”.', 1 => '%1$s replied to the topic “%3$s”.',
2 => '%1$s and %2$s replied to the topic “%3$s”.',
), ),
// X, Y, Z and 2 others replied to the topic “Test”.
'NOTIFICATION_POST_TRIMMED' => array( 'NOTIFICATION_POST_TRIMMED' => array(
2 => '%1$s and %3$d others replied to the topic “%2$s”', 2 => '%1$s and %4$d others replied to the topic “%3$s”',
), ),
'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".',
'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".',
'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by %1$s and needs approval.', 'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by %1$s and needs approval.',
// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
'NOTIFICATION_QUOTE' => array( 'NOTIFICATION_QUOTE' => array(
1 => '%1$s quoted you in the post “%2$s”.', 1 => '%1$s quoted you in the post “%3$s”.',
2 => '%1$s and %2$s quoted you in the post “%3$s”.',
), ),
// X, Y, Z and 2 others quoted you in the post “Re: Test”.
'NOTIFICATION_QUOTE_TRIMMED' => array( 'NOTIFICATION_QUOTE_TRIMMED' => array(
2 => '%1$s and %3$d quoted you in the post “%2$s”', 2 => '%1$s and %4$d quoted you in the post “%3$s”',
), ),
'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".',

7
phpBB/phpbb/notification/type/post.php
View File

@ -205,6 +205,7 @@ class post extends \phpbb\notification\type\base
$usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile'); $usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile');
} }
} }
$last_user = '';
$lang_key = $this->language_key; $lang_key = $this->language_key;
if ($trimmed_responders_cnt) if ($trimmed_responders_cnt)
@ -215,11 +216,17 @@ class post extends \phpbb\notification\type\base
else else
{ {
$lang_user_cnt = $responders_cnt; $lang_user_cnt = $responders_cnt;
if ($responders_cnt > 1)
{
$last_user = array_pop($usernames);
}
} }
return $this->user->lang( return $this->user->lang(
$lang_key, $lang_key,
implode($this->user->lang['COMMA_SEPARATOR'], $usernames), implode($this->user->lang['COMMA_SEPARATOR'], $usernames),
$last_user,
censor_text($this->get_data('topic_title')), censor_text($this->get_data('topic_title')),
$lang_user_cnt $lang_user_cnt
); );