diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:31:05 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:32:22 -0200 |
commit | d7d11f0dab7f2875d04c17921e12fe62ac6e9566 (patch) | |
tree | 7f30fed78a0854fc031aed15db5ad4d5c261cea4 /activesupport/lib/active_support/number_helper/number_converter.rb | |
parent | d752ae16abd5f1e48983fc12e18f50cba1896131 (diff) | |
download | rails-d7d11f0dab7f2875d04c17921e12fe62ac6e9566.tar.gz rails-d7d11f0dab7f2875d04c17921e12fe62ac6e9566.tar.bz2 rails-d7d11f0dab7f2875d04c17921e12fe62ac6e9566.zip |
:sicssors:
Diffstat (limited to 'activesupport/lib/active_support/number_helper/number_converter.rb')
-rw-r--r-- | activesupport/lib/active_support/number_helper/number_converter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/number_helper/number_converter.rb b/activesupport/lib/active_support/number_helper/number_converter.rb index 157d7820c3..4bc8b4a8e7 100644 --- a/activesupport/lib/active_support/number_helper/number_converter.rb +++ b/activesupport/lib/active_support/number_helper/number_converter.rb @@ -7,7 +7,6 @@ require 'active_support/core_ext/class/attribute' module ActiveSupport module NumberHelper class NumberConverter # :nodoc: - # Default and i18n option namespace per class class_attribute :namespace @@ -149,9 +148,11 @@ module ActiveSupport def i18n_format_options #:nodoc: locale = opts[:locale] options = I18n.translate(:'number.format', locale: locale, default: {}).dup + if namespace options.merge!(I18n.translate(:"number.#{namespace}.format", locale: locale, default: {})) end + options end @@ -172,7 +173,6 @@ module ActiveSupport rescue ArgumentError, TypeError false end - end end end |