From d7d11f0dab7f2875d04c17921e12fe62ac6e9566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 2 Dec 2013 22:31:05 -0200 Subject: :sicssors: --- activesupport/lib/active_support/number_helper/number_converter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/number_helper/number_converter.rb') 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 -- cgit v1.2.3