diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-05-02 23:55:30 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-05-03 16:16:17 +0200 |
| commit | b7fde768528a1f3e17280b728c7781c4f262e8d1 (patch) | |
| tree | f9af9b6f50392cd68e3d0a4637dce6a7c584fa6e /phpBB | |
| parent | 1f76a95bf61669444e4f69f83494f1ddf8f7b34a (diff) | |
| download | forums-b7fde768528a1f3e17280b728c7781c4f262e8d1.tar forums-b7fde768528a1f3e17280b728c7781c4f262e8d1.tar.gz forums-b7fde768528a1f3e17280b728c7781c4f262e8d1.tar.bz2 forums-b7fde768528a1f3e17280b728c7781c4f262e8d1.tar.xz forums-b7fde768528a1f3e17280b728c7781c4f262e8d1.zip | |
[ticket/12451] Remove duplicated lang var
PHPBB3-12451
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/message_parser.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 2578f50b27..901bafbb2e 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) . '<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; } @@ -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_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; } } diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 600bc2dd9f..5068f60573 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -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', @@ -227,10 +235,6 @@ $lang = array_merge($lang, array( 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.', '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( 1 => 'You need to enter at least %1$d character.', 2 => 'You need to enter at least %1$d characters.', @@ -241,12 +245,6 @@ $lang = array_merge($lang, array( '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.', - ), - '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_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.', |