aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-04-29 00:44:32 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2014-05-03 16:16:14 +0200
commitdaa69ecfa97c5462835e42b1046ba91b7abe3469 (patch)
tree924288b8de0f5aa28443396ed818cebc306308f2
parent4e529fda036b5aa3611da30277487907b83b55ac (diff)
downloadforums-daa69ecfa97c5462835e42b1046ba91b7abe3469.tar
forums-daa69ecfa97c5462835e42b1046ba91b7abe3469.tar.gz
forums-daa69ecfa97c5462835e42b1046ba91b7abe3469.tar.bz2
forums-daa69ecfa97c5462835e42b1046ba91b7abe3469.tar.xz
forums-daa69ecfa97c5462835e42b1046ba91b7abe3469.zip
[ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
PHPBB3-12451
-rw-r--r--phpBB/includes/message_parser.php2
-rw-r--r--phpBB/language/en/posting.php8
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 17a350bab3..5de925b6ae 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -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('TOO_FEW_CHARS_CONTAINS', $message_length) . ' ' . $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 e3b6101310..29ca7d82c8 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -227,9 +227,13 @@ $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 => '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.',