Merge branch 'master' into add-italian-translations

Author: AndryCola

.gitignore

@@ -4,10 +4,10 @@
 *build/*
 *.DS_STORE
 db.*
-venv*
+*venv*
 node_modules
 .vscode
 *.env
 Resources/nginx/ssl/*
 !Resources/nginx/ssl/*.sample.*
-.idea*
+.idea*

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) © 2013–2021 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
+Copyright (c) © 2013–2023 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
 
 All rights reserved.
 

README.md

@@ -45,17 +45,8 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ### Database setup
 
-Start the Django shell by
-
 ```sh
-python manage.py shell --settings=config.local
-```
-
-Run the build script with
-
-```py
-from data.v2.build import build_all
-build_all()
+make build-db
 ```
 
 Visit [localhost:80/api/v2/](localhost:80/api/v2/) to see the running API!
@@ -156,7 +147,7 @@ This k8s setup creates all k8s resources inside the _Namespace_ `pokeapi`, run `
 
 ## Donations
 
-Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 60 million requests a month!
+Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 330 million requests a month!
 
 Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer)
 

data/v2/csv/berry_firmness_names.csv

@@ -1,16 +1,31 @@
 berry_firmness_id,local_language_id,name
+1,1,とてもやわらかい
+1,4,很柔軟
 1,5,Très tendre
 1,7,Muy blanda
 1,9,Very Soft
+1,12,很柔软
+2,1,やわらかい
+2,4,柔軟
 2,5,Tendre
 2,7,Blanda
 2,9,Soft
+2,12,柔软
+3,1,かたい
+3,4,堅硬
 3,5,Ferme
 3,7,Dura
 3,9,Hard
+3,12,坚硬
+4,1,とてもかたい
+4,4,很堅硬
 4,5,Très ferme
 4,7,Muy dura
 4,9,Very Hard
+4,12,很坚硬
+5,1,とてつもなくかたい
+5,4,非常堅硬
 5,5,Super ferme
 5,7,Superdura
 5,9,Super Hard
+5,12,非常坚硬

data/v2/csv/contest_type_names.csv

@@ -1,11 +1,26 @@
 contest_type_id,local_language_id,name,flavor,color
+1,1,かっこよさ,からい,
+1,4,帥氣,辣,紅
 1,5,Sang-froid,Épicé,Rouge
 1,9,Cool,Spicy,Red
+1,12,帅气,辣,红
+2,1,うつくしさ,しぶい,
+2,4,美麗,澀,藍
 2,5,Beauté,Sec,Bleu
 2,9,Beauty,Dry,Blue
+2,12,美丽,涩,蓝
+3,1,かわいさ,あまい,
+3,4,可愛,甜,粉紅
 3,5,Grâce,Sucré,Rose
 3,9,Cute,Sweet,Pink
+3,12,可爱,甜,粉红
+4,1,かしこさ,にがい,
+4,4,聰明,苦,綠
 4,5,Intelligence,Amère,Vert
 4,9,Smart,Bitter,Green
+4,12,聪明,苦,绿
+5,1,たくましさ,すっぱい,
+5,4,強壯,酸,黃
 5,5,Robustesse,Acide,Jaune
 5,9,Tough,Sour,Yellow
+5,12,强壮,酸,黄

data/v2/csv/egg_group_prose.csv

@@ -1,106 +1,136 @@
 egg_group_id,local_language_id,name
 1,1,かいじゅう
 1,3,괴수
+1,4,怪獸
 1,5,Monstrueux
 1,6,Monster
 1,7,Monstruo
 1,8,Mostro
 1,9,Monster
+1,12,怪兽
 2,1,すいちゅう１
 2,3,수중 1
+2,4,水中1
 2,5,Aquatique 1
 2,6,Wasser 1
 2,7,Agua 1
 2,8,Acqua 1
 2,9,Water 1
+2,12,水中1
 3,1,むし
 3,3,벌레
+3,4,蟲
 3,5,Insectoïde
 3,6,Käfer
 3,7,Bicho
 3,8,Coleottero
 3,9,Bug
+3,12,虫
 4,1,ひこう
 4,3,비행
+4,4,飛行
 4,5,Aérien
 4,6,Flug
 4,7,Volador
 4,8,Volante
 4,9,Flying
+4,12,飞行
 5,1,りくじょう
 5,3,육상
+5,4,陸上
 5,5,Terrestre
 5,6,Feld
 5,7,Campo
 5,8,Campo
 5,9,Field
+5,12,陆上
 6,1,ようせい
 6,3,요정
+6,4,妖精
 6,5,Féerique
 6,6,Fee
 6,7,Hada
 6,8,Magico
 6,9,Fairy
+6,12,妖精
 7,1,しょくぶつ
 7,3,식물
+7,4,植物
 7,5,Végétal
 7,6,Pflanze
 7,7,Planta
 7,8,Erba
 7,9,Grass
+7,12,植物
 8,1,ひとがた
 8,3,인간형
+8,4,人型
 8,5,Humanoïde
 8,6,Humanotyp
 8,7,Humanoide
 8,8,Umanoide
 8,9,Human-Like
+8,12,人型
 9,1,すいちゅう３
 9,3,수중 3
+9,4,水中3
 9,5,Aquatique 3
 9,6,Wasser 3
 9,7,Agua 3
 9,8,Acqua 3
 9,9,Water 3
+9,12,水中３
 10,1,こうぶつ
 10,3,광물
+10,4,礦物
 10,5,Minéral
 10,6,Mineral
 10,7,Mineral
 10,8,Minerale
 10,9,Mineral
+10,12,矿物
 11,1,ふていけい
 11,3,부정형
+11,4,不定形
 11,5,Amorphe
 11,6,Amorph
 11,7,Amorfo
 11,8,Amorfo
 11,9,Amorphous
+11,12,不定形
 12,1,すいちゅう２
 12,3,수중 2
+12,4,水中2
 12,5,Aquatique 2
 12,6,Wasser 2
 12,7,Agua 2
 12,8,Acqua 2
 12,9,Water 2
+12,12,水中2
 13,1,メタモン
 13,3,메타몽
+13,4,百變怪
 13,5,Métamorph
 13,6,Ditto
 13,7,Ditto
 13,8,Ditto
 13,9,Ditto
+13,12,百变怪
 14,1,ドラゴン
 14,3,드래곤
+14,4,龍
 14,5,Draconique
 14,6,Drache
 14,7,Dragón
 14,8,Drago
 14,9,Dragon
+14,12,龙
 15,1,タマゴみはっけん
 15,3,알미발견
+15,4,未發現
 15,5,Inconnu
 15,6,Unbekannt
 15,7,Desconocido
 15,8,Non ancora scoperto
 15,9,Undiscovered
+15,12,未发现