diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-29 00:53:57 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-05-03 16:16:15 +0200 |
| commit | d7c0d604b56791481200fec2ebacb71615e303b0 (patch) | |
| tree | 3b50fc46c78e91f3df5b59b38b473d3de50193cf /phpBB | |
| parent | daa69ecfa97c5462835e42b1046ba91b7abe3469 (diff) | |
| download | forums-d7c0d604b56791481200fec2ebacb71615e303b0.tar forums-d7c0d604b56791481200fec2ebacb71615e303b0.tar.gz forums-d7c0d604b56791481200fec2ebacb71615e303b0.tar.bz2 forums-d7c0d604b56791481200fec2ebacb71615e303b0.tar.xz forums-d7c0d604b56791481200fec2ebacb71615e303b0.zip | |
[ticket/12451] Split TOO_MANY_CHARS vars for plurals
PHPBB3-12451
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 5de925b6ae..8b64f700d3 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1128,7 +1128,7 @@ class parse_message extends bbcode_firstpass // Maximum message length check. 0 disables this check completely. if ((int) $config['max_' . $mode . '_chars'] > 0 && $message_length > (int) $config['max_' . $mode . '_chars']) { - $this->warn_msg[] = $user->lang('TOO_MANY_CHARS_' . strtoupper($mode), $message_length, (int) $config['max_' . $mode . '_chars']); + $this->warn_msg[] = $user->lang('TOO_MANY_CHARS_' . strtoupper($mode), $message_length) . ' ' . $user->lang('TOO_MANY_CHARS_LIMIT', (int) $config['max_' . $mode . '_chars']); return (!$update_this_message) ? $return_message : $this->warn_msg; } diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 29ca7d82c8..600bc2dd9f 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -238,11 +238,14 @@ $lang = array_merge($lang, array( 'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.', 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maximum.', 'TOO_MANY_CHARS' => 'Your message contains too many characters.', + 'TOO_MANY_CHARS_LIMIT' => array( + 2 => 'The maximum number of allowed characters is %1$d.', + ), 'TOO_MANY_CHARS_POST' => array( - 2 => 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.', + 2 => 'Your message contains %1$d characters.', ), 'TOO_MANY_CHARS_SIG' => array( - 2 => 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.', + 2 => 'Your signature contains %1$d characters.', ), 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.', 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. The maximum number of smilies allowed is %d.', |