From 065f00850de386814dd9ee7c24b53830733a19d5 Mon Sep 17 00:00:00 2001
From: OscarRivasGonzalez <oscar.rivas@decathlon.com>
Date: Wed, 13 Oct 2021 22:59:59 +0200
Subject: [PATCH 1/2] add de-translation for enter your keyword

---
 src/views/KeywordList.vue | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/KeywordList.vue b/src/views/KeywordList.vue
index 7a4f0eb50..2e7e47a8e 100644
--- a/src/views/KeywordList.vue
+++ b/src/views/KeywordList.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="container">
-    <b-form-input v-model="filter" placeholder="Enter your keyword"></b-form-input>
+    <b-form-input
+      v-model="filter"
+      placeholder="Enter your keyword"
+    ></b-form-input>
 
     <b-list-group class="mt-4">
       <b-list-group-item
         v-for="(keyword, index) in keywords.filter((row) => {return row.includes(filter) || !filter})"
         :key="index"
         :to="{ name: 'keyword', params: { keyword: urlEncode(keyword) } }"
-        >{{ keyword }}</b-list-group-item
-      >
+      >{{ keyword }}</b-list-group-item>
     </b-list-group>
   </div>
 </template>
@@ -22,7 +24,7 @@ export default {
     const keywords = recipes.getAllKeywords().sort();
     return {
       keywords,
-      filter: null
+      filter: null,
     };
   },
   mounted() {
@@ -35,3 +37,10 @@ export default {
   },
 };
 </script>
+<i18n>
+{
+  "de": {
+    "Enter your keyword": "Gib dein Stichwort ein"
+  }
+}
+</i18n>

From 8ad9f83483ebd511ad12c27ee5ad38e5820926ba Mon Sep 17 00:00:00 2001
From: OscarRivasGonzalez <oscar.rivas@decathlon.com>
Date: Wed, 13 Oct 2021 23:07:00 +0200
Subject: [PATCH 2/2] fix conflict

---
 src/views/KeywordList.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/KeywordList.vue b/src/views/KeywordList.vue
index 2e7e47a8e..2efeb0cce 100644
--- a/src/views/KeywordList.vue
+++ b/src/views/KeywordList.vue
@@ -2,12 +2,14 @@
   <div class="container">
     <b-form-input
       v-model="filter"
-      placeholder="Enter your keyword"
+      :placeholder="$t('Enter your keyword')"
     ></b-form-input>
 
     <b-list-group class="mt-4">
       <b-list-group-item
-        v-for="(keyword, index) in keywords.filter((row) => {return row.includes(filter) || !filter})"
+        v-for="(keyword, index) in keywords.filter(row => {
+          return row.includes(filter) || !filter;
+        })"
         :key="index"
         :to="{ name: 'keyword', params: { keyword: urlEncode(keyword) } }"
       >{{ keyword }}</b-list-group-item>
@@ -37,8 +39,15 @@ export default {
   },
 };
 </script>
+
 <i18n>
 {
+  "no": {
+    "Enter your keyword": "Søk etter nøkkelord"
+  },
+  "hi": {
+    "Enter your keyword": "अपना सूचक-शब्द दर्ज करें"
+  },
   "de": {
     "Enter your keyword": "Gib dein Stichwort ein"
   }