diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 15:39:31 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 15:39:31 -0600 |
| commit | e8c29853ff0916ae8174dae522bb8bb487dfd142 (patch) | |
| tree | 80f309cdead2acfc1f312212cf32335a6bef4ad9 /activesupport/lib | |
| parent | e200fe97f5b2ce62e2be1718c449293d07d77584 (diff) | |
| parent | 7eb7d6f7c1bda62c160420f0c3b99442a7967c1f (diff) | |
| download | rails-e8c29853ff0916ae8174dae522bb8bb487dfd142.tar.gz rails-e8c29853ff0916ae8174dae522bb8bb487dfd142.tar.bz2 rails-e8c29853ff0916ae8174dae522bb8bb487dfd142.zip | |
Merge pull request #20872 from maxjacobson/more-humane-rounding
Round some numbers more humanely
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/number_helper/number_to_human_converter.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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 |