File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -96,7 +96,9 @@ def youtube_url; 'https://youtube.com/CoderDojoJapan'; end
9696
9797 def prefecture_name_in_english ( prefecture_name )
9898 # 都道府県名の英語表記を返す簡易マッピング
99- # データベースには「県」「都」「府」が省略された形で保存されている
99+ # 「都」「府」「県」を除去してから検索
100+ name_without_suffix = prefecture_name . gsub ( /[都府県]$/ , '' )
101+
100102 prefecture_names = {
101103 '北海道' => 'Hokkaido' ,
102104 '青森' => 'Aomori' ,
@@ -147,7 +149,7 @@ def prefecture_name_in_english(prefecture_name)
147149 '沖縄' => 'Okinawa'
148150 }
149151
150- prefecture_names [ prefecture_name ] || prefecture_name
152+ prefecture_names [ name_without_suffix ] || prefecture_name
151153 end
152154
153155 def translate_dojo_tag ( tag_name )
Original file line number Diff line number Diff line change 2323 end
2424
2525 it "都道府県名が英語で表示される" do
26- # テストデータベースに都道府県を作成
27- Prefecture . find_or_create_by! ( name : "東京 " , region : "関東" )
28- Prefecture . find_or_create_by! ( name : "大阪 " , region : "近畿" )
26+ # テストデータベースに都道府県を作成(seeds.rbの形式に合わせる)
27+ Prefecture . find_or_create_by! ( name : "東京都 " , region : "関東" )
28+ Prefecture . find_or_create_by! ( name : "大阪府 " , region : "近畿" )
2929 Prefecture . find_or_create_by! ( name : "北海道" , region : "北海道" )
3030
3131 get "/english/stats"
You can’t perform that action at this time.
0 commit comments