From 8f662ddf381a906dfbb37840e94708fb674c5f7e Mon Sep 17 00:00:00 2001 From: tltjr Date: Mon, 12 Apr 2010 16:22:08 -0400 Subject: [PATCH] Corrected several incorrect pluralizations in inflector.rb --- activesupport/lib/active_support/inflections.rb | 6 ++---- activesupport/test/inflector_test_cases.rb | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb index e7b5387..579c877 100644 --- a/activesupport/lib/active_support/inflections.rb +++ b/activesupport/lib/active_support/inflections.rb @@ -3,8 +3,7 @@ module ActiveSupport inflect.plural(/$/, 's') inflect.plural(/s$/i, 's') inflect.plural(/(ax|test)is$/i, '\1es') - inflect.plural(/(octop|vir)us$/i, '\1i') - inflect.plural(/(alias|status)$/i, '\1es') + inflect.plural(/(alias|status|octopus|hippopotamus|virus)$/i, '\1es') inflect.plural(/(bu)s$/i, '\1ses') inflect.plural(/(buffal|tomat)o$/i, '\1oes') inflect.plural(/([ti])um$/i, '\1a') @@ -36,8 +35,7 @@ module ActiveSupport inflect.singular(/(o)es$/i, '\1') inflect.singular(/(shoe)s$/i, '\1') inflect.singular(/(cris|ax|test)es$/i, '\1is') - inflect.singular(/(octop|vir)i$/i, '\1us') - inflect.singular(/(alias|status)es$/i, '\1') + inflect.singular(/(alias|status|octopus|virus|hippopotamus)es$/i, '\1') inflect.singular(/^(ox)en/i, '\1') inflect.singular(/(vert|ind)ices$/i, '\1ex') inflect.singular(/(matr)ices$/i, '\1ix') diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb index 29f87ac..90b2834 100644 --- a/activesupport/test/inflector_test_cases.rb +++ b/activesupport/test/inflector_test_cases.rb @@ -81,8 +81,9 @@ module InflectorTestCases "louse" => "lice", "house" => "houses", - "octopus" => "octopi", - "virus" => "viri", + "octopus" => "octopuses", + "hippopotamus" => "hippopotamuses", + "virus" => "viruses", "alias" => "aliases", "portfolio" => "portfolios", -- 1.6.3.3