File tree Expand file tree Collapse file tree 2 files changed +2
-10
lines changed
Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ def initialize(currency, *raw_rules)
99 @rules = normalize_formatting_rules ( raw_rules )
1010
1111 @rules = default_formatting_rules . merge ( @rules ) unless @rules [ :ignore_defaults ]
12- @rules = localize_formatting_rules ( @rules )
1312 @rules = translate_formatting_rules ( @rules ) if @rules [ :translate ]
1413 @rules [ :format ] ||= determine_format_from_formatting_rules ( @rules )
1514 @rules [ :delimiter_pattern ] ||= delimiter_pattern_rule ( @rules )
@@ -71,14 +70,6 @@ def translate_formatting_rules(rules)
7170 rules
7271 end
7372
74- def localize_formatting_rules ( rules )
75- if currency . iso_code == "JPY" && I18n . locale == :ja && rules [ :format ] == nil
76- rules [ :symbol ] = "円" unless rules [ :symbol ] == false
77- rules [ :format ] = '%n%u'
78- end
79- rules
80- end
81-
8273 def determine_format_from_formatting_rules ( rules )
8374 return currency . format if currency . format && !rules . has_key? ( :symbol_position )
8475
Original file line number Diff line number Diff line change 145145
146146 it "formats Japanese currency in Japanese properly" do
147147 money = Money . new ( 1000 , "JPY" )
148- expect ( money . format ) . to eq "1,000円"
148+ expect ( money . format ) . to eq "¥1,000"
149+ expect ( money . format ( format : "%n%u" , symbol : "円" ) ) . to eq "1,000円"
149150 expect ( money . format ( symbol : false ) ) . to eq "1,000"
150151 expect ( money . format ( format : "%u%n" ) ) . to eq "¥1,000"
151152 end
You can’t perform that action at this time.
0 commit comments