diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/inflector.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/inflector_test.rb | 1 |
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", |