diff options
| author | Max Jacobson <max@hardscrabble.net> | 2015-07-14 00:54:56 -0400 |
|---|---|---|
| committer | Max Jacobson <max@hardscrabble.net> | 2015-07-26 12:37:39 -0400 |
| commit | 597a9276671f5d7884a0ee1a617656dd5ee4b0ea (patch) | |
| tree | 81b769002b81c4c926b52664d5d7b7a28cc995bc | |
| parent | e90b58106d09af585e85238d7d49cf79f006d4d4 (diff) | |
| download | rails-597a9276671f5d7884a0ee1a617656dd5ee4b0ea.tar.gz rails-597a9276671f5d7884a0ee1a617656dd5ee4b0ea.tar.bz2 rails-597a9276671f5d7884a0ee1a617656dd5ee4b0ea.zip | |
Round some numbers more humanely
Fix #20869
| -rw-r--r-- | activesupport/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/number_helper/number_to_human_converter.rb | 6 | ||||
| -rw-r--r-- | activesupport/test/number_helper_test.rb | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 7148f289bb..38c825bc05 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +* Fix `number_to_human` rounding 999999999 to "1000 Million" instead of + "1 Billion". + + *Max Jacobson* + * Fix `TimeWithZone#eql?` to properly handle `TimeWithZone` created from `DateTime`: twz = DateTime.now.in_time_zone twz.eql?(twz.dup) => true diff --git a/activesupport/lib/active_support/number_helper/number_to_human_converter.rb b/activesupport/lib/active_support/number_helper/number_to_human_converter.rb index 5c6fe2df83..7a1f8171c0 100644 --- a/activesupport/lib/active_support/number_helper/number_to_human_converter.rb +++ b/activesupport/lib/active_support/number_helper/number_to_human_converter.rb @@ -20,9 +20,11 @@ module ActiveSupport exponent = calculate_exponent(units) @number = number / (10 ** exponent) + until (rounded_number = NumberToRoundedConverter.convert(number, options)) != NumberToRoundedConverter.convert(1000, options) + @number = number / 1000.0 + exponent += 3 + end unit = determine_unit(units, exponent) - - rounded_number = NumberToRoundedConverter.convert(number, options) format.gsub('%n'.freeze, rounded_number).gsub('%u'.freeze, unit).strip end diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb index 83efbffdfb..3610d39daa 100644 --- a/activesupport/test/number_helper_test.rb +++ b/activesupport/test/number_helper_test.rb @@ -293,6 +293,8 @@ module ActiveSupport assert_equal '1.2346 Million', number_helper.number_to_human(1234567, :precision => 4, :significant => false) assert_equal '1,2 Million', number_helper.number_to_human(1234567, :precision => 1, :significant => false, :separator => ',') assert_equal '1 Million', number_helper.number_to_human(1234567, :precision => 0, :significant => true, :separator => ',') #significant forced to false + assert_equal '1 Million', number_helper.number_to_human(999999) + assert_equal '1 Billion', number_helper.number_to_human(999999999) end end |