Permalink
Browse files

Merge pull request #139 from tigrish/master

Correct pluralization rule for :fr locale
  • Loading branch information...
2 parents 391e6f5 + 9a78917 commit 75e0053322615c4b927e838df057978d1e4999e7 @tigrish tigrish committed Jul 1, 2012
Showing with 1 addition and 2 deletions.
  1. +0 −1 test/test_data/locales/invalid/empty.yml
  2. +1 −1 test/test_data/locales/plurals.rb
@@ -1 +0,0 @@
-en:
@@ -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 } } } },

0 comments on commit 75e0053

Please sign in to comment.