Permalink
Browse files

Fixed that pluralizing an empty string should return the same empty s…

…tring, not "s" (closes #7720) [josh]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7569 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 59c36fd commit 3dcae9fefd0af8f7f8e7d3368ec36128880add51 @dhh dhh committed Sep 22, 2007
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that pluralizing an empty string should return the same empty string, not "s" #7720 [josh]
+
* Added call to inspect on non-string classes for the logger #8533 [codahale]
* Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change. [Jeremy Kemper]
@@ -106,7 +106,7 @@ def inflections
def pluralize(word)
result = word.to_s.dup
- if inflections.uncountables.include?(result.downcase)
+ if word.empty? || inflections.uncountables.include?(result.downcase)
result
else
inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
@@ -220,6 +220,10 @@ def test_pluralize_plurals
assert_equal "Plurals", Inflector.pluralize("Plurals")
end
+ def test_pluralize_empty_string
+ assert_equal "", Inflector.pluralize("")
+ end
+
SingularToPlural.each do |singular, plural|
define_method "test_pluralize_#{singular}" do
assert_equal(plural, Inflector.pluralize(singular))

0 comments on commit 3dcae9f

Please sign in to comment.