Permalink
Browse files

Merge pull request #6356 from andhapp/fix-bug-with-inflections

Fix an issue with inflection
  • Loading branch information...
josevalim committed May 17, 2012
2 parents 47971a1 + bc51ad9 commit 6057a1d9d2522e27e8c9f2f44aab8cd2815f24da
Showing with 2 additions and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/inflections.rb
  2. +1 −0 activesupport/test/inflector_test_cases.rb
@@ -26,7 +26,7 @@ module ActiveSupport
inflect.singular(/(ss)$/i, '\1')
inflect.singular(/(n)ews$/i, '\1ews')
inflect.singular(/([ti])a$/i, '\1um')
- inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '\1\2sis')
+ inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '\1sis')
inflect.singular(/(^analy)(sis|ses)$/i, '\1sis')
inflect.singular(/([^f])ves$/i, '\1fe')
inflect.singular(/(hive)s$/i, '\1')
@@ -47,6 +47,7 @@ module InflectorTestCases
"medium" => "media",
"stadium" => "stadia",
"analysis" => "analyses",
+ "my_analysis" => "my_analyses",
"node_child" => "node_children",
"child" => "children",

0 comments on commit 6057a1d

Please sign in to comment.