Skip to content
Browse files

fixes an issue with number_to_human when converting values which are …

…less than 1 but greater than -1 [#6576 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
1 parent e8458d3 commit 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 @joshk joshk committed with spastorino
View
2 actionpack/lib/action_view/helpers/number_helper.rb
@@ -472,7 +472,7 @@ def number_to_human(number, options = {})
end.keys.map{|e_name| inverted_du[e_name] }.sort_by{|e| -e}
number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
- display_exponent = unit_exponents.find{|e| number_exponent >= e }
+ display_exponent = unit_exponents.find{ |e| number_exponent >= e } || 0
number /= 10 ** display_exponent
unit = case units
View
4 actionpack/test/template/number_helper_test.rb
@@ -195,7 +195,9 @@ def test_number_to_human_size_with_custom_delimiter_and_separator
def test_number_to_human
assert_equal '-123', number_to_human(-123)
- assert_equal '0', number_to_human(0)
+ assert_equal '-0.5', number_to_human(-0.5)
+ assert_equal '0', number_to_human(0)
+ assert_equal '0.5', number_to_human(0.5)
assert_equal '123', number_to_human(123)
assert_equal '1.23 Thousand', number_to_human(1234)
assert_equal '12.3 Thousand', number_to_human(12345)

0 comments on commit 0eae625

Please sign in to comment.
Something went wrong with that request. Please try again.