makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12451] Split TOO_MANY_CHARS vars for plurals

Browse source 
PHPBB3-12451
This commit is contained in:
Oliver Schramm 2014-04-29 00:53:57 +02:00
parent daa69ecfa9
commit d7c0d604b5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/message_parser.php
View file

@ -1128,7 +1128,7 @@ class parse_message extends bbcode_firstpass
// Maximum message length check. 0 disables this check completely. // Maximum message length check. 0 disables this check completely.
if ((int) $config['max_' . $mode . '_chars'] > 0 && $message_length > (int) $config['max_' . $mode . '_chars']) 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; return (!$update_this_message) ? $return_message : $this->warn_msg;
} }

7
phpBB/language/en/posting.php
View file

@ -238,11 +238,14 @@ $lang = array_merge($lang, array(
'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.', '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_ATTACHMENTS' => 'Cannot add another attachment, %d is the maximum.',
'TOO_MANY_CHARS' => 'Your message contains too many characters.', '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( '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( '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_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.', 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',