Merge branch 'master' into django5

Author: Naramsim

README.md

@@ -18,7 +18,7 @@
 
 A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
-> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql--) for more info.
+> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql) for more info.
 
 
 ## Table of Contents

data/v2/csv/language_names.csv

@@ -1,38 +1,44 @@
 language_id,local_language_id,name
-1,1,日本語
-1,3,일본어
-1,5,Japonais
-1,6,Japanisch
-1,7,Japonés
-1,9,Japanese
+1,1,日本語のひらがなとカタカナ
+1,3,일본어 히라가나와 가타카나
+1,5,Japonais hiragana et katakana
+1,6,Japanisch Hiragana und Katakana
+1,7,Japonés hiragana y katakana
+1,8,Giapponese hiragana e katakana
+1,9,Japanese hiragana and katakana
 2,1,正式ローマジ
 2,3,정식 로마자
 2,5,Romaji
 2,6,Rōmaji
-2,9,Official roomaji
+2,8,Giapponese rōmaji
+2,9,Japanese romaji
 3,1,韓国語
 3,3,한국어
 3,5,Coréen
 3,6,Koreanisch
 3,7,Coreano
+3,8,Coreano
 3,9,Korean
 4,1,中国語
 4,3,중국어
 4,5,Chinois
 4,6,Chinesisch
 4,7,Chino
-4,9,Chinese
+4,8,Cinese tradizionale
+4,9,Traditional Chinese
 5,1,フランス語
 5,3,프랑스어
 5,5,Français
 5,6,Französisch
 5,7,Francés
+5,8,Francese
 5,9,French
 6,1,ドイツ語
 6,3,도이치어
 6,5,Allemand
 6,6,Deutsch
 6,7,Alemán
+6,8,Tedesco
 6,9,German
 7,1,西語
 7,3,스페인어
@@ -45,16 +51,25 @@ language_id,local_language_id,name
 8,5,Italien
 8,6,Italienisch
 8,7,Italiano
+8,8,Italiano
 8,9,Italian
 9,1,英語
 9,3,영어
 9,5,Anglais
 9,6,Englisch
 9,7,Inglés
+9,8,Inglese
 9,9,English
 10,1,チェコ語
 10,3,체코어
 10,5,Tchèque
 10,6,Tschechisch
 10,7,Checo
+10,8,Ceco
 10,9,Czech
+11,8,Giapponese
+11,9,Japanese
+12,8,Cinese semplificato
+12,9,Simplified Chinese
+13,8,Portoghese brasiliano
+13,9,Brazilian portuguese

data/v2/csv/languages.csv

@@ -1,14 +1,14 @@
 id,iso639,iso3166,identifier,official,order
-1,ja,jp,ja-Hrkt,1,1
-2,ja,jp,roomaji,1,3
+1,ja,jp,ja-hrkt,1,1
+2,ja,jp,ja-roma,1,3
 3,ko,kr,ko,1,4
-4,zh,cn,zh-Hant,1,5
+4,zh,tw,zh-hant,1,5
 5,fr,fr,fr,1,8
 6,de,de,de,1,9
 7,es,es,es,1,10
 8,it,it,it,1,11
 9,en,us,en,1,7
 10,cs,cz,cs,0,12
 11,ja,jp,ja,1,2
-12,zh,cn,zh-Hans,1,6
-13,pt-BR,br,pt-BR,0,13
+12,zh,cn,zh-hans,1,6
+13,pt,br,pt-br,0,13

pokemon_v2/api.py

@@ -988,9 +988,9 @@ def get(self, request, pokemon_id):
         encounter_objects = Encounter.objects.filter(pokemon=pokemon)
 
         area_ids = (
-            encounter_objects.order_by("location_area")
-            .distinct("location_area")
-            .values_list("location_area", flat=True)
+            encounter_objects.values_list("location_area", flat=True)
+            .distinct()
+            .order_by("location_area")
         )
 
         location_area_objects = LocationArea.objects.filter(pk__in=area_ids)
@@ -1004,11 +1004,10 @@ def get(self, request, pokemon_id):
             area_encounters = encounter_objects.filter(location_area_id=area_id)
 
             version_ids = (
-                area_encounters.order_by("version_id")
-                .distinct("version_id")
-                .values_list("version_id", flat=True)
+                area_encounters.values_list("version_id", flat=True)
+                .distinct()
+                .order_by("version_id")
             )
-
             version_details_list = []
 
             for version_id in version_ids: