Merge pull request #2339 from psibi/upstream-locale-fixes

Various locale specific and other fixes for faker

lib/faker/music/hiphop.rb

@@ -14,7 +14,7 @@ class << self
         #
         # @faker.version next
         def artist
-          fetch('hiphop.artist')
+          fetch('music.hiphop.artist')
         end
 
         ##
@@ -27,7 +27,7 @@ def artist
         #
         # @faker.version next
         def groups
-          fetch('hiphop.groups')
+          fetch('music.hiphop.groups')
         end
 
         ##
@@ -40,7 +40,7 @@ def groups
         #
         # @faker.version next
         def subgenres
-          fetch('hiphop.subgenres')
+          fetch('music.hiphop.subgenres')
         end
       end
     end

lib/locales/en/music.yml

@@ -320,145 +320,145 @@ en:
       - Tina
       - Mary
       - Jessica
-    hiphop:
-      subgenres:
-      - Low Fi
-      - Grime
-      - Drill
-      - Alternative
-      - Country
-      - Undeground
-      - West Coast
-      - East Coast
-      - Conscious
-      - Christian
-      - Gangsta
-      - Old School
-      - Southern
-      - Mid West
-      - Trap
-      - Boom Bap
-      - Melodic
-      groups:
-      - Outcast
-      - Griselda
-      - Wu-Tang Clan
-      - YMCMB
-      - Maybach Music
-      - Bad Boyz
-      - Rock Nation
-      - Jack Boys
-      - OVO
-      - Tribe Call Quest
-      - Cypress Hill
-      - Digital Undeground
-      - Naughty By Nature
-      - EPMD
-      - Run D.M.C
-      - N.W.A
-      - Salt & Pepa
-      - TLC
-      - G Unit
-      - Bone Thugs & Harmony
-      - Destiny's Child
-      - Public Enemy
-      - Mobb Deep
-      - Eric B. & Rakim
-      - Fugees
-      - The Sugarhill Gang
-      - D12
-      - Three 6 Mafia
-      - Migos
-      - Clipse
-      - Odd Future
-      - 2 Live Crew
-      - The Lox
-      - Dipset
-      artist:
-      - Drake
-      - Jay-Z
-      - Lil Wayne
-      - Travis Scott
-      - Ice Cube
-      - Wutang Clan
-      - Tribe Called Quest
-      - Nas
-      - Foxy Brown
-      - TI
-      - TPain
-      - Big Krit
-      - Joey BadA$$
-      - A$AP Rocky
-      - Tyler The Creator
-      - Frank Ocean
-      - 50 Cent
-      - Snoop Dogg
-      - Wiz Khalifa
-      - Tupac
-      - The Notorious B.I.G
-      - Missy Elliot
-      - DMX
-      - Eminem
-      - Method Man
-      - Red Man
-      - Kanye West
-      - Gucci Mane
-      - Baby Keem
-      - Roddy Ricch
-      - Nipsey Hussle
-      - Queen Latifah
-      - Pusha T
-      - Chief Keef
-      - Lil Reese
-      - Lil Peep
-      - Lil Snupe
-      - Meek Mill
-      - Wale
-      - Busta Rhymes
-      - Ludacris
-      - Ashanti
-      - Shy Glizzy
-      - Fredo Santana
-      - Fat Joe
-      - Don Toliver
-      - Sheck Wes
-      - Bobby Smurda
-      - Dave East
-      - J Holiday
-      - Chris Brown
-      - Omarion
-      - Fabulous
-      - Jadakiss
-      - Nicki Minaj
-      - Meg The Stallion
-      - Saweetie
-      - Larry June
-      - Quavo
-      - Offset
-      - Takeoff
-      - Stormzy
-      - xxxTentacion
-      - Juice Wrld
-      - Juicy J
-      - P Diddy
-      - Young Thug
-      - Gunna
-      - Lil Tecca
-      - Da Baby
-      - Lil Baby
-      - Lil Uzi
-      - 21 Savage
-      - 2 Chainz
-      - Craig Mac
-      - Cardi B
-      - Chance The Rapper
-      - Mac Miller
-      - The Game
-      - Styles P
-      - Paul Wall
-      - Cam'ron
-      - Jeezy
-      - Dr. Dre
-      - Nate Dogg
-      - Kurupt
-      - Twista
+      hiphop:
+        subgenres:
+        - Low Fi
+        - Grime
+        - Drill
+        - Alternative
+        - Country
+        - Undeground
+        - West Coast
+        - East Coast
+        - Conscious
+        - Christian
+        - Gangsta
+        - Old School
+        - Southern
+        - Mid West
+        - Trap
+        - Boom Bap
+        - Melodic
+        groups:
+        - Outcast
+        - Griselda
+        - Wu-Tang Clan
+        - YMCMB
+        - Maybach Music
+        - Bad Boyz
+        - Rock Nation
+        - Jack Boys
+        - OVO
+        - Tribe Call Quest
+        - Cypress Hill
+        - Digital Undeground
+        - Naughty By Nature
+        - EPMD
+        - Run D.M.C
+        - N.W.A
+        - Salt & Pepa
+        - TLC
+        - G Unit
+        - Bone Thugs & Harmony
+        - Destiny's Child
+        - Public Enemy
+        - Mobb Deep
+        - Eric B. & Rakim
+        - Fugees
+        - The Sugarhill Gang
+        - D12
+        - Three 6 Mafia
+        - Migos
+        - Clipse
+        - Odd Future
+        - 2 Live Crew
+        - The Lox
+        - Dipset
+        artist:
+        - Drake
+        - Jay-Z
+        - Lil Wayne
+        - Travis Scott
+        - Ice Cube
+        - Wutang Clan
+        - Tribe Called Quest
+        - Nas
+        - Foxy Brown
+        - TI
+        - TPain
+        - Big Krit
+        - Joey BadA$$
+        - A$AP Rocky
+        - Tyler The Creator
+        - Frank Ocean
+        - 50 Cent
+        - Snoop Dogg
+        - Wiz Khalifa
+        - Tupac
+        - The Notorious B.I.G
+        - Missy Elliot
+        - DMX
+        - Eminem
+        - Method Man
+        - Red Man
+        - Kanye West
+        - Gucci Mane
+        - Baby Keem
+        - Roddy Ricch
+        - Nipsey Hussle
+        - Queen Latifah
+        - Pusha T
+        - Chief Keef
+        - Lil Reese
+        - Lil Peep
+        - Lil Snupe
+        - Meek Mill
+        - Wale
+        - Busta Rhymes
+        - Ludacris
+        - Ashanti
+        - Shy Glizzy
+        - Fredo Santana
+        - Fat Joe
+        - Don Toliver
+        - Sheck Wes
+        - Bobby Smurda
+        - Dave East
+        - J Holiday
+        - Chris Brown
+        - Omarion
+        - Fabulous
+        - Jadakiss
+        - Nicki Minaj
+        - Meg The Stallion
+        - Saweetie
+        - Larry June
+        - Quavo
+        - Offset
+        - Takeoff
+        - Stormzy
+        - xxxTentacion
+        - Juice Wrld
+        - Juicy J
+        - P Diddy
+        - Young Thug
+        - Gunna
+        - Lil Tecca
+        - Da Baby
+        - Lil Baby
+        - Lil Uzi
+        - 21 Savage
+        - 2 Chainz
+        - Craig Mac
+        - Cardi B
+        - Chance The Rapper
+        - Mac Miller
+        - The Game
+        - Styles P
+        - Paul Wall
+        - Cam'ron
+        - Jeezy
+        - Dr. Dre
+        - Nate Dogg
+        - Kurupt
+        - Twista

