From 1b12d08a0f8489f0f3970f6d5e40ed119127c856 Mon Sep 17 00:00:00 2001 From: hoffm Date: Wed, 20 Feb 2013 16:15:59 -0500 Subject: Backport #9347 to rails 3.2 --- actionpack/CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'actionpack/CHANGELOG.md') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 80c0def5b3..8c7e3327f3 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -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. -- cgit v1.2.3