Merge branch 'main' into workersFix

src/data/trainer-config.ts

@@ -399,6 +399,9 @@ export class TrainerConfig {
     }
 
     initForGymLeader(signatureSpecies: (Species | Species[])[], ...specialtyTypes: Type[]): TrainerConfig {
+        if (!getIsInitialized()) {
+            initI18n();
+        }
 
         this.setPartyTemplateFunc(getGymLeaderPartyTemplate);
         signatureSpecies.forEach((speciesPool, s) => {
@@ -431,7 +434,9 @@ export class TrainerConfig {
     }
 
     initForEliteFour(signatureSpecies: (Species | Species[])[], ...specialtyTypes: Type[]): TrainerConfig {
-
+        if (!getIsInitialized()) {
+            initI18n();
+        }
 
         this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
         signatureSpecies.forEach((speciesPool, s) => {
@@ -459,7 +464,9 @@ export class TrainerConfig {
     }
 
     initForChampion(signatureSpecies: (Species | Species[])[]): TrainerConfig {
-
+        if (!getIsInitialized()) {
+            initI18n();
+        }
         this.setPartyTemplates(trainerPartyTemplates.CHAMPION);
         signatureSpecies.forEach((speciesPool, s) => {
             if (!Array.isArray(speciesPool))

src/locales/de/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "{{bossName}} erscheint.",
   "trainerAppeared": "{{trainerName}}\nmöchte kämpfen!",
+  "trainerAppearedDouble": "{{trainerName}}\nmöchten kämpfen!",
   "singleWildAppeared": "Ein wildes {{pokemonName}} erscheint!",
   "multiWildAppeared": "Ein wildes {{pokemonName1}}\nund {{pokemonName2}} erscheinen!",
   "playerComeBack": "Komm zurück, {{pokemonName}}!",

src/locales/en/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "{{bossName}} appeared.",
   "trainerAppeared": "{{trainerName}}\nwould like to battle!",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "A wild {{pokemonName}} appeared!",
   "multiWildAppeared": "A wild {{pokemonName1}}\nand {{pokemonName2}} appeared!",
   "playerComeBack": "Come back, {{pokemonName}}!",

src/locales/es/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "¡{{bossName}} te corta el paso!",
   "trainerAppeared": "¡{{trainerName}}\nte desafía!",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "¡Un {{pokemonName}} salvaje te corta el paso!",
   "multiWildAppeared": "¡Un {{pokemonName1}} y un {{pokemonName2}} salvajes\nte cortan el paso!",
   "playerComeBack": "¡{{pokemonName}}, ven aquí!",

src/locales/fr/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "Un {{bossName}} apparaît.",
   "trainerAppeared": "Un combat est lancé\npar {{trainerName}} !",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "Un {{pokemonName}} sauvage apparaît !",
   "multiWildAppeared": "Un {{pokemonName1}} et un {{pokemonName2}}\nsauvages apparaissent !",
   "playerComeBack": "{{pokemonName}}, on change !\nReviens !",

src/locales/fr/trainers.ts

@@ -16,13 +16,13 @@ export const titles: SimpleTranslationEntries = {
 export const trainerClasses: SimpleTranslationEntries = {
     "ace_trainer": "Topdresseur",
     "ace_trainer_female": "Topdresseuse",
-    "ace_duo": "Ace Duo",
+    "ace_duo": "Topdresseurs",
     "artist": "Artiste",
     "artist_female": "Artiste",
     "backers": "Pompom Girls",
     "backpacker": "Randonneur",
     "backpacker_female": "Randonneuse",
-    "backpackers": "Backpackers",
+    "backpackers": "Randonneurs",
     "baker": "Boulangère",
     "battle_girl": "Combattante",
     "beauty": "Canon",
@@ -31,14 +31,14 @@ export const trainerClasses: SimpleTranslationEntries = {
     "black_belt": "Karatéka",
     "breeder": "Éleveur",
     "breeder_female": "Éleveuse",
-    "breeders": "Breeders",
+    "breeders": "Éleveurs",
     "clerk": "Employé",
     "clerk_female": "Employée",
-    "colleagues": "Colleagues",
+    "colleagues": "Collègues de Bureau",
     "crush_kin": "Crush Kin",
     "cyclist": "Cycliste",
     "cyclist_female": "Cycliste",
-    "cyclists": "Cyclists",
+    "cyclists": "Cyclistes",
     "dancer": "Danseur",
     "dancer_female": "Danseuse",
     "depot_agent": "Cheminot",
@@ -61,46 +61,46 @@ export const trainerClasses: SimpleTranslationEntries = {
     "maid": "Gouvernante",
     "madame": "Mondaine",
     "musican": "Musicien",
-    "medical_team": "Medical Team",
-    "hex_maniac": "Hex Maniac",
-    "nurse": " 	Infirmière",
+    "medical_team": "Médecins",
+    "hex_maniac": "Mystimaniac",
+    "nurse": "Infirmière",
     "nursery_aide": "Institutrice",
     "officer": "Policier",
     "parasol_lady": "Sœur Parasol",
     "pilot": "Pilote",
     "poké_fan": "Poké Fan",
-    "poké_fan_family": "Poké Fan Family",
+    "poké_fan_family": "Couple de Pokéfans",
     "preschooler": "Petit",
     "preschooler_female": "Petite",
-    "preschoolers": "Preschoolers",
+    "preschoolers": "Petits",
     "psychic": "Kinésiste",
     "psychic_female": "Kinésiste",
-    "psychics": "Psychics",
+    "psychics": "Kinésistes",
     "pokémon_ranger": "Pokémon Ranger",
-    "pokémon_rangers": "Pokémon Ranger",
+    "pokémon_rangers": "Pokémon Rangers",
     "ranger": "Ranger",
-    "restaurant_staff": "Restaurant Staff",
-    "rich_boy": "Rich Boy",
-    "rich_couple": "Rich Couple",
-    "rich_kids": "Rich Kids",
+    "restaurant_staff": "Serveurs",
+    "rich_boy": "Richard",
+    "rich_couple": "Couple de Bourgeois",
+    "rich_kids": "Richards",
     "roughneck": "Loubard",
     "scientist": "Scientifique",
     "scientist_female": "Scientifique",
-    "scientists": "Scientists",
+    "scientists": "Scientifiques",
     "smasher": "Tenniswoman",
     "snow_worker": "Ouvrier Alpin",
     "snow_worker_female": "Ouvrière Alpine",
     "striker": "Footballeur",
     "school_kid": "Élève",
     "school_kid_female": "Élève",
-    "school_kids": "School Kids",
+    "school_kids": "Élèves",
     "swimmer": "Nageur",
     "swimmer_female": "Nageuse",
-    "swimmers": "Swimmers",
+    "swimmers": "Nageurs",
     "twins": "Jumelles",
     "veteran": "Vénérable",
     "veteran_female": "Vénérable",
-    "veteran_duo": "Veteran Duo",
+    "veteran_duo": "Vénérables",
     "waiter": "Serveur",
     "waitress": "Serveuse",
     "worker": "Ouvrier",

src/locales/it/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "{{bossName}} è apparso.",
   "trainerAppeared": "{{trainerName}}\nvuole combattere!",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "Appare {{pokemonName}} selvatico!",
   "multiWildAppeared": "Appaiono {{pokemonName1}}\ne {{pokemonName2}} salvatici!",
   "playerComeBack": "Rientra, {{pokemonName}}!",

src/locales/pt_BR/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "{{bossName}} apareceu.",
   "trainerAppeared": "{{trainerName}}\nquer batalhar!",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "Um {{pokemonName}} selvagem apareceu!",
   "multiWildAppeared": "Um {{pokemonName1}} e um {{pokemonName2}} selvagens\napareceram!",
   "playerComeBack": "{{pokemonName}}, retorne!",

src/locales/zh_CN/battle.ts

@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const battle: SimpleTranslationEntries = {
   "bossAppeared": "{{bossName}} 出现了。",
   "trainerAppeared": "{{trainerName}}\n想要和你对战!",
+  "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!",
   "singleWildAppeared": "一只野生 {{pokemonName}} 出现了。!",
   "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了。!",
   "playerComeBack": "回来吧, {{pokemonName}}!",

src/phases.ts

@@ -841,8 +841,15 @@ export class EncounterPhase extends BattlePhase {
     if (this.scene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS)
       return i18next.t('battle:bossAppeared', {bossName: enemyField[0].name});
 
-    if (this.scene.currentBattle.battleType === BattleType.TRAINER)
-      return i18next.t('battle:trainerAppeared', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)});
+    if (this.scene.currentBattle.battleType === BattleType.TRAINER) {
+      if (this.scene.currentBattle.double) {
+        return i18next.t('battle:trainerAppearedDouble', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)});
+
+      }
+      else {
+        return i18next.t('battle:trainerAppeared', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)});
+      }
+    }
 
     return enemyField.length === 1
       ? i18next.t('battle:singleWildAppeared', {pokemonName: enemyField[0].name})