aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/number_helper.rb
diff options
context:
space:
mode:
authorhoffm <m@hof.fm>2013-02-20 16:15:59 -0500
committerhoffm <m@hof.fm>2013-02-22 08:25:51 -0500
commit4e3ceedeba4f95d6f51380277c5562049ccdc264 (patch)
tree0637fb37a974ab68f97ca5584f22e25b1b56e60e /activesupport/lib/active_support/number_helper.rb
parent31f807c7aaaf12c16ea1572559c00f49d54d6f43 (diff)
downloadrails-4e3ceedeba4f95d6f51380277c5562049ccdc264.tar.gz
rails-4e3ceedeba4f95d6f51380277c5562049ccdc264.tar.bz2
rails-4e3ceedeba4f95d6f51380277c5562049ccdc264.zip
Address edge case for number_to_human with units option.
ActiveSupport::NumberHelper#number_to_human now 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 provided.
Diffstat (limited to 'activesupport/lib/active_support/number_helper.rb')
-rw-r--r--activesupport/lib/active_support/number_helper.rb2
1 files changed, 1 insertions, 1 deletions
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