0
@@ -39,12 +39,16 @@ module ActiveSupport
0
       # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression.
0
       # The replacement should always be a string that may include references to the matched data from the rule.
0
       def plural(rule, replacement)
0
+        @uncountables.delete(rule) if rule.is_a?(String)
0
+        @uncountables.delete(replacement)
0
         @plurals.insert(0, [rule, replacement])
0
       end
0
 
0
       # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression.
0
       # The replacement should always be a string that may include references to the matched data from the rule.
0
       def singular(rule, replacement)
0
+        @uncountables.delete(rule) if rule.is_a?(String)
0
+        @uncountables.delete(replacement)
0
         @singulars.insert(0, [rule, replacement])
0
       end
0
 
0
@@ -55,6 +59,8 @@ module ActiveSupport
0
       #   irregular 'octopus', 'octopi'
0
       #   irregular 'person', 'people'
0
       def irregular(singular, plural)
0
+        @uncountables.delete(singular)
0
+        @uncountables.delete(plural)
0
         if singular[0,1].upcase == plural[0,1].upcase
0
           plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
0
           singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])

0
@@ -34,6 +34,13 @@ class InflectorTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
+  def test_overwrite_previous_inflectors
0
+    assert_equal("series", ActiveSupport::Inflector.singularize("series"))
0
+    ActiveSupport::Inflector.inflections.singular "series", "serie"
0
+    assert_equal("serie", ActiveSupport::Inflector.singularize("series"))
0
+    ActiveSupport::Inflector.inflections.uncountable "series" # Return to normal
0
+  end
0
+
0
   MixtureToTitleCase.each do |before, titleized|
0
     define_method "test_titleize_#{before}" do
0
       assert_equal(titleized, ActiveSupport::Inflector.titleize(before))