diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-19 07:59:15 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-19 07:59:15 -0700 |
| commit | 493c10ea2999557b15e5a1efd523e6c987803750 (patch) | |
| tree | c01136dfb1696551640387bb0019bd23d903f29b /actionpack/lib | |
| parent | 2cf38aebacaf78260848a54bfbb5bf5a9b627598 (diff) | |
| parent | 1b12d08a0f8489f0f3970f6d5e40ed119127c856 (diff) | |
| download | rails-493c10ea2999557b15e5a1efd523e6c987803750.tar.gz rails-493c10ea2999557b15e5a1efd523e6c987803750.tar.bz2 rails-493c10ea2999557b15e5a1efd523e6c987803750.zip | |
Merge pull request #9804 from samsonasu/backport_number_to_human_fixes
Backport #9347 to rails 3.2
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 4519230fda..ad86d13456 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -593,7 +593,7 @@ module ActionView 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 |