diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:59:01 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:59:01 +0000 |
| commit | c196db9527843979f884f331499f0b8963f99dcd (patch) | |
| tree | 261a5634a7cd83e5747fde3b56c4690c46de6b62 /activesupport/lib | |
| parent | b7f37d3ef99c512f02f0579836f573fa3beb7bb3 (diff) | |
| download | rails-c196db9527843979f884f331499f0b8963f99dcd.tar.gz rails-c196db9527843979f884f331499f0b8963f99dcd.tar.bz2 rails-c196db9527843979f884f331499f0b8963f99dcd.zip | |
Fixed photo/photos #1583
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1615 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/inflector.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb index dc0d57b901..0e8fad221c 100644 --- a/activesupport/lib/active_support/inflector.rb +++ b/activesupport/lib/active_support/inflector.rb @@ -58,9 +58,9 @@ module Inflector def plural_rules #:doc: [ [/(fish)$/i, '\1\2'], # fish - [/(information)$/i, '\1'], # information (plural noun) - [/^(ox)$/i, '\1\2en'], # ox - [/([m|l])ouse/i, '\1ice'], # mouse, louse + [/(information)$/i, '\1'], # information (plural noun) + [/^(ox)$/i, '\1\2en'], # ox + [/([m|l])ouse/i, '\1ice'], # mouse, louse [/(x|ch|ss|sh)$/i, '\1es'], # search, switch, fix, box, process, address [/(series)$/i, '\1\2'], [/([^aeiouy]|qu)ies$/i, '\1y'], @@ -71,8 +71,9 @@ module Inflector [/(p)erson$/i, '\1\2eople'], # person, salesperson [/(m)an$/i, '\1\2en'], # man, woman, spokesman [/(c)hild$/i, '\1\2hildren'], # child - [/(o)$/i, '\1\2es'], # buffalo, tomato - [/(bu)s$/i, '\1\2ses'], # bus + [/(photo)$/i, '\1s'], + [/(o)$/i, '\1\2es'], # buffalo, tomato + [/(bu)s$/i, '\1\2ses'], # bus [/s$/i, 's'], # no change (compatibility) [/$/, 's'] ] @@ -81,10 +82,11 @@ module Inflector def singular_rules #:doc: [ [/(f)ish$/i, '\1\2ish'], - [/^(ox)en/i, '\1'], - [/(o)es/i, '\1'], - [/(bus)es$/i, '\1'], - [/([m|l])ice/i, '\1ouse'], + [/^(ox)en/i, '\1'], + [/(photo)s$/i, '\1'], + [/(o)es/i, '\1'], + [/(bus)es$/i, '\1'], + [/([m|l])ice/i, '\1ouse'], [/(x|ch|ss|sh)es$/i, '\1'], [/(m)ovies$/i, '\1\2ovie'], [/(s)eries$/i, '\1\2eries'], |