Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix pluralization for numbers formatted like '1.00'

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
commit b235af702a086dd06fa9849ee47942e8ce82090d 1 parent a1a6e54
@gabrielmansour gabrielmansour authored jeremy committed
View
2  actionpack/lib/action_view/helpers/text_helper.rb
@@ -187,7 +187,7 @@ def excerpt(text, phrase, *args)
# pluralize(0, 'person')
# # => 0 people
def pluralize(count, singular, plural = nil)
- "#{count || 0} " + ((count == 1 || count == '1') ? singular : (plural || singular.pluralize))
+ "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || singular.pluralize))
end
# Wraps the +text+ into lines no longer than +line_width+ width. This method
View
2  actionpack/test/template/text_helper_test.rb
@@ -228,6 +228,8 @@ def test_pluralization
assert_equal("2 counts", pluralize('2', "count"))
assert_equal("1,066 counts", pluralize('1,066', "count"))
assert_equal("1.25 counts", pluralize('1.25', "count"))
+ assert_equal("1.0 count", pluralize('1.0', "count"))
+ assert_equal("1.00 count", pluralize('1.00', "count"))
assert_equal("2 counters", pluralize(2, "count", "counters"))
assert_equal("0 counters", pluralize(nil, "count", "counters"))
assert_equal("2 people", pluralize(2, "person"))
Please sign in to comment.
Something went wrong with that request. Please try again.