From 90287eff17f28cfec861b85861061f4c1cc62166 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 16 Mar 2022 03:13:32 +0100
Subject: [PATCH] have all dynamic keys ignored and readded to the language
 files

---
 frontend/.eslintrc.js                 | 15 ++++++++++++--
 frontend/src/locales/de.json          | 16 +++++++++++++--
 frontend/src/locales/en.json          | 16 +++++++++++++--
 frontend/src/pages/ForgotPassword.vue | 29 +++++----------------------
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index f3b213295..4e45ede62 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -38,13 +38,24 @@ module.exports = {
       },
     ],
     '@intlify/vue-i18n/no-dynamic-keys': 'error',
-    // TODO: no ignores
     '@intlify/vue-i18n/no-unused-keys': [
       'error',
       {
         src: './src',
         extensions: ['.js', '.vue'],
-        ignores: ['/site.thx./', '/form./', '/time./', '/decay.types./'],
+        // TODO: remove ignores
+        ignores: [
+          '/site.thx./',
+          '/form./',
+          '/time./',
+          '/decay.types./',
+          'settings.password.resend_subtitle',
+          'settings.password.reset-password.text',
+          'settings.password.set',
+          'settings.password.set-password.text',
+          'settings.password.subtitle',
+          'site.login.signin',
+        ],
         enableFix: false,
       },
     ],
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1875ecce6..47076886d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -165,7 +165,18 @@
     },
     "password": {
       "change-password": "Passwort ändern",
-      "forgot_pwd": "Passwort vergessen?"
+      "forgot_pwd": "Passwort vergessen?",
+      "resend_subtitle": "Dein Aktivierungslink ist abgelaufen. Du kannst hier ein neuen anfordern.",
+      "reset": "Passwort zurücksetzen",
+      "reset-password": {
+        "text": "Gib nun ein neues Passwort ein, mit dem du dich zukünftig in deinem Gradido-Konto anmelden willst."
+      },
+      "send_now": "Jetzt senden",
+      "set": "Passwort festlegen",
+      "set-password": {
+        "text": "Speichere nun dein neues Passwort, mit dem du dich zukünftig in deinem Gradido-Konto anmelden kannst."
+      },
+      "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen."
     }
   },
   "signup": "Registrieren",
@@ -173,7 +184,8 @@
     "login": {
       "community": "Tausend Dank, weil du bei uns bist!",
       "heading": "Gradido",
-      "new_wallet": "Neues Konto erstellen"
+      "new_wallet": "Neues Konto erstellen",
+      "signin": "Anmelden"
     },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ef1cb1498..fe227cb9d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -165,7 +165,18 @@
     },
     "password": {
       "change-password": "Change password",
-      "forgot_pwd": "Forgot password?"
+      "forgot_pwd": "Forgot password?",
+      "resend_subtitle": "Your activation link has expired, here you can order a new one.",
+      "reset": "Reset password",
+      "reset-password": {
+        "text": "Enter a new password that you will use to log in to your Gradido account in the future.."
+      },
+      "set": "Set password",
+      "set-password": {
+        "text": "Now save your new password, which you can use to log in to your Gradido account in the future."
+      },
+      "send_now": "Send now",
+      "subtitle": "If you have forgotten your password, you can reset it here."
     }
   },
   "signup": "Sign up",
@@ -173,7 +184,8 @@
     "login": {
       "community": "A thousand thanks for being with us!",
       "heading": "Gradido",
-      "new_wallet": "Create new account"
+      "new_wallet": "Create new account",
+      "signin": "Sign in"
     },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index f06c561a3..81121fbe7 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -5,10 +5,9 @@
         <div class="header-body text-center mb-7">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-2">
+              <h1>{{ $t('settings.password.reset') }}</h1>
               <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-              <h1>{{ $t(displaySetup.headline) }}</h1>
-              <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-              <p class="text-lead">{{ $t(displaySetup.subtitle) }}</p>
+              <p class="text-lead">{{ $t(subtitle) }}</p>
             </b-col>
           </b-row>
         </div>
@@ -24,8 +23,7 @@
                   <input-email v-model="form.email"></input-email>
                   <div class="text-center">
                     <b-button type="submit" variant="primary">
-                      <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-                      {{ $t(displaySetup.button) }}
+                      {{ $t('settings.password.send_now') }}
                     </b-button>
                   </div>
                 </b-form>
@@ -44,21 +42,6 @@
 import { sendResetPasswordEmail } from '@/graphql/queries'
 import InputEmail from '@/components/Inputs/InputEmail'
 
-const textFields = {
-  resetPassword: {
-    headline: 'settings.password.reset',
-    subtitle: 'settings.password.resend_subtitle',
-    button: 'settings.password.send_now',
-    cancel: 'back',
-  },
-  login: {
-    headline: 'settings.password.reset',
-    subtitle: 'settings.password.subtitle',
-    button: 'settings.password.send_now',
-    cancel: 'back',
-  },
-}
-
 export default {
   name: 'ForgotPassword',
   components: {
@@ -70,7 +53,7 @@ export default {
       form: {
         email: '',
       },
-      displaySetup: {},
+      subtitle: 'settings.password.subtitle',
     }
   },
   methods: {
@@ -92,9 +75,7 @@ export default {
   },
   created() {
     if (this.$route.params.comingFrom) {
-      this.displaySetup = textFields[this.$route.params.comingFrom]
-    } else {
-      this.displaySetup = textFields.login
+      this.subtitle = 'settings.password.resend_subtitle'
     }
   },
 }