From 5a60bdd788786fdb22752aa1e50cc7afd2fc7481 Mon Sep 17 00:00:00 2001
From: Matt Isenhower <matt@isenhower.com>
Date: Mon, 17 Oct 2022 20:48:06 -0700
Subject: [PATCH] Replace hardcoded stage/mode translations with dynamic ones

---
 src/assets/i18n/de-DE.json                | 26 +----------------------
 src/assets/i18n/en-US.json                | 24 ---------------------
 src/assets/i18n/fr-FR.json                | 24 ---------------------
 src/components/ScheduleBox.vue            |  2 +-
 src/components/ScheduleRow.vue            |  2 +-
 src/components/StageImage.vue             |  2 +-
 src/components/salmonrun/SalmonRunRow.vue |  2 +-
 7 files changed, 5 insertions(+), 77 deletions(-)

diff --git a/src/assets/i18n/de-DE.json b/src/assets/i18n/de-DE.json
index ed1aa15..26a892e 100644
--- a/src/assets/i18n/de-DE.json
+++ b/src/assets/i18n/de-DE.json
@@ -1,4 +1,4 @@
-{ 
+{
   "time": {
     "in": "in",
     "now": "Jetzt geöffnet!",
@@ -21,33 +21,9 @@
     "second": "Sekunde",
     "seconds": "Sekunden"
   },
-  "maps": {
-    "Scorch Gorge": "Sengkluft",
-    "Wahoo World": "Flunder-Funpark",
-    "Hagglefish Market": "Schnapperchen-Basar",
-    "Undertow Spillway": "Schwertmuschel-Reserviour",
-    "MakoMart": "Cetacea-Markt",
-    "Museum dAlfonsino": "Pinakoithek",
-    "Sturgeon Shipyard": "Störwerft",
-    "Mincemeat Metalworks": "Aalstahl-Metallwerk",
-    "Mahi-Mahi Resort": "Mahi-Mahi-Resort",
-    "Hammerhead Bridge": "Makrelenbrücke",
-    "Eeltail Alley": "Steifenaal-Straße",
-    "Inkblot Art Academy": "Perlmutt-Akademie",
-    "Spawning Grounds": "Salmoniden-Damm",
-    "Sockeye Station": "Fort Nautilax",
-    "Gone Fission Hydroplant": "Wasserkraftwerk Stromschnell"
-  },
   "schedule": {
     "title": "Arenen-Info",
     "subtitle": "Arenen",
-    "modes": {
-      "Turf War": "Revierkampf",
-      "Rainmaker": "Operation Goldfisch",
-      "Splat Zones": "Herrschaft",
-      "Clam Blitz": "Muschelchaos",
-      "Tower Control": "Turm-Kommando"
-    },
     "types": {
       "Series": "Serie",
       "Open": "Offen",
diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json
index 9bb07bc..88a2008 100644
--- a/src/assets/i18n/en-US.json
+++ b/src/assets/i18n/en-US.json
@@ -21,33 +21,9 @@
     "second": "second",
     "seconds": "seconds"
   },
-  "maps": {
-    "Scorch Gorge": "Scorch Gorge",
-    "Wahoo World": "Wahoo World",
-    "Hagglefish Market": "Hagglefish Market",
-    "Undertow Spillway": "Undertow Spillway",
-    "MakoMart": "MakoMart",
-    "Museum dAlfonsino": "Museum d'Alfonsino",
-    "Sturgeon Shipyard": "Sturgeon Shipyard",
-    "Mincemeat Metalworks": "Mincemeat Metalworks",
-    "Mahi-Mahi Resort": "Mahi-Mahi Resort",
-    "Hammerhead Bridge": "Hammerhead Bridge",
-    "Eeltail Alley": "Eeltail Alley",
-    "Inkblot Art Academy": "Inkblot Art Academy",
-    "Spawning Grounds": "Spawning Grounds",
-    "Sockeye Station": "Sockeye Station",
-    "Gone Fission Hydroplant": "Gone Fission Hydroplant"
-  },
   "schedule": {
     "title": "Map Schedules",
     "subtitle": "Schedules",
-    "modes": {
-      "Turf War": "Turf War",
-      "Rainmaker": "Rainmaker",
-      "Splat Zones": "Splat Zones",
-      "Clam Blitz": "Clam Blitz",
-      "Tower Control": "Tower Control"
-    },
     "types": {
       "Series": "Series",
       "Open": "Open",
diff --git a/src/assets/i18n/fr-FR.json b/src/assets/i18n/fr-FR.json
index e75766a..c252d3c 100644
--- a/src/assets/i18n/fr-FR.json
+++ b/src/assets/i18n/fr-FR.json
@@ -21,33 +21,9 @@
     "second": "seconde",
     "seconds": "secondes"
   },
-  "maps": {
-    "Scorch Gorge": "Canyon aux colonnes",
-    "Wahoo World": "Parc Carapince",
-    "Hagglefish Market": "Marché Grefin",
-    "Undertow Spillway": "Réservoir Rigadelle",
-    "MakoMart": "Supermarché Cétacé",
-    "Museum dAlfonsino": "Galeries Guppy",
-    "Sturgeon Shipyard": "Chantier Narval",
-    "Mincemeat Metalworks": "Casse Rascasse",
-    "Mahi-Mahi Resort": "Club Ca$halot",
-    "Hammerhead Bridge": "Pont Esturgeon",
-    "Eeltail Alley": "Banlieu Balibot",
-    "Inkblot Art Academy": "Institut Calam'arts",
-    "Spawning Grounds": "Barrage samonoïde",
-    "Sockeye Station": "Bastion colimaçon",
-    "Gone Fission Hydroplant": "Centrale Anguilla"
-  },
   "schedule": {
     "title": "Planning",
     "subtitle": "Planning",
-    "modes": {
-      "Turf War": "Guerre de territoire",
-      "Rainmaker": "Mission Bazookarpe",
-      "Splat Zones": "Défense de zone",
-      "Clam Blitz": "Pluie de palourde",
-      "Tower Control": "Expédition risquée"
-    },
     "types": {
       "Series": "Série",
       "Open": "Ouvert",
diff --git a/src/components/ScheduleBox.vue b/src/components/ScheduleBox.vue
index d6c84d3..11be975 100644
--- a/src/components/ScheduleBox.vue
+++ b/src/components/ScheduleBox.vue
@@ -18,7 +18,7 @@
               <div>
                 <RuleIcon :rule="store.activeSchedule.settings.vsRule" class="h-5 lg:h-6" />
               </div>
-              <div class="text-shadow">{{ $t(`schedule.modes.${store.activeSchedule.settings.vsRule.name}`) }}</div>
+              <div class="text-shadow">{{ $t(`splatnet.rules.${store.activeSchedule.settings.vsRule.id}.name`, store.activeSchedule.settings.vsRule.name) }}</div>
             </template>
 
             <template v-else>
diff --git a/src/components/ScheduleRow.vue b/src/components/ScheduleRow.vue
index 48df33a..55d52d4 100644
--- a/src/components/ScheduleRow.vue
+++ b/src/components/ScheduleRow.vue
@@ -23,7 +23,7 @@
                 <RuleIcon :rule="props.schedule.settings.vsRule" class="h-5 lg:h-6" />
               </div>
               <div class="text-xs lg:text-lg text-shadow">
-                {{ $t(`schedule.modes.${props.schedule.settings.vsRule.name}`) }}
+                {{ $t(`splatnet.rules.${props.schedule.settings.vsRule.id}.name`, props.schedule.settings.vsRule.name) }}
               </div>
             </div>
 
diff --git a/src/components/StageImage.vue b/src/components/StageImage.vue
index dd906b7..51651ce 100644
--- a/src/components/StageImage.vue
+++ b/src/components/StageImage.vue
@@ -19,7 +19,7 @@
       whitespace-nowrap
       font-splatoon2
       px-2
-    " :class="textSize" v-if="!hideLabel && stage">{{ $t('maps.' + stage?.name.replace("'", '')) }}</div>
+    " :class="textSize" v-if="!hideLabel && stage">{{ $t(`splatnet.stages.${stage.id}.name`, stage.name) }}</div>
   </div>
 </template>
 
diff --git a/src/components/salmonrun/SalmonRunRow.vue b/src/components/salmonrun/SalmonRunRow.vue
index 392cb80..d96ae54 100644
--- a/src/components/salmonrun/SalmonRunRow.vue
+++ b/src/components/salmonrun/SalmonRunRow.vue
@@ -21,7 +21,7 @@
       <StageImage class="w-1/5" imgClass="rounded" :stage="props.schedule.settings.coopStage" hide-label />
 
       <div class="flex-1 text-sm text-zinc-300 text-shadow">
-        {{ $t('maps.' + props.schedule.settings.coopStage.name) }}
+        {{ $t(`splatnet.stages.${props.schedule.settings.coopStage.id}.name`, props.schedule.settings.coopStage.name) }}
       </div>
 
       <div class="flex flex-col items-center space-y-1">