aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 17:10:20 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 17:10:20 +0000
commitdb2495cf7ea12ee8bdea5c634a004d4f97454667 (patch)
tree2ab88be1fd01e298b1a1876dec49e87d4f2c8a2f
parent190e04645bf7ae873d922064783a71a88e0060fd (diff)
downloadrails-db2495cf7ea12ee8bdea5c634a004d4f97454667.tar.gz
rails-db2495cf7ea12ee8bdea5c634a004d4f97454667.tar.bz2
rails-db2495cf7ea12ee8bdea5c634a004d4f97454667.zip
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
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/inflector.rb1
-rw-r--r--activesupport/test/inflector_test.rb1
3 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index de3b629d14..ee8afe427e 100644
--- a/activesupport/CHANGELOG
+++ b/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
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index 03dd2b092a..5d885c62bf 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/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'],
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index bbc5e6ca99..7694911605 100644
--- a/activesupport/test/inflector_test.rb
+++ b/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",