Merge branch 'beta' into qol/i18n-lazy-loading

public/locales/de/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "None",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "None"
   },
   "poison": {
     "name": "Gift",

public/locales/en/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "None",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "None"
   },
   "poison": {
     "name": "Poison",

public/locales/es/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "Ninguno",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "Ninguno"
   },
   "poison": {
     "name": "Envenenamiento",

public/locales/fr/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "Aucun",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "Aucun"
   },
   "poison": {
     "name": "Empoisonnement",

public/locales/it/status-effect.json

@@ -1,11 +1,5 @@
 {
   "none": {
-    "name": "None",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "None"
   }
 }

public/locales/ja/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "なし",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "なし"
   },
   "poison": {
     "name": "どく",

public/locales/ko/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "없음",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "없음"
   },
   "poison": {
     "name": "독",

public/locales/pt_BR/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "Nenhum",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "Nenhum"
   },
   "poison": {
     "name": "Envenenamento",

public/locales/zh_CN/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "无",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "无"
   },
   "poison": {
     "name": "中毒",

public/locales/zh_TW/status-effect.json

@@ -1,12 +1,6 @@
 {
   "none": {
-    "name": "無",
-    "description": "",
-    "obtain": "",
-    "obtainSource": "",
-    "activation": "",
-    "overlap": "",
-    "heal": ""
+    "name": "無"
   },
   "poison": {
     "name": "中毒",

src/data/status-effect.ts

@@ -44,6 +44,10 @@ function getStatusEffectMessageKey(statusEffect: StatusEffect | undefined): stri
 }
 
 export function getStatusEffectObtainText(statusEffect: StatusEffect | undefined, pokemonNameWithAffix: string, sourceText?: string): string {
+  if (statusEffect === StatusEffect.NONE) {
+    return "";
+  }
+
   if (!sourceText) {
     const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain`as ParseKeys;
     return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
@@ -53,21 +57,33 @@ export function getStatusEffectObtainText(statusEffect: StatusEffect | undefined
 }
 
 export function getStatusEffectActivationText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
+  if (statusEffect === StatusEffect.NONE) {
+    return "";
+  }
   const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.activation` as ParseKeys;
   return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
 }
 
 export function getStatusEffectOverlapText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
+  if (statusEffect === StatusEffect.NONE) {
+    return "";
+  }
   const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.overlap` as ParseKeys;
   return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
 }
 
 export function getStatusEffectHealText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
+  if (statusEffect === StatusEffect.NONE) {
+    return "";
+  }
   const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.heal` as ParseKeys;
   return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
 }
 
 export function getStatusEffectDescriptor(statusEffect: StatusEffect): string {
+  if (statusEffect === StatusEffect.NONE) {
+    return "";
+  }
   const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.description` as ParseKeys;
   return i18next.t(i18nKey);
 }

src/test/data/status-effect.test.ts

@@ -0,0 +1,301 @@
+import {
+  StatusEffect,
+  getStatusEffectActivationText,
+  getStatusEffectDescriptor,
+  getStatusEffectHealText,
+  getStatusEffectObtainText,
+  getStatusEffectOverlapText,
+} from "#app/data/status-effect";
+import { mockI18next } from "#test/utils/testUtils";
+import i18next from "i18next";
+import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+
+const pokemonName = "PKM";
+const sourceText = "SOURCE";
+
+describe("status-effect", () => {
+  beforeAll(() => {
+    i18next.init();
+  });
+
+  describe("NONE", () => {
+    const statusEffect = StatusEffect.NONE;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      console.log("text:", text);
+      expect(text).toBe("");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("");
+    });
+
+    it("should return the source-obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName, sourceText);
+      expect(text).toBe("");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("");
+    });
+  });
+
+  describe("POISON", () => {
+    const statusEffect = StatusEffect.POISON;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:poison.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:poison.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:poison.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:poison.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:poison.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:poison.overlap");
+    });
+  });
+
+  describe("TOXIC", () => {
+    const statusEffect = StatusEffect.TOXIC;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:toxic.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:toxic.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:toxic.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:toxic.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:toxic.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:toxic.overlap");
+    });
+  });
+
+  describe("PARALYSIS", () => {
+    const statusEffect = StatusEffect.PARALYSIS;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:paralysis.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:paralysis.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:paralysis.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:paralysis.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:paralysis.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:paralysis.overlap");
+    });
+  });
+
+  describe("SLEEP", () => {
+    const statusEffect = StatusEffect.SLEEP;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:sleep.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:sleep.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:sleep.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:sleep.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:sleep.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:sleep.overlap");
+    });
+  });
+
+  describe("FREEZE", () => {
+    const statusEffect = StatusEffect.FREEZE;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:freeze.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:freeze.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:freeze.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:freeze.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:freeze.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:freeze.overlap");
+    });
+  });
+
+  describe("BURN", () => {
+    const statusEffect = StatusEffect.BURN;
+
+    it("should return the obtain text", () => {
+      mockI18next();
+
+      const text = getStatusEffectObtainText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:burn.obtain");
+
+      const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
+      expect(emptySourceText).toBe("statusEffect:burn.obtain");
+    });
+
+    it("should return the activation text", () => {
+      mockI18next();
+      const text = getStatusEffectActivationText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:burn.activation");
+    });
+
+    it("should return the descriptor", () => {
+      mockI18next();
+      const text = getStatusEffectDescriptor(statusEffect);
+      expect(text).toBe("statusEffect:burn.description");
+    });
+
+    it("should return the heal text", () => {
+      mockI18next();
+      const text = getStatusEffectHealText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:burn.heal");
+    });
+
+    it("should return the overlap text", () => {
+      mockI18next();
+      const text = getStatusEffectOverlapText(statusEffect, pokemonName);
+      expect(text).toBe("statusEffect:burn.overlap");
+    });
+  });
+
+  afterEach(() => {
+    vi.resetAllMocks();
+  });
+});