Merge pull request RubyMoney#1067 from masoo/jpy_formatting

Fix the issue where japanese formatting is no longer possible.
angellist · Mar 13, 2024 · 2ef600a · 2ef600a
2 parents 79989af + 656aab2
commit 2ef600a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/money/money/formatting_rules.rb b/lib/money/money/formatting_rules.rb
@@ -72,7 +72,7 @@ def translate_formatting_rules(rules)
     end
 
     def localize_formatting_rules(rules)
-      if currency.iso_code == "JPY" && I18n.locale == :ja
+      if currency.iso_code == "JPY" && I18n.locale == :ja && rules[:format] == nil
         rules[:symbol] = "円" unless rules[:symbol] == false
         rules[:format] = '%n%u'
       end

diff --git a/spec/money/formatting_spec.rb b/spec/money/formatting_spec.rb
@@ -147,6 +147,7 @@
         money = Money.new(1000, "JPY")
         expect(money.format).to eq "1,000円"
         expect(money.format(symbol: false)).to eq "1,000"
+        expect(money.format(format: "%u%n")).to eq "¥1,000"
       end
 
       after  { I18n.locale = @_locale }