Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix status pluralization bug so status_codes doesn't get pluralized a…

…s statuses_code. Closes #2758.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2900 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 8210f70c7cbc14a762b198f21814b96664b2c867 1 parent 645de33
@jeremy jeremy authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix status pluralization bug so status_codes doesn't get pluralized as statuses_code. #2758 [keithm@infused.org]
+
* Added Kernel#silence_stderr to silence stderr for the duration of the given block [Sam Stephenson]
* Changed Kernel#` to print a message to stderr (like Unix) instead of raising Errno::ENOENT on Win32 [Sam Stephenson]
View
4 activesupport/lib/active_support/inflections.rb
@@ -3,7 +3,7 @@
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)$/i, '\1es'
inflect.plural /(bu)s$/i, '\1ses'
inflect.plural /(buffal|tomat)o$/i, '\1oes'
inflect.plural /([ti])um$/i, '\1a'
@@ -50,4 +50,4 @@
inflect.irregular 'move', 'moves'
inflect.uncountable %w( equipment information rice money species series fish sheep )
-end
+end
View
1  activesupport/test/inflector_test.rb
@@ -81,6 +81,7 @@ class InflectorTest < Test::Unit::TestCase
"equipment" => "equipment",
"bus" => "buses",
"status" => "statuses",
+ "status_code" => "status_codes",
"mouse" => "mice",
"louse" => "lice",
Please sign in to comment.
Something went wrong with that request. Please try again.