From: Tom Hughes <tom@compton.nu>
Date: Thu, 15 Nov 2012 15:22:56 +0000 (+0000)
Subject: Don't use hard coded value in "one" pluralization rule
X-Git-Tag: live~5300
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/44528ffe0fd830e17440ab02a620cce99ea8271c?ds=sidebyside;hp=7ffd7f10ff10585012ca0ed8fa9d298afd58c692

Don't use hard coded value in "one" pluralization rule

French uses the "one" rule for zero as well as one (if there is no
explicit zero rule) so make sure we use %{count} there.

Also made the same change to English, and added an explcit zero rul.
---

diff --git a/config/locales/en.yml b/config/locales/en.yml
index aa3149e91..1f5a741b7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -367,7 +367,8 @@ en:
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
-        one: 1 comment
+        zero: No comments
+        one: "%{count} comment"
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 878db5188..8946ce532 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -343,7 +343,7 @@ fr:
       hide_link: Masquer ce commentaire
     diary_entry: 
       comment_count: 
-        one: 1 commentaire
+        one: "%{count} commentaire"
         other: "%{count} commentaires"
       comment_link: Commenter cette entrée
       confirm: Confirmer