Skip to content
Browse files

Added inflection rules for "sh" words, like "wish" and "fish" #755 [p…

…hillip@pjbsoftware.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@844 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7267db5 commit 6cae2b743913bad7fc530c01f80cc6fe7ef9309d @dhh dhh committed
View
2 activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added inflection rules for "sh" words, like "wish" and "fish" #755 [phillip@pjbsoftware.com]
+
* Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 [Tobias Luetke]
* Added String#to_time and String#to_date for wrapping ParseDate
View
4 activesupport/lib/active_support/inflector.rb
@@ -57,6 +57,7 @@ def constantize(camel_cased_word)
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'],
@@ -74,7 +75,8 @@ def plural_rules #:doc:
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'],
View
4 activesupport/test/inflector_test.rb
@@ -17,7 +17,9 @@ class InflectorTest < Test::Unit::TestCase
"process" => "processes",
"address" => "addresses",
"case" => "cases",
- "stack" => "stacks",
+ "stack" => "stacks",
+ "wish" => "wishes",
+ "fish" => "fish",
"category" => "categories",
"query" => "queries",

0 comments on commit 6cae2b7

Please sign in to comment.
Something went wrong with that request. Please try again.