aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-07 11:15:41 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-07 11:15:41 +0000
commitb4f4d038b9b240c2a388bbe3fbfb885170930f99 (patch)
tree816b43d45ee5adaf26cdb1c2c9ef5941e8c8b466 /actionpack/lib/action_controller
parentd1856a00a3c614062049a43fb3e5e6a7b899c879 (diff)
downloadrails-b4f4d038b9b240c2a388bbe3fbfb885170930f99.tar.gz
rails-b4f4d038b9b240c2a388bbe3fbfb885170930f99.tar.bz2
rails-b4f4d038b9b240c2a388bbe3fbfb885170930f99.zip
Fixed the Inflector to handle the movie/movies pair correctly #261 [Scott Baron]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@60 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/support/inflector.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/support/inflector.rb b/actionpack/lib/action_controller/support/inflector.rb
index 05ff4fede9..f78d34348c 100644
--- a/actionpack/lib/action_controller/support/inflector.rb
+++ b/actionpack/lib/action_controller/support/inflector.rb
@@ -48,6 +48,7 @@ module Inflector
def plural_rules #:doc:
[
[/(x|ch|ss)$/, '\1es'], # search, switch, fix, box, process, address
+ [/([^aeiouy]|qu)ies$/, '\1y'],
[/([^aeiouy]|qu)y$/, '\1ies'], # query, ability, agency
[/(?:([^f])fe|([lr])f)$/, '\1\2ves'], # half, safe, wife
[/sis$/, 'ses'], # basis, diagnosis