Permalink
Browse files

Fixed photo/photos #1583

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1615 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent b7f37d3 commit c196db9527843979f884f331499f0b8963f99dcd @dhh dhh committed Jul 2, 2005
Showing with 13 additions and 10 deletions.
  1. +1 −1 activesupport/CHANGELOG
  2. +11 −9 activesupport/lib/active_support/inflector.rb
  3. +1 −0 activesupport/test/inflector_test.rb
View
@@ -1,6 +1,6 @@
*SVN*
-* Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen #1571 [foamdino@gmail.com]
+* Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, photo => photos #1571, #1583 [foamdino@gmail.com]
* Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [c.r.mcgrath@gmail.com]
@@ -58,9 +58,9 @@ def constantize(camel_cased_word)
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 @@ def plural_rules #:doc:
[/(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 @@ def plural_rules #:doc:
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'],
@@ -63,6 +63,7 @@ class InflectorTest < Test::Unit::TestCase
"perspective" => "perspectives",
"ox" => "oxen",
+ "photo" => "photos",
"buffalo" => "buffaloes",
"tomato" => "tomatoes",
"dwarf" => "dwarves",

0 comments on commit c196db9

Please sign in to comment.