aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-08-07 11:34:10 -0700
committerXavier Noria <fxn@hashref.com>2011-08-07 11:34:10 -0700
commite06db7276ca6acfb8218fdf8a6c8d9532360a1ae (patch)
treecd38c73bdf3a7ba3d417106ade24129bcb19fd78 /activesupport/lib
parent9c205624ee4f5e58915d143c49ab05d190c48c99 (diff)
parent554232e481a2d6e313d798fad59ccdca03f05ef2 (diff)
downloadrails-e06db7276ca6acfb8218fdf8a6c8d9532360a1ae.tar.gz
rails-e06db7276ca6acfb8218fdf8a6c8d9532360a1ae.tar.bz2
rails-e06db7276ca6acfb8218fdf8a6c8d9532360a1ae.zip
Merge pull request #2457 from Gregg/zombie_singular_fix
Added irregular zombie inflection, so zombies != zomby
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/inflections.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index 06ceccdb22..daf2a1e1d9 100644
--- a/activesupport/lib/active_support/inflections.rb
+++ b/activesupport/lib/active_support/inflections.rb
@@ -54,6 +54,7 @@ module ActiveSupport
inflect.irregular('sex', 'sexes')
inflect.irregular('move', 'moves')
inflect.irregular('cow', 'kine')
+ inflect.irregular('zombie', 'zombies')
inflect.uncountable(%w(equipment information rice money species series fish sheep jeans))
end