From a9941faafb752951d047ca8d8f09bb2183d5ec18 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Nov 2021 09:34:54 +0100
Subject: [PATCH 1/4] Added locale for activate email & reset email.

---
 frontend/src/locales/de.json | 5 +++++
 frontend/src/locales/en.json | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index faa61886d..cc3f781ee 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -145,6 +145,11 @@
         "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
       },
       "send_now": "Jetzt senden",
+      "set": "Passwort festsetzen",
+      "set-password": {
+        "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support.",
+        "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
+      },
       "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen."
     }
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 91e25f61d..0598f66ad 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -144,7 +144,12 @@
         "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support.",
         "text": "Now you can save a new password to login to the Gradido-App in the future."
       },
-      "send_now": "Send now",
+      "send_now": "Jetzt senden",
+      "set": "Passwort festsetzen",
+      "set-password": {
+        "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support.",
+        "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
+      },
       "subtitle": "If you have forgotten your password, you can reset it here."
     }
   },

From 3ce3370e80045f9bde028eab6823dd974eaf502f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Nov 2021 09:35:27 +0100
Subject: [PATCH 2/4] Changed the vue test so that we get information of the
 locale.

---
 frontend/src/views/Pages/ResetPassword.spec.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
index 81ea7ed0f..fb607708b 100644
--- a/frontend/src/views/Pages/ResetPassword.spec.js
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -72,9 +72,7 @@ describe('ResetPassword', () => {
 
       it('has a message suggesting to contact the support', () => {
         expect(wrapper.find('div.header').text()).toContain('settings.password.reset')
-        expect(wrapper.find('div.header').text()).toContain(
-          'settings.password.reset-password.not-authenticated',
-        )
+        expect(wrapper.find('div.header').text()).toContain('settings.password.not-authenticated')
       })
     })
 

From 7afbc8dc3c1f3cd4b6aaed2247564043864de34e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Nov 2021 09:36:10 +0100
Subject: [PATCH 3/4] Implemented a switch for reset & checkEmail so that both
 send to ResetPassword.vue but show different textes.

---
 frontend/src/views/Pages/ResetPassword.vue | 34 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 81b3d7df7..15c14b5ac 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -8,10 +8,10 @@
               <h1>{{ $t('settings.password.reset') }}</h1>
               <div class="pb-4" v-if="!pending">
                 <span v-if="authenticated">
-                  {{ $t('settings.password.reset-password.text') }}
+                  {{ $t(displaySetup.authenticated) }}
                 </span>
                 <span v-else>
-                  {{ $t('settings.password.reset-password.not-authenticated') }}
+                  {{ $t(displaySetup.notAuthenticated) }}
                 </span>
               </div>
             </b-col>
@@ -29,7 +29,7 @@
                   <input-password-confirmation v-model="form" :register="register" />
                   <div class="text-center">
                     <b-button type="submit" variant="primary" class="mt-4">
-                      {{ $t('settings.password.reset') }}
+                      {{ $t(displaySetup.button) }}
                     </b-button>
                   </div>
                 </b-form>
@@ -38,9 +38,9 @@
           </b-card>
         </b-col>
       </b-row>
-      <b-row>
+      <b-row v-if="displaySetup.linkTo">
         <b-col class="text-center py-lg-4">
-          <router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
+          <router-link :to="displaySetup.linkTo" class="mt-3">{{ $t('back') }}</router-link>
         </b-col>
       </b-row>
     </b-container>
@@ -51,6 +51,25 @@ import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConf
 import { loginViaEmailVerificationCode } from '../../graphql/queries'
 import { resetPassword } from '../../graphql/mutations'
 
+const textFields = {
+  reset: {
+    authenticated: 'settings.password.reset-password.text',
+    notAuthenticated: 'settings.password.not-authenticated',
+    button: 'settings.password.reset',
+    linkTo: '/login',
+  },
+  checkEmail: {
+    authenticated: 'settings.password.set-password.text',
+    notAuthenticated: 'settings.password.not-authenticated',
+    button: 'settings.password.set',
+    linkTo: '/login',
+  },
+  login: {
+    headline: 'site.thx.errorTitle',
+    subtitle: 'site.thx.activateEmail',
+  },
+}
+
 export default {
   name: 'ResetPassword',
   components: {
@@ -67,6 +86,7 @@ export default {
       email: null,
       pending: true,
       register: false,
+      displaySetup: {},
     }
   },
   methods: {
@@ -111,9 +131,13 @@ export default {
       loader.hide()
       this.pending = false
     },
+    setDisplaySetup(from) {
+      this.displaySetup = textFields[this.$route.params.comingFrom]
+    },
   },
   mounted() {
     this.authenticate()
+    this.setDisplaySetup()
   },
 }
 </script>

From fe22bee016d5db38ac4c9dd5b9ebd7d3ad9e7c88 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Nov 2021 09:05:15 +0100
Subject: [PATCH 4/4] Changed locales to give some textes.

---
 frontend/src/locales/en.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 0598f66ad..2aa432f4b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -140,14 +140,13 @@
       "change-password": "Change password",
       "forgot_pwd": "Forgot password?",
       "reset": "Reset password",
-      "reset-password": {
-        "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support.",
+      "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support.",
+      "reset-password": {  
         "text": "Now you can save a new password to login to the Gradido-App in the future."
       },
-      "send_now": "Jetzt senden",
-      "set": "Passwort festsetzen",
+      "send_now": "Send now",
+      "set": "Set password",
       "set-password": {
-        "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support.",
         "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
       },
       "subtitle": "If you have forgotten your password, you can reset it here."