lib/locales/en/touhou.yml

@@ -291,7 +291,7 @@ en:
           - Cat Sign "Cat's Walk"
           - Cat Sign "Vengeful Cat Spirit's Erratic Step"
           - Cursed Sprite "Zombie Fairy"
-          - Cursed Sprite "Vengeful Spirit: Possessed Fairy"
+          - 'Cursed Sprite "Vengeful Spirit: Possessed Fairy"'
           - Malicious Spirit "Spleen Eater"
           - Corpse Spirit "Vengeful Cannibal Spirit"
           - Atonement "Needle Mountain of a Former Hell"

lib/locales/es-AR.yml

@@ -1284,8 +1284,6 @@ es-AR:
                 - Zapala
                 - Zárate
             city:
-                - "#{city_names}"
-                - "#{city_names}"
                 - "#{city_names}"
                 - "#{male_city_saint_prefix} #{Name.male_first_name}"
                 - "#{female_city_saint_prefix} #{Name.female_first_name}"
@@ -1296,7 +1294,6 @@ es-AR:
                 - "#{army_city_prefix} #{Name.last_name}"
                 - "#{army_city_prefix} #{Name.last_name}"
                 - "#{city_prefix} #{army_city_prefix} #{Name.last_name}"
-                - "#{city_prefix} #{army_city_prefix} #{Name.last_name}"
 
             # -- state
 
