feat: filter localizations

src/core/blitzkrieg/filtersToDescription.ts

@@ -1,24 +1,28 @@
-import { TREE_TYPE_NAMES } from '../../components/Tanks';
-import { encyclopediaInfo } from '../blitz/encyclopediaInfo';
+import { Locale } from 'discord.js';
+import { translator } from '../localization/translator';
 import { StatFilters } from '../statistics/filterStats';
 import { TIER_ROMAN_NUMERALS, Tier, tankDefinitions } from './tankDefinitions';
 
-export async function filtersToDescription({
-  nation,
-  tier,
-  tankType,
-  treeType,
-  tank,
-}: StatFilters) {
-  const awaitedEncyclopediaInfo = await encyclopediaInfo;
+export async function filtersToDescription(
+  { nation, tier, tankType, treeType, tank }: StatFilters,
+  locale: Locale,
+) {
+  const { translate } = translator(locale);
   const awaitedTankDefinitions = await tankDefinitions;
   const info: string[] = [];
 
+  // TODO: somehow localize tank names?
   if (tank) return awaitedTankDefinitions[tank].name;
-  if (nation) info.push(awaitedEncyclopediaInfo.vehicle_nations[nation]);
-  if (tier) info.push(`Tier ${TIER_ROMAN_NUMERALS[tier as Tier]}`);
-  if (tankType) info.push(awaitedEncyclopediaInfo.vehicle_types[tankType]);
-  if (treeType) info.push(TREE_TYPE_NAMES[treeType]);
+  if (nation) info.push(translate(`common.nations.${nation}`));
+  if (tier) {
+    info.push(
+      translate('bot.common.filters.tier', [TIER_ROMAN_NUMERALS[tier as Tier]]),
+    );
+  }
+  if (tankType) info.push(translate(`common.tank_type_short.${tankType}`));
+  if (treeType) info.push(translate(`common.tree_type.${treeType}`));
 
-  return info.length === 0 ? 'No filters' : info.join(', ');
+  return info.length === 0
+    ? translate('bot.common.filters.none')
+    : info.join(', ');
 }

src/core/discord/resolvePeriodFromCommand.ts

@@ -8,7 +8,6 @@ import { PeriodSize, PeriodType } from './addPeriodSubCommands';
 
 export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
   const { translate } = translator(locale);
-
   if (period === 'career') return translate('bot.common.periods.career');
   if (period === 'today') return translate('bot.common.periods.today');
   return translate('bot.common.periods.days', [period]);
@@ -25,6 +24,7 @@ export default function resolvePeriodFromCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
   forcedPeriod?: PeriodType,
 ) {
+  const { translate } = translator(interaction.locale);
   let name: string;
   let start: number;
   let end: number;
@@ -38,7 +38,10 @@ export default function resolvePeriodFromCommand(
     const startDaysAgoMin = Math.min(startOption, endOption);
     const endDaysAgoMax = Math.max(startOption, endOption);
 
-    name = `${startDaysAgoMin} - ${endDaysAgoMax} days`;
+    name = translate('bot.common.periods.custom', [
+      `${startDaysAgoMin}`,
+      `${endDaysAgoMax}`,
+    ]);
     start = getTimeDaysAgo(region, endDaysAgoMax);
     end = getTimeDaysAgo(region, startDaysAgoMin);
   } else {

src/core/localization/translator.ts

@@ -27,7 +27,7 @@ export function translator(localeRaw: Locale) {
             console.warn(
               `Undefined translation at "${pathItem}" in "${path}" for locale "${locale}"; falling back to en-US`,
             );
-            return translator(Locale.EnglishUS).translate(path);
+            return translator(Locale.EnglishUS).translate(path, literals);
           }
         }
       }
@@ -51,6 +51,8 @@ export function translator(localeRaw: Locale) {
         if (index !== 0) embeddedString += literals[index - 1];
         embeddedString += chunk;
       });
+
+      return embeddedString;
     }
 
     return resolvedString;