From bbc91f28dcbad1b690d7f865525f1eaac1df1348 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Thu, 5 Jun 2025 16:46:18 -0500 Subject: [PATCH] Revert changes outside of the tests directory --- src/phases/switch-summon-phase.ts | 1 + src/plugins/i18n.ts | 19 +------------------ src/system/settings/settings.ts | 6 +++--- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index e37fe545737..6bdbb66be14 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -138,6 +138,7 @@ export class SwitchSummonPhase extends SummonPhase { return; } + if (this.switchType === SwitchType.BATON_PASS) { // If switching via baton pass, update opposing tags coming from the prior pokemon (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach((enemyPokemon: Pokemon) => diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 8ca9005096f..515d9aec528 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -174,24 +174,7 @@ export async function initI18n(): Promise { "es-MX": ["es-ES", "en"], default: ["en"], }, - supportedLngs: [ - "en", - "es-ES", - "es-MX", - "fr", - "it", - "de", - "zh-CN", - "zh-TW", - "pt-BR", - "ko", - "ja", - "ca", - "da", - "tr", - "ro", - "ru", - ], + supportedLngs: ["en", "es-ES", "es-MX", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca", "da", "tr", "ro", "ru"], backend: { loadPath(lng: string, [ns]: string[]) { let fileName: string; diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index ca5395a5af7..69abc669870 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -959,7 +959,7 @@ export function setSetting(setting: string, value: number): boolean { }, { label: "Türkçe (Needs Help)", - handler: () => changeLocaleHandler("tr"), + handler: () => changeLocaleHandler("tr") }, { label: "Русский (Needs Help)", @@ -967,11 +967,11 @@ export function setSetting(setting: string, value: number): boolean { }, { label: "Dansk (Needs Help)", - handler: () => changeLocaleHandler("da"), + handler: () => changeLocaleHandler("da") }, { label: "Română (Needs Help)", - handler: () => changeLocaleHandler("ro"), + handler: () => changeLocaleHandler("ro") }, { label: i18next.t("settings:back"),