diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 15:15:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 15:15:44 +0200 |
| commit | db384ee3c2f147a604b273acbd00fdf8e19964f7 (patch) | |
| tree | a5a6fd66d317eb19afd34430fadad5558df873b6 /phpBB/includes/message_parser.php | |
| parent | 78b7cee763af60fff64cfc316b5958431f1f9b02 (diff) | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| download | forums-db384ee3c2f147a604b273acbd00fdf8e19964f7.tar forums-db384ee3c2f147a604b273acbd00fdf8e19964f7.tar.gz forums-db384ee3c2f147a604b273acbd00fdf8e19964f7.tar.bz2 forums-db384ee3c2f147a604b273acbd00fdf8e19964f7.tar.xz forums-db384ee3c2f147a604b273acbd00fdf8e19964f7.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 17a350bab3..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, (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; } } |