lib/active_support/inflector.rb in activesupport-1.0.0 vs lib/active_support/inflector.rb in activesupport-1.0.1

@@ -55,10 +55,11 @@
   end
 
   private
     def plural_rules #:doc:
       [
+        [/fish$/, 'fish'],               # fish
         [/(x|ch|ss|sh)$/, '\1es'],               # search, switch, fix, box, process, address
         [/series$/, '\1series'],
         [/([^aeiouy]|qu)ies$/, '\1y'],
         [/([^aeiouy]|qu)y$/, '\1ies'],        # query, ability, agency
         [/(?:([^f])fe|([lr])f)$/, '\1\2ves'], # half, safe, wife
@@ -72,10 +73,11 @@
       ]
     end
 
     def singular_rules #:doc:
       [
-        [/(x|ch|ss)es$/, '\1'],
+        [/fish$/, 'fish'],
+        [/(x|ch|ss|sh)es$/, '\1'],
         [/movies$/, 'movie'],
         [/series$/, 'series'],
         [/([^aeiouy]|qu)ies$/, '\1y'],
         [/([lr])ves$/, '\1f'],
         [/([^f])ves$/, '\1fe'],