diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-30 13:04:37 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-30 13:04:37 +0000 |
| commit | 7635facdc8f9f1f41f5f19d4902d8598625768c7 (patch) | |
| tree | d60aa6367c1f35fc8872b3d5d7a06a895c215317 /activesupport | |
| parent | d34a346d9d928e8dbc18b415ce0343ed724dfb26 (diff) | |
| download | rails-7635facdc8f9f1f41f5f19d4902d8598625768c7.tar.gz rails-7635facdc8f9f1f41f5f19d4902d8598625768c7.tar.bz2 rails-7635facdc8f9f1f41f5f19d4902d8598625768c7.zip | |
Inflections: don't singularize -ies plurals.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4868 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/inflections.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 4eded063aa..bcf2860c53 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Inflections: don't singularize -ies plurals. [foamdino@gmail.com, Mark Van Holstyn] + * Update Initializer to use load_once_paths to avoid plugin reloading. References #5852. [Nicholas Seckar] * Use Array#assoc in ActiveSupport::OrderedHash. [Mauricio Fernandez] diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb index ba8a395c06..8f3f8618cc 100644 --- a/activesupport/lib/active_support/inflections.rb +++ b/activesupport/lib/active_support/inflections.rb @@ -11,7 +11,6 @@ Inflector.inflections do |inflect| inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves') inflect.plural(/(hive)$/i, '\1s') inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies') - inflect.plural(/([^aeiouy]|qu)ies$/i, '\1y') inflect.plural(/(x|ch|ss|sh)$/i, '\1es') inflect.plural(/(matr|vert|ind)ix|ex$/i, '\1ices') inflect.plural(/([m|l])ouse$/i, '\1ice') |