Changed the way inflections for uncountables work for 'funky jeans' [#…

…3576 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
rails · Apr 5, 2010 · 4eab983 · 4eab983
1 parent efa7e96
commit 4eab983
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
@@ -51,6 +51,6 @@ module ActiveSupport
     inflect.irregular('move', 'moves')
     inflect.irregular('cow', 'kine')
 
-    inflect.uncountable(%w(equipment information rice money species series fish sheep))
+    inflect.uncountable(%w(equipment information rice money species series fish sheep jeans))
   end
 end
diff --git a/activesupport/lib/active_support/inflector/inflections.rb b/activesupport/lib/active_support/inflector/inflections.rb
@@ -148,7 +148,7 @@ def pluralize(word)
     def singularize(word)
       result = word.to_s.dup
 
-      if inflections.uncountables.include?(result.downcase)
+      if inflections.uncountables.any? { |inflection| result =~ /#{inflection}\Z/i }
         result
       else
         inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }

diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
@@ -12,6 +12,8 @@ module InflectorTestCases
     "stack"       => "stacks",
     "wish"        => "wishes",
     "fish"        => "fish",
+    "jeans"       => "jeans",
+    "funky jeans" => "funky jeans",
 
     "category"    => "categories",
     "query"       => "queries",