@@ -3397,7 +3394,7 @@ es-AR:
                 - "2### 6#####"
                 - "3### 6#####"
                 - "11-7###-####"
-        country_code: "54"
+        country_code: ["54"]
 
         bank:
             name:

lib/locales/fr/appliance.yml

@@ -0,0 +1,4 @@
+fr:
+  faker:
+    appliance:
+      equipment: ["Ioniseur d'air", "Purificateur d'air", "Alimentation électrique", "Diffuseur de parfum", "Ventilateur de grenier", "Mini-four", "Insert", "Décapsuleur", "Mixeur", "Essoreuse", "Ouvre-boîte", "Ventilateur de plafond", "Aspirateur Central", "Sèche-linge", "Fer à repasser", "Presse-agrumes", "Lave-linge tout-en-un", "Placard égouttoir", "Lave-vaisselle", "Robot domestique", "Lave-vaisselle à tiroir", "Bouilloire électrique", "Refroidisseur par évaporation", "Hotte aspirante", "Radiateur soufflant", "Contrôleur de flamme", "Chauffage par air pulsé", "Sèche-futon", "Broyeur de cuisine", "Chaudière à gaz", "Boîte d'allumettes pour le lit", "CVC", "Sèche-cheveux", "Fer à lisser", "Plaque de cuisson", "Serveur personnel", "Humidificateur", "Glacière", "Réfrigérateur à kimchi", "Mangle", "Chauffage micathermique", "Micro-ondes", "Piège à souris", "Chaudière au fioul", "Four", "Déchiqueteuse à papier", "Chauffe-terrasse", "Radiateur", "Réfrigérateur", "Machine à coudre", "Chauffe-eau solaire", "Chauferette", "Nettoyeur vapeur", "Cuisinière", "Pompe de puisard", "Télévision", "Presse à Cravates", "Grille-pain", "Presse à pantalons", "Aspirateur", "Lave-linge", "Bouilloire", "Chauffe-eau", "Filtre à eau", "Ventilateur de fenêtre"]

lib/locales/fr/pokemon.yml

