diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-29 20:39:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-29 20:39:22 +0100 |
| commit | f426fa02951b5131f77ad2c4596a0bd87ef23d84 (patch) | |
| tree | 454e5130824322b55ccd7688428532b8ca162590 /phpBB/phpbb/notification/type/post.php | |
| parent | 3e281790e3da8342a7c106aa0d181bc556912baa (diff) | |
| parent | b893dae105f72b7c34abe855e24f0dec35206208 (diff) | |
| download | forums-f426fa02951b5131f77ad2c4596a0bd87ef23d84.tar forums-f426fa02951b5131f77ad2c4596a0bd87ef23d84.tar.gz forums-f426fa02951b5131f77ad2c4596a0bd87ef23d84.tar.bz2 forums-f426fa02951b5131f77ad2c4596a0bd87ef23d84.tar.xz forums-f426fa02951b5131f77ad2c4596a0bd87ef23d84.zip | |
Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeus
* prototech/ticket/11959:
[ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
[ticket/11959] Add unit tests.
[ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
[ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
[ticket/11959] Simplify how the users are trimmed.
[ticket/11959] Add function to create a string list.
[ticket/11959] Add samples for the untrimmed strings.
[ticket/11959] List the last user with "and" instead of a comma.
[ticket/11959] Use the plurals system for the untrimmed language strings.
[ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
[ticket/11959] Use plurals for the language strings.
Diffstat (limited to 'phpBB/phpbb/notification/type/post.php')
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index b2ad8ff33d..f973becc3b 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -205,18 +205,17 @@ class post extends \phpbb\notification\type\base $usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile'); } } - $lang_key = $this->language_key; if ($trimmed_responders_cnt) { - $lang_key .= '_TRIMMED'; + $usernames[] = $this->user->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt); } return $this->user->lang( - $lang_key, - implode($this->user->lang['COMMA_SEPARATOR'], $usernames), + $this->language_key, + phpbb_generate_string_list($usernames, $this->user), censor_text($this->get_data('topic_title')), - $trimmed_responders_cnt + $responders_cnt ); } |