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

Merge pull request #2363 from Elsensee/ticket/12451

Browse source 
[ticket/12451] Split lang vars in posting.php for plurals

* Elsensee/ticket/12451:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
This commit is contained in:
Joas Schilling 2014-05-08 15:10:34 +02:00
commit d4fc060bcd
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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.
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('CHARS_' . strtoupper($mode) . '_CONTAINS', $message_length) . '<br />' . $user->lang('TOO_MANY_CHARS_LIMIT', (int) $config['max_' . $mode . '_chars']);
return (!$update_this_message) ? $return_message : $this->warn_msg;
}
@ -1137,7 +1137,7 @@ class parse_message extends bbcode_firstpass
{
if (!$message_length || $message_length < (int) $config['min_post_chars'])
{
$this->warn_msg[] = (!$message_length) ? $user->lang['TOO_FEW_CHARS'] : $user->lang('TOO_FEW_CHARS_LIMIT', $message_length, (int) $config['min_post_chars']);
$this->warn_msg[] = (!$message_length) ? $user->lang['TOO_FEW_CHARS'] : ($user->lang('CHARS_POST_CONTAINS', $message_length) . '<br />' . $user->lang('TOO_FEW_CHARS_LIMIT', (int) $config['min_post_chars']));
return (!$update_this_message) ? $return_message : $this->warn_msg;
}
}

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

@ -70,6 +70,14 @@ $lang = array_merge($lang, array(
'CANNOT_POST_ANNOUNCE' => 'Sorry but you cannot post announcements.',
'CANNOT_POST_STICKY' => 'Sorry but you cannot post sticky topics.',
'CHANGE_TOPIC_TO' => 'Change topic type to',
'CHARS_POST_CONTAINS' => array(
1 => 'Your message contains %1$d character.',
2 => 'Your message contains %1$d characters.',
),
'CHARS_SIG_CONTAINS' => array(
1 => 'Your signature contains %1$d character.',
2 => 'Your signature contains %1$d characters.',
),
'CLOSE_TAGS' => 'Close tags',
'CURRENT_TOPIC' => 'Current topic',
@ -228,17 +236,14 @@ $lang = array_merge($lang, array(
'TOO_FEW_CHARS' => 'Your message contains too few characters.',
'TOO_FEW_CHARS_LIMIT' => array(
1 => 'Your message contains %1$d character. The minimum number of characters you need to enter is %2$d.',
2 => 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
1 => 'You need to enter at least %1$d character.',
2 => 'You need to enter at least %1$d characters.',
),
'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_POST' => array(
2 => 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
),
'TOO_MANY_CHARS_SIG' => array(
2 => 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
'TOO_MANY_CHARS_LIMIT' => array(
2 => 'The maximum number of allowed characters is %1$d.',
),
'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.',