From d6d916e281eceef7e2760c1b82710f90f2c76524 Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Wed, 17 Aug 2016 13:18:51 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Add=20a=20description=20of=20the=20shape=20?= =?UTF-8?q?picks=20from=20Bulbap=C3=A9dia=20Add=20the=20french=20translati?= =?UTF-8?q?on=20for=20this=20table=20http://bulbapedia.bulbagarden.net/wik?= =?UTF-8?q?i/List=5Fof=5FPok%C3%A9mon=5Fby=5Fbody=5Fstyle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pokedex/data/csv/pokemon_shape_prose.csv | 44 ++++++++++++++++-------- pokedex/db/tables.py | 3 ++ 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pokedex/data/csv/pokemon_shape_prose.csv b/pokedex/data/csv/pokemon_shape_prose.csv index 38fca57..3b9eccc 100644 --- a/pokedex/data/csv/pokemon_shape_prose.csv +++ b/pokedex/data/csv/pokemon_shape_prose.csv @@ -1,15 +1,29 @@ -pokemon_shape_id,local_language_id,name,awesome_name -1,9,Ball,Pomaceous -2,9,Squiggle,Caudal -3,9,Fish,Ichthyic -4,9,Arms,Brachial -5,9,Blob,Alvine -6,9,Upright,Sciurine -7,9,Legs,Crural -8,9,Quadruped,Mensal -9,9,Wings,Alar -10,9,Tentacles,Cilial -11,9,Heads,Polycephalic -12,9,Humanoid,Anthropomorphic -13,9,Bug wings,Lepidopterous -14,9,Armor,Chitinous +pokemon_shape_id,local_language_id,name,awesome_name,description +1,5,Balle,Pomacé,Pokémon constitués uniquement d'une tête +2,5,Sinueux,Caudal,Pokémon avec un corps serpentin +3,5,Poisson,Ichtyque,Pokémon disposant de nageoires +4,5,Bras,Brachial,Pokémon constitués d'une tête et de bras +5,5,Goutte,Alvin,Pokémon constitués d'une tête et d'un corps +6,5,Droit,Sciurine,Pokémon bipèdes disposant d'une queue +7,5,Jambes,Crural,Pokémon constitués d'une tête et de jambes +8,5,Quadrupède,Mensal,Pokémon quadrupèdes +9,5,Ailes,Alaire,Pokémon avec une seule paire d'aile +10,5,Tentacules,Ciliaire,Pokémon avec des tentacules ou possédant de multiples pattes +11,5,Têtes,Polycéphale,Pokémon avec un corps multiple +12,5,Humanoïde,Anthropomorphique,Pokémon bipèdes sans queue +13,5,Ailes d'insecte,Lépidoptère,Pokémon avec deux paires d'ailes +14,5,Armure,Chitineux,Pokémon avec un corps insectoïde +1,9,Ball,Pomaceous,Pokémon consisting of only a head +2,9,Squiggle,Caudal,Pokémon with serpentine bodies +3,9,Fish,Ichthyic,Pokémon with fins +4,9,Arms,Brachial,Pokémon consisting of a head and arms +5,9,Blob,Alvine,Pokémon consisting of a head and a base +6,9,Upright,Sciurine,"Pokémon with a bipedal, tailed form" +7,9,Legs,Crural,Pokémon consisting of a head and legs +8,9,Quadruped,Mensal,Pokémon with a quadruped body +9,9,Wings,Alar,Pokémon with a single pair of wings +10,9,Tentacles,Cilial,Pokémon with tentacles or a multiped body +11,9,Heads,Polycephalic,Pokémon consisting of multiple bodies +12,9,Humanoid,Anthropomorphic,"Pokémon with a bipedal, tailless form" +13,9,Bug wings,Lepidopterous,Pokémon with two or more pairs of wings +14,9,Armor,Chitinous,Pokémon with an insectoid body diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 5382196..4652838 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1977,6 +1977,9 @@ create_translation_table('pokemon_shape_prose', PokemonShape, 'prose', awesome_name = Column(Unicode(79), nullable=True, doc=u"A splendiferous name of the body shape", info=dict(format='plaintext')), + description = Column(UnicodeText, nullable=True, + doc=u"A detailed description of the body shape", + info=dict(format='plaintext')), ) class PokemonSpecies(TableBase): From b2fbc36b23ab2176069c2822c54378dc0b09fdcb Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Wed, 17 Aug 2016 14:16:05 +0200 Subject: [PATCH 2/6] Remove double quote in two descriptions --- pokedex/data/csv/pokemon_shape_prose.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokedex/data/csv/pokemon_shape_prose.csv b/pokedex/data/csv/pokemon_shape_prose.csv index 3b9eccc..d163ffc 100644 --- a/pokedex/data/csv/pokemon_shape_prose.csv +++ b/pokedex/data/csv/pokemon_shape_prose.csv @@ -18,12 +18,12 @@ pokemon_shape_id,local_language_id,name,awesome_name,description 3,9,Fish,Ichthyic,Pokémon with fins 4,9,Arms,Brachial,Pokémon consisting of a head and arms 5,9,Blob,Alvine,Pokémon consisting of a head and a base -6,9,Upright,Sciurine,"Pokémon with a bipedal, tailed form" +6,9,Upright,Sciurine,Pokémon with a bipedal, tailed form 7,9,Legs,Crural,Pokémon consisting of a head and legs 8,9,Quadruped,Mensal,Pokémon with a quadruped body 9,9,Wings,Alar,Pokémon with a single pair of wings 10,9,Tentacles,Cilial,Pokémon with tentacles or a multiped body 11,9,Heads,Polycephalic,Pokémon consisting of multiple bodies -12,9,Humanoid,Anthropomorphic,"Pokémon with a bipedal, tailless form" +12,9,Humanoid,Anthropomorphic,Pokémon with a bipedal, tailless form 13,9,Bug wings,Lepidopterous,Pokémon with two or more pairs of wings 14,9,Armor,Chitinous,Pokémon with an insectoid body From 58c06878c36dfab988a9ed2e89910df43b892263 Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Thu, 18 Aug 2016 08:27:23 +0200 Subject: [PATCH 3/6] Add french translations for ROSA's mega-evolution --- pokedex/data/csv/pokemon_form_names.csv | 31 +++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv index 9560fbf..d9d0cba 100644 --- a/pokedex/data/csv/pokemon_form_names.csv +++ b/pokedex/data/csv/pokemon_form_names.csv @@ -1333,30 +1333,57 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10165,7,Mega-Latios, 10165,8,MegaLatios, 10165,9,Mega Latios,Mega Latios +10166,5,Méga-Laggron,Méga-Laggron 10166,9,Mega Swampert,Mega Swampert +10167,5,Méga-Jungko,Méga-Jungko 10167,9,Mega Sceptile,Mega Sceptile +10168,5,Méga-Ténéfix,Méga-Ténéfix 10168,9,Mega Sableye,Mega Sableye +10168,5,Méga-Altaria,Méga-Altaria 10169,9,Mega Altaria,Mega Altaria +10168,5,Méga-Gallame,Méga-Gallame 10170,9,Mega Gallade,Mega Gallade +10168,5,Méga-Nanméouïe,Méga-Nanméouïe 10171,9,Mega Audino,Mega Audino +10168,5,Méga-Sharpedo,Méga-Sharpedo 10172,9,Mega Sharpedo,Mega Sharpedo +10168,5,Méga-Flagadoss,Méga-Flagadoss 10173,9,Mega Slowbro,Mega Slowbro +10168,5,Méga-Steelix,Méga-Steelix 10174,9,Mega Steelix,Mega Steelix +10168,5,Méga-Roucarnage,Méga-Roucarnage 10175,9,Mega Pidgeot,Mega Pidgeot +10168,5,Méga-Oniglali,Méga-Oniglali 10176,9,Mega Glalie,Mega Glalie +10168,5,Méga-Diancie,Méga-Diancie 10177,9,Mega Diancie,Mega Diancie +10168,5,Méga-Métalosse,Méga-Métalosse 10178,9,Mega Metagross,Mega Metagross +10168,5,Primo-résurgence,Primo-Kyogre 10179,9,Primal Reversion,Primal Kyogre +10168,5,Primo-résurgence,Primo-Groudon 10180,9,Primal Reversion,Primal Groudon +10168,5,Méga-Rayquaza,Méga-Rayquaza 10181,9,Mega Rayquaza,Mega Rayquaza +10168,5,Pikachu Rockeur,Pikachu Rockeur 10182,9,Pikachu Rock Star,Pikachu Rock Star +10168,5,Pikachu Lady,Pikachu Lady 10183,9,Pikachu Belle,Pikachu Belle +10168,5,Pikachu Star,Pikachu Star 10184,9,Pikachu Pop Star,Pikachu Pop Star -10185,9,"Pikachu, Ph.D.","Pikachu, Ph.D." +10168,5,Pikachu Docteur,Pikachu Docteur +10185,9,Pikachu Ph.D.,Pikachu Ph.D. +10168,5,Pikachu Catcheur,Pikachu Catcheur 10186,9,Pikachu Libre,Pikachu Libre +10168,5,Pikachu Cosplayeur,Pikachu Cosplayeur 10187,9,Cosplay Pikachu,Cosplay Pikachu +10168,5,Hoopa Déchaîné,Hoopa Déchaîné 10188,9,Hoopa Unbound,Hoopa Unbound +10168,5,Méga-Camérupt,Méga-Camérupt 10189,9,Mega Camerupt,Mega Camerupt +10168,5,Méga-Lockpin,Méga-Lockpin 10190,9,Mega Lopunny,Mega Lopunny +10168,5,Méga-Drattak,Méga-Drattak 10191,9,Mega Salamence,Mega Salamence -10192,9,Mega Beedrill,Mega Beedrill +10168,5,Méga-Dardargnan,Méga-Dardargnan +10192,9,Mega Beedrill,Mega Beedrill \ No newline at end of file From 2e8476a41f573a7a6112a58e83b74b8f4c20225d Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Thu, 18 Aug 2016 08:30:54 +0200 Subject: [PATCH 4/6] Fix "No newline at end of file" --- pokedex/data/csv/pokemon_form_names.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv index d9d0cba..069e0a2 100644 --- a/pokedex/data/csv/pokemon_form_names.csv +++ b/pokedex/data/csv/pokemon_form_names.csv @@ -1386,4 +1386,4 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10168,5,Méga-Drattak,Méga-Drattak 10191,9,Mega Salamence,Mega Salamence 10168,5,Méga-Dardargnan,Méga-Dardargnan -10192,9,Mega Beedrill,Mega Beedrill \ No newline at end of file +10192,9,Mega Beedrill,Mega Beedrill From 6082bd953ea63b372531016e93c6c8a555ea447e Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Thu, 18 Aug 2016 08:37:20 +0200 Subject: [PATCH 5/6] Fix indexes for french translations --- pokedex/data/csv/pokemon_form_names.csv | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv index 069e0a2..f9cf015 100644 --- a/pokedex/data/csv/pokemon_form_names.csv +++ b/pokedex/data/csv/pokemon_form_names.csv @@ -1339,51 +1339,51 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10167,9,Mega Sceptile,Mega Sceptile 10168,5,Méga-Ténéfix,Méga-Ténéfix 10168,9,Mega Sableye,Mega Sableye -10168,5,Méga-Altaria,Méga-Altaria +10169,5,Méga-Altaria,Méga-Altaria 10169,9,Mega Altaria,Mega Altaria -10168,5,Méga-Gallame,Méga-Gallame +10170,5,Méga-Gallame,Méga-Gallame 10170,9,Mega Gallade,Mega Gallade -10168,5,Méga-Nanméouïe,Méga-Nanméouïe +10171,5,Méga-Nanméouïe,Méga-Nanméouïe 10171,9,Mega Audino,Mega Audino -10168,5,Méga-Sharpedo,Méga-Sharpedo +10172,5,Méga-Sharpedo,Méga-Sharpedo 10172,9,Mega Sharpedo,Mega Sharpedo -10168,5,Méga-Flagadoss,Méga-Flagadoss +10173,5,Méga-Flagadoss,Méga-Flagadoss 10173,9,Mega Slowbro,Mega Slowbro -10168,5,Méga-Steelix,Méga-Steelix +10174,5,Méga-Steelix,Méga-Steelix 10174,9,Mega Steelix,Mega Steelix -10168,5,Méga-Roucarnage,Méga-Roucarnage +10175,5,Méga-Roucarnage,Méga-Roucarnage 10175,9,Mega Pidgeot,Mega Pidgeot -10168,5,Méga-Oniglali,Méga-Oniglali +10176,5,Méga-Oniglali,Méga-Oniglali 10176,9,Mega Glalie,Mega Glalie -10168,5,Méga-Diancie,Méga-Diancie +10177,5,Méga-Diancie,Méga-Diancie 10177,9,Mega Diancie,Mega Diancie -10168,5,Méga-Métalosse,Méga-Métalosse +10178,5,Méga-Métalosse,Méga-Métalosse 10178,9,Mega Metagross,Mega Metagross -10168,5,Primo-résurgence,Primo-Kyogre +10179,5,Primo-résurgence,Primo-Kyogre 10179,9,Primal Reversion,Primal Kyogre -10168,5,Primo-résurgence,Primo-Groudon +10180,5,Primo-résurgence,Primo-Groudon 10180,9,Primal Reversion,Primal Groudon -10168,5,Méga-Rayquaza,Méga-Rayquaza +10181,5,Méga-Rayquaza,Méga-Rayquaza 10181,9,Mega Rayquaza,Mega Rayquaza -10168,5,Pikachu Rockeur,Pikachu Rockeur +10182,5,Pikachu Rockeur,Pikachu Rockeur 10182,9,Pikachu Rock Star,Pikachu Rock Star -10168,5,Pikachu Lady,Pikachu Lady +10183,5,Pikachu Lady,Pikachu Lady 10183,9,Pikachu Belle,Pikachu Belle -10168,5,Pikachu Star,Pikachu Star +10184,5,Pikachu Star,Pikachu Star 10184,9,Pikachu Pop Star,Pikachu Pop Star -10168,5,Pikachu Docteur,Pikachu Docteur +10185,5,Pikachu Docteur,Pikachu Docteur 10185,9,Pikachu Ph.D.,Pikachu Ph.D. -10168,5,Pikachu Catcheur,Pikachu Catcheur +10186,5,Pikachu Catcheur,Pikachu Catcheur 10186,9,Pikachu Libre,Pikachu Libre -10168,5,Pikachu Cosplayeur,Pikachu Cosplayeur +10187,5,Pikachu Cosplayeur,Pikachu Cosplayeur 10187,9,Cosplay Pikachu,Cosplay Pikachu -10168,5,Hoopa Déchaîné,Hoopa Déchaîné +10188,5,Hoopa Déchaîné,Hoopa Déchaîné 10188,9,Hoopa Unbound,Hoopa Unbound -10168,5,Méga-Camérupt,Méga-Camérupt +10189,5,Méga-Camérupt,Méga-Camérupt 10189,9,Mega Camerupt,Mega Camerupt -10168,5,Méga-Lockpin,Méga-Lockpin +10190,5,Méga-Lockpin,Méga-Lockpin 10190,9,Mega Lopunny,Mega Lopunny -10168,5,Méga-Drattak,Méga-Drattak +10191,5,Méga-Drattak,Méga-Drattak 10191,9,Mega Salamence,Mega Salamence -10168,5,Méga-Dardargnan,Méga-Dardargnan +10191,5,Méga-Dardargnan,Méga-Dardargnan 10192,9,Mega Beedrill,Mega Beedrill From 8c30801b85d00ab26357e6e4e449d2c8908f952a Mon Sep 17 00:00:00 2001 From: Philippe Matray Date: Thu, 18 Aug 2016 08:42:49 +0200 Subject: [PATCH 6/6] Fix the primary index of Mega Beedrill --- pokedex/data/csv/pokemon_form_names.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv index f9cf015..3e7dbf9 100644 --- a/pokedex/data/csv/pokemon_form_names.csv +++ b/pokedex/data/csv/pokemon_form_names.csv @@ -1385,5 +1385,5 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10190,9,Mega Lopunny,Mega Lopunny 10191,5,Méga-Drattak,Méga-Drattak 10191,9,Mega Salamence,Mega Salamence -10191,5,Méga-Dardargnan,Méga-Dardargnan +10192,5,Méga-Dardargnan,Méga-Dardargnan 10192,9,Mega Beedrill,Mega Beedrill