Changeset 9052

Timestamp:

03/17/08 22:08:25 (2 months ago)

Author:

david

Message:

Added :format option to NumberHelper#number_to_currency to enable better localization support #11149 [lylo]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/number_helper.rb (modified) (3 diffs)
• trunk/actionpack/test/template/number_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added :format option to NumberHelper#number_to_currency to enable better localization support #11149 [lylo]
-
-* Fixed that TextHelper#excerpt would include one character too many #11268 [Irfy]

trunk/actionpack/lib/action_view/helpers/number_helper.rb

@@ -55 +55 @@
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
+      # * <tt>:format</tt>  - Sets the format of the output string (defaults to "%u%n"). The field types are:
+      #
+      #     %u  The currency unit
+      #     %n  The number
-      #
-      # ==== Examples
@@ -63 +67 @@
-      #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "")
-      #  # => &pound;1234567890,50
+      #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
+      #  # => 1234567890,50 &pound;
-      def number_to_currency(number, options = {})
-        options   = options.stringify_keys
@@ -69 +75 @@
-        separator = precision > 0 ? options["separator"] || "." : ""
-        delimiter = options["delimiter"] || ","
+        format    = options["format"] || "%u%n"
-
-        begin
-          parts = number_with_precision(number, precision).split('.')
-unit + number_with_delimiter(parts[0], delimiter) + separator + parts[1].to_s
+format.gsub(/%n/, number_with_delimiter(parts[0], delimiter) + separator + parts[1].to_s).gsub(/%u/, unit)
-        rescue
-          number

trunk/actionpack/test/template/number_helper_test.rb

@@ -26 +26 @@
-    assert_equal("£1234567890,50", number_to_currency(1234567890.50, {:unit => "£", :separator => ",", :delimiter => ""}))
-    assert_equal("$1,234,567,890.50", number_to_currency("1234567890.50"))
+    assert_equal("1,234,567,890.50 Kč", number_to_currency("1234567890.50", {:unit => "Kč", :format => "%n %u"}))
-    assert_equal("$x.", number_to_currency("x"))
-    assert_nil number_to_currency(nil)