From f029042c367577a6b7c53011d6b12511e10f93c9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 16 May 2010 18:00:08 -0300
Subject: [PATCH] Added default currency values to NumberHelper and pass them to I18n.translate

[#4604 state:committed]
---
 .../lib/action_view/helpers/number_helper.rb       |   13 +++++++++----
 .../test/template/number_helper_i18n_test.rb       |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 01fecc0..8c82243 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -102,11 +102,12 @@ module ActionView
 
         options.symbolize_keys!
 
-        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {})
-        defaults  = defaults.merge(currency)
+        defaults  = self.default_currency_values.merge(options)
+        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => defaults)
+        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => defaults)
 
-        options = options.reverse_merge(defaults)
+        defaults  = self.default_currency_values.merge(defaults).merge!(currency)
+        options   = options.reverse_merge(defaults)
 
         unit      = options.delete(:unit)
         format    = options.delete(:format)
@@ -503,6 +504,10 @@ module ActionView
         decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip.html_safe
       end
 
+      def default_currency_values
+        { :format => "%u%n", :unit => "$", :separator => ".", :delimiter => ",",
+          :precision => 2, :significant => false, :strip_insignificant_zeros => false }
+      end
     end
   end
 end
diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
index f730a0d..2f96fe5 100644
--- a/actionpack/test/template/number_helper_i18n_test.rb
+++ b/actionpack/test/template/number_helper_i18n_test.rb
@@ -45,6 +45,12 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("&$ - 10.00", number_to_currency(10, :locale => 'ts'))
   end
 
+  def test_number_to_currency_with_clean_i18n_settings
+    clean_i18n do
+      assert_equal("$10.00", number_to_currency(10, :locale => 'de'))
+    end
+  end
+
   def test_number_with_precision
     #Delimiter was set to ""
     assert_equal("10000", number_with_precision(10000, :locale => 'ts'))
@@ -92,4 +98,15 @@ class NumberHelperTest < ActionView::TestCase
     #Significant was set to true with precision 2, with custom translated units
     assert_equal "4.3 cm", number_to_human(0.0432, :locale => 'ts', :units => :custom_units_for_number_to_human)
   end
+
+  private
+    def clean_i18n
+      load_path = I18n.load_path.dup
+      I18n.load_path.clear
+      I18n.reload!
+      yield
+    ensure
+      I18n.load_path = load_path
+      I18n.reload!
+    end
 end
-- 
1.7.1