Really don't override fractional digits for currency format

elixir-cldr · Jul 24, 2023 · e31a933 · e31a933
1 parent fb232a1
commit e31a933
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/cldr/number/formatter/decimal_formatter.ex b/lib/cldr/number/formatter/decimal_formatter.ex
@@ -826,22 +826,22 @@ defmodule Cldr.Number.Formatter.Decimal do
 
   def adjust_fraction_for_currency(meta, currency, :accounting, backend) do
     {:ok, currency} = Currency.currency_for_code(currency, backend)
-    do_adjust_fraction(meta, meta.fractional_digits.max, currency.rounding)
+    do_adjust_fraction(meta, currency.digits, currency.rounding)
   end
 
   def adjust_fraction_for_currency(meta, currency, :cash, backend) do
     {:ok, currency} = Currency.currency_for_code(currency, backend)
-    do_adjust_fraction(meta, meta.fractional_digits.max, currency.cash_rounding)
+    do_adjust_fraction(meta, currency.cash_digits, currency.cash_rounding)
   end
 
   def adjust_fraction_for_currency(meta, currency, :iso, backend) do
     {:ok, currency} = Currency.currency_for_code(currency, backend)
-    do_adjust_fraction(meta, meta.fractional_digits.max, currency.iso_digits)
+    do_adjust_fraction(meta, currency.iso_digits, currency.iso_digits)
   end
 
   defp do_adjust_fraction(meta, digits, rounding) do
     rounding = power_of_10(-digits) * rounding
-    %{meta | fractional_digits: %{max: digits, min: digits}, round_nearest: rounding}
+    %{meta | round_nearest: rounding}
   end
 
   # Functions to update metadata to reflect the

diff --git a/test/support/number_format_test_data.exs b/test/support/number_format_test_data.exs
@@ -17,6 +17,9 @@ defmodule Cldr.Test.Number.Format do
       {1234.567, "1 234,57 €", [format: "#,##0.00 ¤", locale: "fr", currency: :EUR]},
       {1234.567, "1 235 JPY", [format: "#,##0 ¤", locale: "fr", currency: "JPY"]},
       {1234.567, "1 234,57 JPY", [format: "#,##0.00 ¤", locale: "fr", currency: "JPY"]},
+      {1234.567, "1 234,57 JPY", [format: "#,##0.## ¤", locale: "fr", currency: "JPY"]},
+      {1234.00, "1 234 JPY", [format: "#,##0.## ¤", locale: "fr", currency: "JPY"]},
+      {1234, "1 234 JPY", [format: "#,##0.## ¤", locale: "fr", currency: "JPY"]},
 
       # Fraction grouping
       {1234.4353244565, "1234,435 324 456 5", [format: "#,###.###,#########", locale: "pl"]},