aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-08 14:22:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-08 14:22:29 +0000
commit48f590a42ec2ed501c44c01cdea8b1aa9163e1d9 (patch)
tree6d50c346e5881a4c91a4509d3e263ad0e93ae159 /activesupport
parentb64004fda68f636cea93b591e3c48c1f096e279d (diff)
downloadrails-48f590a42ec2ed501c44c01cdea8b1aa9163e1d9.tar.gz
rails-48f590a42ec2ed501c44c01cdea8b1aa9163e1d9.tar.bz2
rails-48f590a42ec2ed501c44c01cdea8b1aa9163e1d9.zip
Fixed rewriting of dashes, lashes
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@345 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/inflector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/inflector.rb b/activesupport/lib/inflector.rb
index 5fddf9d09c..d2fbfb1e7c 100644
--- a/activesupport/lib/inflector.rb
+++ b/activesupport/lib/inflector.rb
@@ -47,7 +47,7 @@ module Inflector
private
def plural_rules #:doc:
[
- [/(x|ch|ss)$/, '\1es'], # search, switch, fix, box, process, address
+ [/(x|ch|ss|sh)$/, '\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