@@ -5,5 +5,3 @@ fr:
         names: ["Bulbizarre", "Herbizarre", "Florizarre", "Salamèche", "Reptincel", "Dracaufeu", "Carapuce", "Carabaffe", "Tortank", "Chenipan", "Chrysacier", "Papilusion", "Aspicot", "Coconfort", "Dardargnan", "Roucool", "Roucoups", "Roucarnage", "Rattata", "Rattatac", "Piafabec", "Rapasdepic", "Abo", "Arbok", "Pikachu", "Raichu", "Sabelette", "Sablaireau", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Mélofée", "Mélodelfe", "Goupix", "Feunard", "Rondoudou", "Grodoudou", "Nosférapti", "Nosféralto", "Mystherbe", "Ortide", "Rafflésia", "Paras", "Parasect", "Mimitoss", "Aéromite", "Taupiqueur", "Triopikeur", "Miaouss", "Persian", "Psykokwak", "Akwakwak", "Férosinge", "Colossinge", "Canidos", "Arcanin", "Ptitard", "Tétarte", "Tartard", "Abra", "Kadabra", "Alakazam", "Machoc", "Machopeur", "Mackogneur", "Chétiflor", "Boustiflor", "Empiflor", "Tentacool", "Tentacruel", "Racaillou", "Gravalanche", "Grolem", "Ponyta", "Galopa", "Ramoloss", "Flagadoss", "Magnéti", "Magnéton", "Canarticho", "Doduo", "Dodrio", "Otaria", "Lamantine", "Tadmorv", "Grotadmorv", "Kokyas", "Crustabri", "Fantominus", "Spectrum", "Ectoplasma", "Onix", "Soporifik", "Hypnomade", "Krabby", "Kraboss", "Voltorb", "Electrode", "Noeunoeuf", "Noadkoko", "Osselait", "Ossatueur", "Kicklee", "Tygnon", "Excelangue", "Smogo", "Smogogo", "Rhinocorne", "Rhinoféros", "Leveinard", "Saquedeneu", "Kangourex", "Hypotrempe", "Hypocéan", "Poissirène", "Poissoroy", "Stari", "Staross", "Mr. Mime", "Insécateur", "Lippoutou", "Elektek", "Magmar", "Scarabrute", "Tauros", "Magicarpe", "Léviator", "Lokhlass", "Métamorph", "Evoli", "Aquali", "Voltali", "Pyroli", "Porygon", "Amonita", "Amonistar", "Kabuto", "Kabutops", "Ptéra", "Ronflex", "Artikodin", "Electhor", "Sulfura", "Minidraco", "Draco", "Dracolosse", "Mewtwo", "Mew"]
         locations: ["Arabelle", "Roche-sur-Gliffe", "Flusselles", "Rotombourg", "Quarellis", "Pavonnay", "Ecorcia", "Ville noire", "Ebenelle", "Fort-Vanitas", "Joliberge", "Volucité", "Celadopole", "Célestia", "Azuria", "Ville-Griotte", "Irisia", "Cramois'Île", "Port Tempères", "Mozheim", "Relifac-le-Haut", "La Frescale", "Myokara", "Port Yoneuve", "Rosalia", "Vestigion", "Eternara", "Autéquia", "Zone de Combat", "Île 5", "Floraville", "Amaillide", "Cimetronelle", "Île 4", "Atrium Combat", "Parmanie", "Cromlac'h", "Doublonville", "Unionpolis", "Papeloa", "Flocombe", "Féli-Cité", "Batisques", "Entrelasque", "Vermilava", "Lavanville", "Romant-sous-Bois", "Arpentières", "Bourg-en-Vol", "Nénucrique", "Illumis", "Acajou", "Lavandia", "Parsemille", "Algatia", "Maillard", "Bourg Geon", "Méanville", "Renouet", "Rosyères", "Oliville", "Île 1", "Janusia", "Charbourg", "Pacifiville", "Bourg Palette", "Verchamps", "Clémenti-Ville", "Argenta", "Aire de Détente", "Mérouville", "Portail Safari", "Safrania", "Littorella", "Neuvartault", "Ogoesse", "Île 7", "Yantreizh", "Île 6", "Poivressel", "Auffrac-les-Congères", "Frimapic", "Bonville", "Atalanopolis", "Rivamar", "Aire de Survie", "Île 3", "Bonaugure", "Île 2", "Vaguelone", "Bourg Croquis", "Voilaroc", "Vergazon", "Carmin sur Mer", "Mauville", "Ondes-sur-Mer", "Jadielle", "Forêt Blanche"]
         moves: ["Vol-Vie", "Acide", "Acidarmure", "Hâte", "Amnésie", "Onde Boréale", "Pilonnage", "Bouclier", "Patience", "Etreinte", "Morsure", "Blizzard", "Plaquage", "Massd'Os", "Osmerang", "Ecume", "Bulles d'O", "Claquoir", "Poing Comète", "Onde Folie", "Choc Mental", "Constriction", "Conversion", "Riposte", "Pince-Masse", "Coupe", "Boul'Armure", "Tunnel", "Entrave", "Uppercut", "Double-Pied", "Torgnoles", "Reflet", "Damoclès", "Draco-Rage", "Dévorêve", "Bec Vrille", "Séisme", "Bomb'Oeuf", "Flammèche", "Explosion", "Déflagration", "Poing de Feu", "Danse Flamme", "Abîme", "Lance-Flamme", "Flash", "Vol", "Puissance", "Furie", "Combo-Griffe", "Regard Médusant", "Rugissement", "Croissance", "Guillotine", "Tornade", "Armure", "Buée Noire", "Coup d'Boule", "Pied Voltige", "Koud'Korne", "Empal'Korne", "Hydrocanon", "Ultralaser", "Croc de Mort", "Hypnose", "Laser Glace", "Poing-Glace", "Pied Sauté", "Poing Karaté", "Télékinésie", "Vampirisme", "Vampigraine", "Groz'Yeux", "Léchouille", "Mur Lumière", "Grobisou", "Balayage", "Yoga", "Méga-Sangsue", "Ultimawashi", "Ultimapoing", "Métronome", "Copie", "Lilliput", "Mimique", "Brume", "Ombre Nocturne", "Jackpot", "Picpic", "Danse-Fleur", "Dard-Nuée", "Gaz Toxik", "Poudre Poison", "Dard-Venin", "Ecras'Face", "Rafale Psy", "Psyko", "Vague Psy", "Vive-Attaque", "Frénésie", "Tranch'Herbe", "Coupe-Vent", "Soin", "Protection", "Repos", "Hurlement", "Eboulement", "Jet-Pierres", "Mawashi Geri", "Jet de Sable", "Griffe", "Grincement", "Amplitude", "Destruction", "Affûtage", "Berceuse", "Coud'Krâne", "Piqué", "Souplesse", "Tranche", "Poudre Dodo", "Détritus", "Purédpois", "Brouillard", "E-Coque", "Lance-Soleil", "Sonicboom", "Picanon", "Trempette", "Spore", "Ecrasement", "Force", "Sécrétion", "Lutte", "Para-Spore", "Sacrifice", "Clonage", "Croc Fatal", "Ultrason", "Surf", "Météores", "Danse-Lames", "Charge", "Mimi-Queue", "Bélier", "Téléport", "Mania", "Fatal-Foudre", "Poing-Eclair", "Eclair", "Cage-Eclair", "Tonnerre", "Toxic", "Morphing", "Triplattaque", "Double-Dard", "Force Poigne", "Fouet Liane", "Pistolet à O", "Cascade", "Cyclone", "Cru-Aile", "Repli", "Ligotage"]
-    appliance:
-      equipment: ["Ioniseur d'air", "Purificateur d'air", "Alimentation électrique", "Diffuseur de parfum", "Ventilateur de grenier", "Mini-four", "Insert", "Décapsuleur", "Mixeur", "Essoreuse", "Ouvre-boîte", "Ventilateur de plafond", "Aspirateur Central", "Sèche-linge", "Fer à repasser", "Presse-agrumes", "Lave-linge tout-en-un", "Placard égouttoir", "Lave-vaisselle", "Robot domestique", "Lave-vaisselle à tiroir", "Bouilloire électrique", "Refroidisseur par évaporation", "Hotte aspirante", "Radiateur soufflant", "Contrôleur de flamme", "Chauffage par air pulsé", "Sèche-futon", "Broyeur de cuisine", "Chaudière à gaz", "Boîte d'allumettes pour le lit", "CVC", "Sèche-cheveux", "Fer à lisser", "Plaque de cuisson", "Serveur personnel", "Humidificateur", "Glacière", "Réfrigérateur à kimchi", "Mangle", "Chauffage micathermique", "Micro-ondes", "Piège à souris", "Chaudière au fioul", "Four", "Déchiqueteuse à papier", "Chauffe-terrasse", "Radiateur", "Réfrigérateur", "Machine à coudre", "Chauffe-eau solaire", "Chauferette", "Nettoyeur vapeur", "Cuisinière", "Pompe de puisard", "Télévision", "Presse à Cravates", "Grille-pain", "Presse à pantalons", "Aspirateur", "Lave-linge", "Bouilloire", "Chauffe-eau", "Filtre à eau", "Ventilateur de fenêtre"]

lib/locales/ja/animal.yml

@@ -0,0 +1,5 @@
+ja:
+  faker:
+    creature:
+      animal:
+        name: ["ホンドテン", "ホワイトタイガー", "コツメカワウソ", "マンドリル", "エランド", "アムールヒョウ", "ブラッザグエノン", "カバ", "アルパカ", "ポニー", "オウサマペンギン", "アンデスコンドル", "オシドリ", "チーター", "ホンドリス", "ホンシュウジカ", "タンチョウ", "レッサーパンダ", "アメリカビーバー", "ジェフロイクモザル", "カピバラ", "マレーバク", "アカゲザル", "フンボルトペンギン", "パルマワラビー", "ビルマニシキヘビ", "アカカンガルー", "ワオキツネザル", "ラブラドールレトリバー", "アルダブラゾウガメ", "モルモット", "ヒヨコ（ニワトリ）", "ヤギ", "ヒツジ", "ウサギ", "ブラックバック", "シロクジャク", "ヒグマ", "アクシスジカ", "ヒクイドリ", "エミュー", "アフリカゾウ", "フラミンゴ", "シタツンガ", "ハゴロモヅル", "エジプトガン", "ライオン", "ミーアキャット", "ホオジロカンムリヅル", "コフラミンゴ", "ショウジョウトキ", "オウギバト", "ホンドフクロウ", "ホンドタヌキ", "ホンドキツネ", "オオワシ", "ヘビクイワシ", "コクチョウ", "アメリカバイソン", "ワピチ", "ミナミアフリカオットセイ", "ゴマフアザラシ", "アビシニアコロブス", "マントヒヒ", "シロテテナガザル", "シシオザル", "モモイロペリカン", "コモンリスザル", "オオサイチョウ", "シワコブサイチョウ", "メガネカイマン", "ラマ", "フタコブラクダ", "シナガチョウ", "アライグマ", "エジプトルーセットオオコウモリ", "アフリカタテガミヤマアラシ", "キリン", "ダチョウ", "シロサイ", "シマウマ", "バーバリーシープ"]

lib/locales/ja/cat.yml

@@ -0,0 +1,5 @@
+ja:
+  faker:
+    creature:
+      cat:
+        breed: ["アジアンセミロングヘア", "アビシニアン", "アメリカンカール", "アメリカンショートヘア", "アメリカンボブテイル", "アメリカンワイヤーヘア", "アラビアンマウ", "イジアン", "エキゾチックショートヘア", "エキゾチックフォールド", "エジプシャンマウ", "オーストラリアンミスト", "オシキャット", "オリエンタルショートヘア", "カオマニー", "キムリック", "キンカロー", "コーニッシュレックス", "コラット", "サイベリアン", "ジャパニーズボブテイル", "シャム", "シャルトリュー", "シンガプーラ", "ラパーマ", "リュコイ", "ジャーマンレックス", "ハバマブラウン", "ハイランダーリンクス", "スコティッシュフォールド", "スノーシュー", "スフィンクス", "セルカークレックス", "ソマリ", "クリルアイランドボブテイル", "ターキッシュアンゴラ", "ターキッシュバン", "チャウシー", "チートー", "カラーポイントショートヘア", "コーニッシュレックス", "デボンレックス", "ドンスコイ", "ドラゴンリー", "ヨーロピアンショートヘア", "デボンレックス", "トンキニーズ", "ノルウェージャンフォレストキャット", "バーマン", "バーミーズ", "バーミラ", "バリニーズ", "シャンティリー", "バンビーノ", "ヒマラヤン", "メコンボブテイル", "ミンスキン", "ブラジリアンショートヘア", "ブリティッシュロングヘア", "ブリティッシュショートヘア", "カリフォルニアスパングルド", "ペルシャ", "ベンガル", "ボンベイ", "マンクス", "マンチカン", "ミヌエット", "メインクーン", "ヨーロピアンバーミーズ", "ラガマフィン", "ラグドール", "ラパーマ", "ラムキン", "ロシアンブルー"]