diff options
| author | Cesar G <prototech91@gmail.com> | 2013-12-01 11:25:54 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-03-19 03:08:33 -0700 |
| commit | 126ee37f6692a7c52fd8f6527af2dc06cda50a8b (patch) | |
| tree | d075059456822ae6d895f6d11089f68166888d2b | |
| parent | 7e4b7a154214f1663a28244282e551beb59d7d8b (diff) | |
| download | forums-126ee37f6692a7c52fd8f6527af2dc06cda50a8b.tar forums-126ee37f6692a7c52fd8f6527af2dc06cda50a8b.tar.gz forums-126ee37f6692a7c52fd8f6527af2dc06cda50a8b.tar.bz2 forums-126ee37f6692a7c52fd8f6527af2dc06cda50a8b.tar.xz forums-126ee37f6692a7c52fd8f6527af2dc06cda50a8b.zip | |
[ticket/11959] Use the plurals system for the untrimmed language strings.
PHPBB3-11959
| -rw-r--r-- | phpBB/language/en/common.php | 12 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index eb8f7ce2a6..437f3a190f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -424,21 +424,27 @@ $lang = array_merge($lang, array( 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOTIFICATIONS' => 'Notifications', - 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', + 'NOTIFICATION_BOOKMARK' => array( + 1 => '%1$s replied to the topic “%2$s” you have bookmarked.', + ), 'NOTIFICATION_BOOKMARK_TRIMMED' => array( 2 => '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.', ), '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_PM' => '%1$s sent you a Private Message "%2$s".', - 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', + 'NOTIFICATION_POST' => array( + 1 => '%1$s replied to the topic “%2$s”.', + ), 'NOTIFICATION_POST_TRIMMED' => array( 2 => '%1$s and %3$d others replied to the topic “%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_IN_QUEUE' => 'A new post titled "%2$s" was posted by %1$s and needs approval.', - 'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".', + 'NOTIFICATION_QUOTE' => array( + 1 => '%1$s quoted you in the post “%2$s”.', + ), 'NOTIFICATION_QUOTE_TRIMMED' => array( 2 => '%1$s and %3$d quoted you in the post “%2$s”', ), diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index bc42c4422b..a883e67bd4 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -210,13 +210,18 @@ class post extends \phpbb\notification\type\base if ($trimmed_responders_cnt) { $lang_key .= '_TRIMMED'; + $lang_user_cnt = $trimmed_responders_cnt; + } + else + { + $lang_user_cnt = $responders_cnt; } return $this->user->lang( $lang_key, implode($this->user->lang['COMMA_SEPARATOR'], $usernames), censor_text($this->get_data('topic_title')), - $trimmed_responders_cnt + $lang_user_cnt ); } |