diff --git a/src/Pluf/Date.php b/src/Pluf/Date.php index 19b35c6..1ac7059 100644 --- a/src/Pluf/Date.php +++ b/src/Pluf/Date.php @@ -176,22 +176,22 @@ function Pluf_Date_Easy($date, $ref=null, $blocks=2, $notime='now', $show=true) $res .= $diffs[$i].' '; switch ($i) { case 0: - $res .= ngettext('year', 'years', $diffs[$i]); + $res .= _n('year', 'years', $diffs[$i]); break; case 1: - $res .= ngettext('month', 'months', $diffs[$i]); + $res .= _n('month', 'months', $diffs[$i]); break; case 2: - $res .= ngettext('day', 'days', $diffs[$i]); + $res .= _n('day', 'days', $diffs[$i]); break; case 3: - $res .= ngettext('hour', 'hours', $diffs[$i]); + $res .= _n('hour', 'hours', $diffs[$i]); break; case 4: - $res .= ngettext('minute', 'minutes', $diffs[$i]); + $res .= _n('minute', 'minutes', $diffs[$i]); break; case 5: - $res .= ngettext('second', 'seconds', $diffs[$i]); + $res .= _n('second', 'seconds', $diffs[$i]); break; } $res .= ' '; diff --git a/src/Pluf/locale/fr/pluf.po b/src/Pluf/locale/fr/pluf.po index e9a87c9..7d0374c 100644 --- a/src/Pluf/locale/fr/pluf.po +++ b/src/Pluf/locale/fr/pluf.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Pluf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-13 09:44+0100\n" -"PO-Revision-Date: 2009-01-13 09:56+0100\n" +"POT-Creation-Date: 2009-01-31 22:35+0100\n" +"PO-Revision-Date: 2009-01-31 22:39+0100\n" "Last-Translator: Loïc d'Anterroches \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -225,7 +225,7 @@ msgstr "Assurez-vous que la valeur est inférieure ou égale à %s. " msgid "Ensure this value is greater than or equal to %s." msgstr "Assurez-vous que la valeur est supérieure ou égale à %s." -#: Pluf/Form/Field/Email.php:35 +#: Pluf/Form/Field/Email.php:38 msgid "Enter a valid email address." msgstr "Entrez une adresse email valide." @@ -377,60 +377,12 @@ msgstr "application" msgid "The application using this permission, for example \"YourApp\", \"CMS\" or \"SView\"." msgstr "L'application utilisant cette permission, par exemple \"VotreApp\", \"CMS\", etc." -#: Pluf/Date.php:171 -msgid "year" -msgstr "année" - -#: Pluf/Date.php:171 -msgid "month" -msgstr "mois" - -#: Pluf/Date.php:171 -msgid "day" -msgstr "jour" - -#: Pluf/Date.php:171 -msgid "hour" -msgstr "heure" - -#: Pluf/Date.php:172 -msgid "minute" -msgstr "minute" - -#: Pluf/Date.php:172 -msgid "second" -msgstr "seconde" - -#: Pluf/Date.php:173 -msgid "years" -msgstr "années" - -#: Pluf/Date.php:173 -msgid "months" -msgstr "mois" - -#: Pluf/Date.php:173 -msgid "days" -msgstr "jours" - -#: Pluf/Date.php:173 -msgid "hours" -msgstr "heures" - -#: Pluf/Date.php:174 -msgid "minutes" -msgstr "minutes" - -#: Pluf/Date.php:174 -msgid "seconds" -msgstr "secondes" - -#: Pluf/Date.php:194 +#: Pluf/Date.php:206 #, php-format msgid "%s ago" msgstr "il y a %s" -#: Pluf/Date.php:196 +#: Pluf/Date.php:208 #, php-format msgid "%s left" msgstr "%s restant" @@ -659,6 +611,54 @@ msgstr "Par exemple Pluf_User ou Pluf_Group." msgid "do not have the permission" msgstr "n'a pas la permission" +#: Pluf/Date.php:179 +msgid "year" +msgid_plural "years" +msgstr[0] "an" +msgstr[1] "ans" + +#: Pluf/Date.php:182 +msgid "month" +msgid_plural "months" +msgstr[0] "mois" +msgstr[1] "mois" + +#: Pluf/Date.php:185 +msgid "day" +msgid_plural "days" +msgstr[0] "jour" +msgstr[1] "jours" + +#: Pluf/Date.php:188 +msgid "hour" +msgid_plural "hours" +msgstr[0] "heure" +msgstr[1] "heures" + +#: Pluf/Date.php:191 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minute" +msgstr[1] "minutes" + +#: Pluf/Date.php:194 +msgid "second" +msgid_plural "seconds" +msgstr[0] "seconde" +msgstr[1] "secondes" + +#~ msgid "years" +#~ msgstr "années" +#~ msgid "months" +#~ msgstr "mois" +#~ msgid "days" +#~ msgstr "jours" +#~ msgid "hours" +#~ msgstr "heures" +#~ msgid "minutes" +#~ msgstr "minutes" +#~ msgid "seconds" +#~ msgstr "secondes" #~ msgid "Authentication" #~ msgstr "Authentification" #~ msgid "KB" diff --git a/src/Pluf/locale/pluf.pot b/src/Pluf/locale/pluf.pot index d6a8264..565b56a 100644 --- a/src/Pluf/locale/pluf.pot +++ b/src/Pluf/locale/pluf.pot @@ -8,13 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-13 09:44+0100\n" +"POT-Creation-Date: 2009-01-31 22:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: Pluf/Search/Stats.php:34 msgid "search stats" @@ -208,7 +209,7 @@ msgstr "" msgid "Ensure this value is greater than or equal to %s." msgstr "" -#: Pluf/Form/Field/Email.php:35 +#: Pluf/Form/Field/Email.php:38 msgid "Enter a valid email address." msgstr "" @@ -370,60 +371,12 @@ msgid "" "\"SView\"." msgstr "" -#: Pluf/Date.php:171 -msgid "year" -msgstr "" - -#: Pluf/Date.php:171 -msgid "month" -msgstr "" - -#: Pluf/Date.php:171 -msgid "day" -msgstr "" - -#: Pluf/Date.php:171 -msgid "hour" -msgstr "" - -#: Pluf/Date.php:172 -msgid "minute" -msgstr "" - -#: Pluf/Date.php:172 -msgid "second" -msgstr "" - -#: Pluf/Date.php:173 -msgid "years" -msgstr "" - -#: Pluf/Date.php:173 -msgid "months" -msgstr "" - -#: Pluf/Date.php:173 -msgid "days" -msgstr "" - -#: Pluf/Date.php:173 -msgid "hours" -msgstr "" - -#: Pluf/Date.php:174 -msgid "minutes" -msgstr "" - -#: Pluf/Date.php:174 -msgid "seconds" -msgstr "" - -#: Pluf/Date.php:194 +#: Pluf/Date.php:206 #, php-format msgid "%s ago" msgstr "" -#: Pluf/Date.php:196 +#: Pluf/Date.php:208 #, php-format msgid "%s left" msgstr "" @@ -647,3 +600,39 @@ msgstr "" #: Pluf/RowPermission.php:72 msgid "do not have the permission" msgstr "" + +#: Pluf/Date.php:179 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: Pluf/Date.php:182 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: Pluf/Date.php:185 +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: Pluf/Date.php:188 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: Pluf/Date.php:191 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + +#: Pluf/Date.php:194 +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] ""