From 0837d17616a4e1f55271ba6259d32cfd5d6be78c Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sat, 12 Sep 2020 19:08:38 +0200
Subject: [PATCH] fix(client): use correct interpolation format for strings

---
 website/client/src/components/inventory/equipment/index.vue | 2 +-
 .../client/src/components/inventory/items/cards-modal.vue   | 6 +++---
 website/client/src/components/static/faq.vue                | 2 +-
 website/client/src/components/static/pressKit.vue           | 4 ++--
 website/client/src/components/userMenu/profile.vue          | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/client/src/components/inventory/equipment/index.vue b/website/client/src/components/inventory/equipment/index.vue
index 971665d7a9..4b587f88d1 100644
--- a/website/client/src/components/inventory/equipment/index.vue
+++ b/website/client/src/components/inventory/equipment/index.vue
@@ -107,7 +107,7 @@
                 class="float-right align-with-tab"
                 :label="$t(costumeMode ? 'useCostume' : 'autoEquipBattleGear')"
                 :checked="user.preferences[drawerPreference]"
-                :hover-text="$t(drawerPreference+'PopoverText')"
+                :hover-text="$t(`${drawerPreference}PopoverText`)"
                 @change="changeDrawerPreference"
               />
             </div>
diff --git a/website/client/src/components/inventory/items/cards-modal.vue b/website/client/src/components/inventory/items/cards-modal.vue
index 83789bf919..4b659a58bb 100644
--- a/website/client/src/components/inventory/items/cards-modal.vue
+++ b/website/client/src/components/inventory/items/cards-modal.vue
@@ -1,7 +1,7 @@
 <template>
   <b-modal
     id="card"
-    :title="$t(cardType + 'Card')"
+    :title="$t(`${cardType}Card`)"
     size="md"
     :hide-footer="true"
   >
@@ -10,7 +10,7 @@
         class="pull-right"
         :class="`inventory_special_${cardType}`"
       ></div>
-      <h4>{{ $t(cardType + 'Card') }}</h4>
+      <h4>{{ $t(`${cardType}Card`) }}</h4>
     </div>
     <div class="modal-body">
       <div style="padding:10px">
@@ -20,7 +20,7 @@
       </div>
     </div>
     <div class="modal-footer">
-      <small class="pull-left">{{ $t(cardType + 'CardExplanation') }}</small>
+      <small class="pull-left">{{ $t(`${cardType}CardExplanation`) }}</small>
       <button
         class="btn btn-secondary"
         @click="readCard()"
diff --git a/website/client/src/components/static/faq.vue b/website/client/src/components/static/faq.vue
index ad4ac66354..b8af7f25d1 100644
--- a/website/client/src/components/static/faq.vue
+++ b/website/client/src/components/static/faq.vue
@@ -28,7 +28,7 @@
             role="tabpanel"
           >
             <div
-              v-markdown="$t('webFaqAnswer' + index, replacements)"
+              v-markdown="$t(`webFaqAnswer${index}`, replacements)"
               class="card-body"
             ></div>
           </b-collapse>
diff --git a/website/client/src/components/static/pressKit.vue b/website/client/src/components/static/pressKit.vue
index d8312a7d14..47c5a071da 100644
--- a/website/client/src/components/static/pressKit.vue
+++ b/website/client/src/components/static/pressKit.vue
@@ -12,7 +12,7 @@
       v-for="(images, category) in imgs"
       :key="category"
     >
-      <h2>{{ $t('pk' + category) }}</h2>
+      <h2>{{ $t(`pk${category}`) }}</h2>
       <div v-if="Array.isArray(images)">
         <div
           v-for="img in images"
@@ -29,7 +29,7 @@
           v-for="(images, secondaryCategory) in images"
           :key="secondaryCategory"
         >
-          <h3>{{ $t('pk' + secondaryCategory) }}</h3>
+          <h3>{{ $t(`pk${secondaryCategory}`) }}</h3>
           <div
             v-for="img in images"
             :key="img"
diff --git a/website/client/src/components/userMenu/profile.vue b/website/client/src/components/userMenu/profile.vue
index 2c97a9989e..d02953c3e8 100644
--- a/website/client/src/components/userMenu/profile.vue
+++ b/website/client/src/components/userMenu/profile.vue
@@ -314,7 +314,7 @@
         class="row category-row"
       >
         <h3 class="col-12 text-center mb-3">
-          {{ $t(key+'Achievs') }}
+          {{ $t(`${key}Achievs`) }}
         </h3>
         <div class="col-12">
           <div class="row achievements-row justify-content-center">
@@ -366,8 +366,8 @@
             @click="toggleAchievementsCategory(key)"
           >
             {{ achievementsCategories[key].open ?
-              $t('hideAchievements', {category: $t(key+'Achievs')}) :
-              $t('showAllAchievements', {category: $t(key+'Achievs')})
+              $t('hideAchievements', {category: $t(`${key}Achievs`)}) :
+              $t('showAllAchievements', {category: $t(`${key}Achievs`)})
             }}
           </div>
         </div>