From c3723463e99d88ad4f8cf201be0dd6510ba829ef Mon Sep 17 00:00:00 2001 From: Avior Date: Fri, 18 Jun 2021 23:11:51 +0200 Subject: [PATCH] Added Regulation Mark Signed-off-by: Avior --- utils/cardUtil.ts | 8 +++++--- utils/translationUtil.ts | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/utils/cardUtil.ts b/utils/cardUtil.ts index 50877d9..63ecfbf 100644 --- a/utils/cardUtil.ts +++ b/utils/cardUtil.ts @@ -81,7 +81,7 @@ export async function cardToCardSingle(localId: string, card: Card, lang: Suppor })), attacks: card.attacks?.map((el) => ({ - cost: el.cost?.map((t) => translate('types', t, lang)) as Types[], + cost: el.cost?.map((t) => translate('types', t, lang)), name: el.name[lang] as string, effect: el.effect ? el.effect[lang] : undefined, damage: el.damage @@ -102,7 +102,9 @@ export async function cardToCardSingle(localId: string, card: Card, lang: Suppor effect: card.effect ? card.effect[lang] : undefined, trainerType: translate('trainerType', card.trainerType, lang) as any, - energyType: translate('energyType', card.energyType, lang) as any + energyType: translate('energyType', card.energyType, lang) as any, + regulationMark: card.regulationMark, + } } @@ -116,7 +118,7 @@ export async function getCard(serie: string, setName: string, id: string): Promi return (await import(`../db/data/${serie}/${setName}/${id}.js`)).default } -export async function getCards(lang: SupportedLanguages,set?: Set): Promise> { +export async function getCards(lang: SupportedLanguages, set?: Set): Promise> { const cards = (await smartGlob(`./db/data/${(set && set.serie.name.en) ?? '*'}/${(set && set.name.en) ?? '*'}/*.js`)) const list: Array<[string, Card]> = [] for (const path of cards) { diff --git a/utils/translationUtil.ts b/utils/translationUtil.ts index ce7a8c6..0d89468 100644 --- a/utils/translationUtil.ts +++ b/utils/translationUtil.ts @@ -73,9 +73,10 @@ const translations: Record>> } } -export default function translate(item: translatable, key: string | undefined, lang: SupportedLanguages) { +export default function translate(item: translatable, key: string | undefined, lang: SupportedLanguages): string { if (!key) { - return key + throw new Error(`No Key ${lang}${item}.${key}`); + return '' } if (lang === 'en') { return key