Browse files

Fixed inflections of "index/indices" #1766 [damn_pepe@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1881 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent ecb0e39 commit fb2dd492d6c73207d7fad2ee1df152713e1dcaa9 @dhh dhh committed Jul 22, 2005
View
2 activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed inflections of "index/indices" #1766 [damn_pepe@gmail.com]
+
* Added stripping of _id to String#humanize, so "employee_id" becomes "Employee" #1574 [Justin French]
* Factor Fixnum and Bignum extensions into Integer extensions [Nicholas Seckar]
View
4 activesupport/lib/active_support/inflector.rb
@@ -82,7 +82,7 @@ def plural_rules #:doc:
[
[/^(ox)$/i, '\1\2en'], # ox
[/([m|l])ouse$/i, '\1ice'], # mouse, louse
- [/(matr|vert)ix|ex$/i, '\1ices'], # matrix, vertex, index
+ [/(matr|vert|ind)ix|ex$/i, '\1ices'], # matrix, vertex, index
[/(x|ch|ss|sh)$/i, '\1es'], # search, switch, fix, box, process, address
[/([^aeiouy]|qu)ies$/i, '\1y'],
[/([^aeiouy]|qu)y$/i, '\1ies'], # query, ability, agency
@@ -106,7 +106,7 @@ def plural_rules #:doc:
def singular_rules #:doc:
[
[/(matr)ices$/i, '\1ix'],
- [/(vert)ices$/i, '\1ex'],
+ [/(vert|ind)ices$/i, '\1ex'],
[/^(ox)en/i, '\1'],
[/(alias)es$/i, '\1'],
[/([octop|vir])i$/i, '\1us'],
View
2 activesupport/test/inflector_test.rb
@@ -29,6 +29,8 @@ class InflectorTest < Test::Unit::TestCase
"archive" => "archives",
+ "index" => "indices",
+
"wife" => "wives",
"safe" => "saves",
"half" => "halves",

0 comments on commit fb2dd49

Please sign in to comment.