integrating I18n into Rails

1 files changed, 12 insertions, 6 deletions

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 120bb4cc1f..9d98036f2d 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -69,13 +69,19 @@ module ActionView
       #  number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "", :format => "%n %u")
       #  # => 1234567890,50 £
       def number_to_currency(number, options = {})
-        options   = options.stringify_keys
-        precision = options["precision"] || 2
-        unit      = options["unit"] || "$"
-        separator = precision > 0 ? options["separator"] || "." : ""
-        delimiter = options["delimiter"] || ","
-        format    = options["format"] || "%u%n"
+        options = options.symbolize_keys
+        
+        locale = options[:locale]
+        locale ||= request.locale if respond_to?(:request)
 
+        defaults  = :'currency.format'.t(locale) || {}
+        precision = options[:precision] || defaults[:precision]
+        unit      = options[:unit]      || defaults[:unit]
+        separator = options[:separator] || defaults[:separator]
+        delimiter = options[:delimiter] || defaults[:delimiter]
+        format    = options[:format]    || defaults[:format]
+        separator = '' if precision == 0
+        
         begin
           parts = number_with_precision(number, precision).split('.')
           format.gsub(/%n/, number_with_delimiter(parts[0], delimiter) + separator + parts[1].to_s).gsub(/%u/, unit)