Merge pull request #139 from tigrish/master

Correct pluralization rule for :fr locale
ruby-i18n · Jul 1, 2012 · 75e0053 · 75e0053
2 parents 391e6f5 + 9a78917
commit 75e0053
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/test/test_data/locales/invalid/empty.yml b/test/test_data/locales/invalid/empty.yml
@@ -1 +0,0 @@
-en:

diff --git a/test/test_data/locales/plurals.rb b/test/test_data/locales/plurals.rb
@@ -27,7 +27,7 @@
   :fi => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
   :fil => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
   :fo => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n && n != 2 ? :one : :other } } } },
+  :fr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n.between?(0, 2) && n != 2 ? :one : :other } } } },
   :fur => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
   :fy => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
   :ga => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },