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

[ticket/12451] Remove duplicated lang var

Browse source 
PHPBB3-12451
This commit is contained in:
Oliver Schramm 2014-05-02 23:55:30 +02:00
parent 1f76a95bf6
commit b7fde76852
2 changed files with 10 additions and 12 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. // 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) . '<br />' . $user->lang('TOO_MANY_CHARS_LIMIT', (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; 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']) 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_CONTAINS', $message_length) . '<br />' . $user->lang('TOO_FEW_CHARS_LIMIT', (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; return (!$update_this_message) ? $return_message : $this->warn_msg;
} }
} }

18
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_ANNOUNCE' => 'Sorry but you cannot post announcements.',
'CANNOT_POST_STICKY' => 'Sorry but you cannot post sticky topics.', 'CANNOT_POST_STICKY' => 'Sorry but you cannot post sticky topics.',
'CHANGE_TOPIC_TO' => 'Change topic type to', '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', 'CLOSE_TAGS' => 'Close tags',
'CURRENT_TOPIC' => 'Current topic', 'CURRENT_TOPIC' => 'Current topic',
@ -227,10 +235,6 @@ $lang = array_merge($lang, array(
'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.', 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.',
'TOO_FEW_CHARS' => 'Your message contains too few characters.', 'TOO_FEW_CHARS' => 'Your message contains too few characters.',
'TOO_FEW_CHARS_CONTAINS' => array(
1 => 'Your message contains %1$d character.',
2 => 'Your message contains %1$d characters.',
),
'TOO_FEW_CHARS_LIMIT' => array( 'TOO_FEW_CHARS_LIMIT' => array(
1 => 'You need to enter at least %1$d character.', 1 => 'You need to enter at least %1$d character.',
2 => 'You need to enter at least %1$d characters.', 2 => 'You need to enter at least %1$d characters.',
@ -241,12 +245,6 @@ $lang = array_merge($lang, array(
'TOO_MANY_CHARS_LIMIT' => array( 'TOO_MANY_CHARS_LIMIT' => array(
2 => 'The maximum number of allowed characters is %1$d.', 2 => 'The maximum number of allowed characters is %1$d.',
), ),
'TOO_MANY_CHARS_POST' => array(
2 => 'Your message contains %1$d characters.',
),
'TOO_MANY_CHARS_SIG' => array(
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.',
'TOO_MANY_URLS' => 'Your message contains too many URLs. The maximum number of URLs allowed is %d.', 'TOO_MANY_URLS' => 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',