diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-02-22 14:00:24 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-02-22 14:00:24 -0800 |
| commit | 4ffcd83dea4248652aa2bd92ada3b603ac179450 (patch) | |
| tree | 4a175bbd86485f55e6647f82f1bc305536c2f550 /activesupport | |
| parent | e4c2a13b1be2aa22c98b9581110aa72b39176c47 (diff) | |
| parent | 4e3ceedeba4f95d6f51380277c5562049ccdc264 (diff) | |
| download | rails-4ffcd83dea4248652aa2bd92ada3b603ac179450.tar.gz rails-4ffcd83dea4248652aa2bd92ada3b603ac179450.tar.bz2 rails-4ffcd83dea4248652aa2bd92ada3b603ac179450.zip | |
Merge pull request #9347 from hoffm/number_to_human_bug
Address edge case for number_to_human with units option.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 13 | ||||
| -rw-r--r-- | activesupport/lib/active_support/number_helper.rb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index df8cf5f8ec..16000d21b3 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,18 @@ ## Rails 4.0.0 (unreleased) ## +* `ActiveSupport::NumberHelper#number_to_human` returns the number unaltered when + the units hash does not contain the needed key, e.g. when the number provided is less + than the largest key proivided. + + Examples: + + number_to_human(123, :units => {}) # => 123 + number_to_human(123, :units => {:thousand => 'k'}) # => 123 + + Fixes #9269. + + *Michael Hoffman* + * Added beginning_of_minute support to core_ext calculations for Time and DateTime *Gagan Awhad* diff --git a/activesupport/lib/active_support/number_helper.rb b/activesupport/lib/active_support/number_helper.rb index 2191471daa..cc935e6cb9 100644 --- a/activesupport/lib/active_support/number_helper.rb +++ b/activesupport/lib/active_support/number_helper.rb @@ -580,7 +580,7 @@ module ActiveSupport unit = case units when Hash - units[DECIMAL_UNITS[display_exponent]] + units[DECIMAL_UNITS[display_exponent]] || '' when String, Symbol I18n.translate(:"#{units}.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i) else |