Permalink
Browse files

Backport #9347 to rails 3.2

  • Loading branch information...
1 parent 2cf38ae commit 1b12d08a0f8489f0f3970f6d5e40ed119127c856 @hoffm hoffm committed with samsonasu Feb 20, 2013
@@ -1,5 +1,19 @@
## 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.
+ Backport #9347.
+
+ *Michael Hoffman*
+
* Include I18n locale fallbacks in view lookup.
Fixes GH#3512.
@@ -593,7 +593,7 @@ def number_to_human(number, options = {})
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
@@ -251,6 +251,11 @@ def test_number_to_human_with_custom_units
assert_equal '4.5 tens', number_to_human(45, :units => {:unit => "", :ten => ' tens '})
end
+ def test_number_to_human_with_custom_units_that_are_missing_the_needed_key
+ assert_equal '123', number_to_human(123, :units => {:thousand => 'k'})
+ assert_equal '123', number_to_human(123, :units => {})
+ end
+
def test_number_to_human_with_custom_format
assert_equal '123 times Thousand', number_to_human(123456, :format => "%n times %u")
volume = {:unit => "ml", :thousand => "lt", :million => "m3"}

0 comments on commit 1b12d08

Please sign in to comment.