Add a couple more odd katakana combos to roomaji.py.

This covers wooguru and chiraamy; also change their temporary names in
pokemon.csv to reflect this.

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 6e4a862..2700299 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -570,7 +570,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 569,dasutodasu,,,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,0
 570,zoroa,,,5,291,7,125,わるぎつね,4,,,1,75,66,70,0,25,0,0
 571,zoroaaku,,,5,291,16,811,ばけぎつね,4,,,1,45,179,70,0,20,0,0
 569,dasutodasu,,,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,0
 570,zoroa,,,5,291,7,125,わるぎつね,4,,,1,75,66,70,0,25,0,0
 571,zoroaaku,,,5,291,16,811,ばけぎつね,4,,,1,45,179,70,0,20,0,0

-572,chiraamii,,,5,292,4,58,チンチラ,4,,,6,255,60,70,0,15,0,0
+572,chiraamy,,,5,292,4,58,チンチラ,4,,,6,255,60,70,0,15,0,0

 573,chirachiino,,,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,0
 574,gochimu,,,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,0
 575,gochimiru,,,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,0
 573,chirachiino,,,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,0
 574,gochimu,,,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,0
 575,gochimiru,,,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,0


@@ -626,7 +626,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 625,kirikizan,,,5,317,16,700,とうじん,8,,,4,45,172,35,0,20,0,0
 626,baffuron,,,5,318,16,946,ずつきうし,3,,,4,45,172,70,0,20,0,0
 627,washibon,,,5,319,5,105,ヒナわし,9,,,0,190,70,70,0,20,0,0
 625,kirikizan,,,5,317,16,700,とうじん,8,,,4,45,172,35,0,20,0,0
 626,baffuron,,,5,318,16,946,ずつきうし,3,,,4,45,172,70,0,20,0,0
 627,washibon,,,5,319,5,105,ヒナわし,9,,,0,190,70,70,0,20,0,0

-628,uooguru,,,5,319,15,410,ゆうもう,8,,,0,60,179,70,0,20,0,0
+628,wooguru,,,5,319,15,410,ゆうもう,8,,,0,60,179,70,0,20,0,0

 629,baruchai,,,5,320,5,90,おむつ,3,,,8,190,74,35,0,20,0,0
 630,barujiina,,,5,320,12,395,ほねわし,3,,,8,60,179,35,0,20,0,0
 631,kuitaran,,,5,321,14,580,アリクイ,8,,,4,90,169,70,0,20,0,0
 629,baruchai,,,5,320,5,90,おむつ,3,,,8,190,74,35,0,20,0,0
 630,barujiina,,,5,320,12,395,ほねわし,3,,,8,60,179,35,0,20,0,0
 631,kuitaran,,,5,321,14,580,アリクイ,8,,,4,90,169,70,0,20,0,0

diff --git a/pokedex/roomaji.py b/pokedex/roomaji.py
index 9db6b07..7740f0d 100644 (file)
--- a/pokedex/roomaji.py
+++ b/pokedex/roomaji.py
@@ -60,7 +60,7 @@ _roomaji_small_kana_combos = {
     # particularly weird, but it seems to be what GF intends
 
     # Simple vowel replacement
     # particularly weird, but it seems to be what GF intends
 
     # Simple vowel replacement

-                    u'ウィ': 'wi',  u'ウゥ': 'wu',  u'ウェ': 'we',
+                    u'ウィ': 'wi',  u'ウゥ': 'wu',  u'ウェ': 'we',  u'ウォ': 'wo',

     u'ヴァ': 'va',  u'ヴィ': 'vi',                  u'ヴェ': 've',  u'ヴォ': 'vo',
                                                     u'チェ': 'che',
                                                     u'シェ': 'she',
     u'ヴァ': 'va',  u'ヴィ': 'vi',                  u'ヴェ': 've',  u'ヴォ': 'vo',
                                                     u'チェ': 'che',
                                                     u'シェ': 'she',


@@ -71,6 +71,7 @@ _roomaji_small_kana_combos = {
 
     # Not so much
     u'シィ': 'sy',
 
     # Not so much
     u'シィ': 'sy',

+    u'ミィ': 'my',

     u'ビィ': 'by',
     u'ピィ': 'py',
 }
     u'ビィ': 'by',
     u'ピィ': 'py',
 }