Fixed the pluralization of analysis to analyses #1295 [seattle@rootimage.msu.edu]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1314 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed the pluralization of analysis to analyses #1295 [seattle@rootimage.msu.edu]
+
 * Fixed that Time.local(2005,12).months_since(1) would raise "ArgumentError: argument out of range" #1311 [jhahn@niveon.com]
 
 * Added silencing to the default Logger class

activesupport/lib/active_support/inflector.rb

@@ -83,6 +83,7 @@ module Inflector
         [/([lr])ves$/i, '\1f'],
         [/(tive)s$/i, '\1'],
         [/([^f])ves$/i, '\1fe'],
+        [/(^analy)ses$/i, '\1sis'],
         [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'],
         [/([ti])a$/i, '\1um'],
         [/(p)eople$/i, '\1\2erson'],

activesupport/test/inflector_test.rb

@@ -43,6 +43,7 @@ class InflectorTest < Test::Unit::TestCase
 
     "datum"       => "data",
     "medium"      => "media",
+    "analysis"    => "analyses",
 
     "node_child"  => "node_children",
     "child"       => "children",