diff options
| author | Eilis Hamilton <eilis@powershop.co.nz> | 2017-05-10 09:50:47 +1200 |
|---|---|---|
| committer | Eilis Hamilton <byrne.eilis@gmail.com> | 2017-05-19 13:58:19 +1200 |
| commit | 7c45146b15e682de11251180eaa4e75ac50e07cd (patch) | |
| tree | d80032b0ac77395d0f793bc1def95d5d761f4168 /activesupport/test | |
| parent | b9b4fa9154e7c81ddb2bac4c5d53a9cb98c3351e (diff) | |
| download | rails-7c45146b15e682de11251180eaa4e75ac50e07cd.tar.gz rails-7c45146b15e682de11251180eaa4e75ac50e07cd.tar.bz2 rails-7c45146b15e682de11251180eaa4e75ac50e07cd.zip | |
Fix pluralization of uncountables when given a locale
Previously apply_inflections would only use the :en uncountables
rather then the ones for the locale that was passed to pluralize or
singularize.
This changes apply_inflections to take a locale which it will use to
find the uncountables.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/inflector_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb index 14bc10513b..ef956eda90 100644 --- a/activesupport/test/inflector_test.rb +++ b/activesupport/test/inflector_test.rb @@ -420,6 +420,8 @@ class InflectorTest < ActiveSupport::TestCase inflect.singular(/es$/, "") inflect.irregular("el", "los") + + inflect.uncountable("agua") end assert_equal("hijos", "hijo".pluralize(:es)) @@ -432,12 +434,17 @@ class InflectorTest < ActiveSupport::TestCase assert_equal("los", "el".pluralize(:es)) assert_equal("els", "el".pluralize) + assert_equal("agua", "agua".pluralize(:es)) + assert_equal("aguas", "agua".pluralize) + ActiveSupport::Inflector.inflections(:es) { |inflect| inflect.clear } assert ActiveSupport::Inflector.inflections(:es).plurals.empty? assert ActiveSupport::Inflector.inflections(:es).singulars.empty? + assert ActiveSupport::Inflector.inflections(:es).uncountables.empty? assert !ActiveSupport::Inflector.inflections.plurals.empty? assert !ActiveSupport::Inflector.inflections.singulars.empty? + assert !ActiveSupport::Inflector.inflections.uncountables.empty? end def test_clear_all |