attempt 2

(cherry picked from commit 8588ad17b9)

src/data/pokemon-species.ts

@@ -14,7 +14,7 @@ import { GameMode } from "../game-mode";
 import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities";
 import { VariantSet } from "./variant";
 import i18next from "i18next";
-import { Localizable } from "#app/interfaces/locales";
+import { FusionTranslationEntry, Localizable } from "#app/interfaces/locales";
 import { Stat } from "./pokemon-stat";
 import { Abilities } from "#enums/abilities";
 import { PartyMemberStrength } from "#enums/party-member-strength";
@@ -51,18 +51,15 @@ export function getPokemonSpeciesForm(species: Species, formIndex: integer): Pok
 }
 
 export function getFusedSpeciesName(speciesAName: string, speciesBName: string): string {
-  // Get the fusion affixes for the species
+  const speciesA = i18next.t(`fusionAffixes:${speciesAName}`) as FusionTranslationEntry;
-  const speciesAFusionAffixes = fusionAffixes[speciesAName];
+  const speciesB = i18next.t(`fusionAffixes:${speciesBName}`) as FusionTranslationEntry;
-  const speciesBFusionAffixes = fusionAffixes[speciesBName];
 
-  // Get the fusion prefix and suffix for each species
+  if (!speciesA || !speciesB) {
-  const speciesAPrefix = speciesAFusionAffixes.fusionPrefix;
+    throw new Error(`One or both species not found: ${speciesAName}, ${speciesBName}`);
-  const speciesBSuffix = speciesBFusionAffixes.fusionSuffix;
+  }
 
-  // Construct the fused species name
+  // Combine the fusionPrefix of speciesA with the fusionSuffix of speciesB using template literals
-  const fusedSpeciesName = `${speciesAPrefix}${speciesBSuffix}`;
+  return `${speciesA.fusionPrefix}${speciesB.fusionSuffix}`;
-
-  return fusedSpeciesName;
 }
 
 export type PokemonSpeciesFilter = (species: PokemonSpecies) => boolean;

src/locales/de/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const deConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/en/config.ts

@@ -40,6 +40,7 @@ import { partyUiHandler } from "./party-ui-handler";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const enConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/es/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const esConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/fr/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const frConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/it/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const itConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/ko/config.ts

@@ -37,6 +37,7 @@ import { move } from "./move";
 import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const koConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/pt_BR/config.ts

@@ -40,6 +40,7 @@ import { partyUiHandler } from "./party-ui-handler";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const ptBrConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/zh_CN/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const zhCnConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,

src/locales/zh_TW/config.ts

@@ -37,6 +37,7 @@ import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonForm } from "./pokemon-form";
+import { fusionAffixes } from "./pokemon-fusion-affixes";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -94,6 +95,7 @@ export const zhTwConfig = {
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
+  fusionAffixes: fusionAffixes,
   pokemonInfo: pokemonInfo,
   pokemonInfoContainer: pokemonInfoContainer,
   pokemonSummary: pokemonSummary,