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 aa3149e9101b08b3a5932b62776fc266e6f93c9f..1f5a741b7af85777cd8ced4c794f4b3c809359f8 100644 (file)
--- 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:
       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
         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 878db518858ce166377827b8a5bafbcd260558b9..8946ce532759caf7bbf210120dd649880328f929 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -343,7 +343,7 @@ fr:
       hide_link: Masquer ce commentaire
     diary_entry: 
       comment_count: 
       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
         other: "%{count} commentaires"
       comment_link: Commenter cette entrée
       confirm: Confirmer