aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/inflections.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-29 02:40:34 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-29 02:40:34 +0000
commitaf2ebb29da7f77e145202e9e5ee4081ce6b85a93 (patch)
tree663c18f5ec58eff5b37e1e8dae52fd58d47f3266 /activesupport/lib/active_support/inflections.rb
parent9e76583e8eae7f4ec428ea3b42929403f16337ef (diff)
downloadrails-af2ebb29da7f77e145202e9e5ee4081ce6b85a93.tar.gz
rails-af2ebb29da7f77e145202e9e5ee4081ce6b85a93.tar.bz2
rails-af2ebb29da7f77e145202e9e5ee4081ce6b85a93.zip
Inflections: MatrixTest -> MatrixTests instead of MatricesTest. Closes #8496.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6886 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/inflections.rb')
-rw-r--r--activesupport/lib/active_support/inflections.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index 8f3f8618cc..f53ef53ca4 100644
--- a/activesupport/lib/active_support/inflections.rb
+++ b/activesupport/lib/active_support/inflections.rb
@@ -12,7 +12,7 @@ Inflector.inflections do |inflect|
inflect.plural(/(hive)$/i, '\1s')
inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
- inflect.plural(/(matr|vert|ind)ix|ex$/i, '\1ices')
+ inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
inflect.plural(/([m|l])ouse$/i, '\1ice')
inflect.plural(/^(ox)$/i, '\1en')
inflect.plural(/(quiz)$/i, '\1zes')