From b89dfa3a5b5d0febdbf1a45f2a8b855315204b69 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 1 Nov 2010 13:50:24 +0100
Subject: Fix i18n issues that are solved by using plural.

---
 lib/command.php       | 12 ++++++++----
 lib/groupeditform.php | 13 +++++++++----
 lib/themeuploader.php |  7 ++++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/command.php b/lib/command.php
index 658262a09..329617b3b 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -483,9 +483,11 @@ class MessageCommand extends Command
 
         if (Message::contentTooLong($this->text)) {
             // XXX: i18n. Needs plural support.
-            // TRANS: Message given if content is too long.
+            // TRANS: Message given if content is too long. %1$sd is used for plural.
             // TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-            $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
+            $channel->error($this->user, sprintf(_m('Message too long - maximum is %1$d character, you sent %2$d.',
+                                                    'Message too long - maximum is %1$d characters, you sent %2$d.',
+                                                    Message::maxContent()),
                                                  Message::maxContent(), mb_strlen($this->text)));
             return;
         }
@@ -584,9 +586,11 @@ class ReplyCommand extends Command
 
         if (Notice::contentTooLong($this->text)) {
             // XXX: i18n. Needs plural support.
-            // TRANS: Message given if content of a notice for a reply is too long.
+            // TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
             // TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-            $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
+            $channel->error($this->user, sprintf(_m('Notice too long - maximum is %1$d character, you sent %2$d.',
+                                                    'Notice too long - maximum is %1$d characters, you sent %2$d.',
+                                                    Notice::maxContent()),
                                                  Notice::maxContent(), mb_strlen($this->text)));
             return;
         }
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 433f6a138..f939fc1b6 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -160,14 +160,17 @@ class GroupEditForm extends Form
         $this->out->elementStart('li');
         $this->out->input('homepage', _('Homepage'),
                           ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
-                          _('URL of the homepage or blog of the group or topic'));
+                          _('URL of the homepage or blog of the group or topic.'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
         $desclimit = User_group::maxDescription();
         if ($desclimit == 0) {
             $descinstr = _('Describe the group or topic');
         } else {
-            $descinstr = sprintf(_('Describe the group or topic in %d characters'), $desclimit);
+            $descinstr = sprintf(_m('Describe the group or topic in %d character or less',
+                                    'Describe the group or topic in %d characters or less',
+                                    $desclimit),
+                                 $desclimit);
         }
         $this->out->textarea('description', _('Description'),
                              ($this->out->arg('description')) ? $this->out->arg('description') : $description,
@@ -176,7 +179,7 @@ class GroupEditForm extends Form
         $this->out->elementStart('li');
         $this->out->input('location', _('Location'),
                           ($this->out->arg('location')) ? $this->out->arg('location') : $location,
-                          _('Location for the group, if any, like "City, State (or Region), Country"'));
+                          _('Location for the group, if any, like "City, State (or Region), Country".'));
         $this->out->elementEnd('li');
         if (common_config('group', 'maxaliases') > 0) {
             $aliases = (empty($this->group)) ? array() : $this->group->getAliases();
@@ -184,7 +187,9 @@ class GroupEditForm extends Form
             $this->out->input('aliases', _('Aliases'),
                               ($this->out->arg('aliases')) ? $this->out->arg('aliases') :
                               (!empty($aliases)) ? implode(' ', $aliases) : '',
-                              sprintf(_('Extra nicknames for the group, comma- or space- separated, max %d'),
+                              sprintf(_m('Extra nicknames for the group, separated with commas or spaces. Maximum %d alias allowed.',
+                                         'Extra nicknames for the group, separated with commas or spaces. Maximum %d aliases allowed.',
+                                         common_config('group', 'maxaliases')),
                                       common_config('group', 'maxaliases')));;
             $this->out->elementEnd('li');
         }
diff --git a/lib/themeuploader.php b/lib/themeuploader.php
index 5a48e884e..b7b14d7b9 100644
--- a/lib/themeuploader.php
+++ b/lib/themeuploader.php
@@ -163,9 +163,10 @@ class ThemeUploader
             $estSize = $blockSize * max(1, intval(ceil($size / $blockSize)));
             $totalSize += $estSize;
             if ($totalSize > $sizeLimit) {
-                $msg = sprintf(_("Uploaded theme is too large; " .
-                                 "must be less than %d bytes uncompressed."),
-                                 $sizeLimit);
+                $msg = sprintf(_m('Uploaded theme is too large; must be less than %d byte uncompressed.',
+                                  'Uploaded theme is too large; must be less than %d bytes uncompressed.',
+                                  $sizeLimit),
+                               $sizeLimit);
                 throw new ClientException($msg);
             }
 
-- 
cgit v1.2.3-54-g00ecf