add locales in reset password, fixed locales ignores

frontend/.eslintrc.js

@@ -50,6 +50,7 @@ module.exports = {
           '/time./',
           '/decay.types./',
           'settings.password.resend_subtitle',
+          'settings.password.reset',
           'settings.password.reset-password.text',
           'settings.password.set',
           'settings.password.set-password.text',

frontend/src/locales/de.json

@@ -1,23 +1,29 @@
 {
+  "100": "100%",
+  "1000thanks": "1000 Dank, weil du bei uns bist!",
+  "125": "125%",
+  "85": "85%",
+  "A": "A",
   "advanced-calculation": "Vorausberechnung",
   "auth": {
     "left": {
+      "gratitude": "Dankbarkeit",
       "hasAccount": "Du hast schon einen Account?",
       "hereLogin": "Hier Anmelden",
-      "gratitude":"Dankbarkeit",
+      "learnMore": "Erfahre mehr...",
       "newCurrency": "Die neue Währung",
-      "oneAnotherNature":"Für Einander, Für alle, Für die Natur",
+      "oneAnotherNature": "Für Einander, Für alle, Für die Natur"
-      "learnMore":"Erfahre mehr..."
     },
     "navbar": {
-      "overGradido":"Über Gradido",
+      "contact": "Kontakt",
       "greatCooperation": "Gute Zusammenarbeit",
+      "overGradido": "Über Gradido",
       "podcast": "Podcast",
-      "press":"Presse",
+      "press": "Presse"
-      "contact":"Kontakt"
     }
   },
   "back": "Zurück",
+  "communitiesWorldWide": "Gemeinden in aller Welt",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
     "community": "Gemeinschaft",
@@ -217,18 +223,24 @@
       "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen."
     }
   },
-  "signup": "Registrieren",
   "signin": "Anmelden",
+  "signup": "Registrieren",
   "site": {
+    "forgotPassword": {
+      "heading": "Bitte gib deine E-Mail an mit der du bei Gradido angemeldet bist."
+    },
     "login": {
       "community": "Wähle deine Gemeinschaft",
       "heading": "Melde dich mit deinen Zugangsdaten an. Bewahre sie stet's sicher auf!",
       "saveLogin": "Anmeldung speichern"
     },
+    "resetPassword": {
+      "heading": "Trage bitte dein Passwort ein und wiederhole es."
+    },
     "signup": {
-      "heading": "Registriere dich indem du alle Daten vollständig und in die richtigen Felder eingibst.",
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
+      "heading": "Registriere dich indem du alle Daten vollständig und in die richtigen Felder eingibst.",
       "lowercase": "Ein Kleinbuchstabe erforderlich.",
       "minimum": "Mindestens 8 Zeichen.",
       "no-whitespace": "Keine Leerzeichen und Tabulatoren",
@@ -236,9 +248,6 @@
       "special-char": "Sonderzeichen erforderlich (z.B. _ oder ä)",
       "uppercase": "Großbuchstabe erforderlich."
     },
-    "forgotPassword": {
-      "heading": "Bitte gib deine E-Mail an mit der du bei Gradido angemeldet bist."
-    },
     "thx": {
       "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.",
       "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.",
@@ -273,11 +282,5 @@
   },
   "via_link": "über einen Link",
   "welcome": "Willkommen",
-  "communitiesWorldWide":"Gemeinden in aller Welt",
+  "|": " | "
-  "1000thanks":"1000 Dank, weil du bei uns bist!",
-  "A":"A",
-  "|":" | ",
-  "85":"85%",
-  "100":"100%",
-  "125":"125%"
 }

frontend/src/locales/en.json

@@ -1,24 +1,29 @@
 {
+  "100": "100%",
+  "1000thanks": "1000 thanks for being with us!",
+  "125": "125%",
+  "85": "85%",
+  "A": "A",
   "advanced-calculation": "Advanced calculation",
   "auth": {
     "left": {
+      "gratitude": "Gratitude",
       "hasAccount": "You already have an account?",
       "hereLogin": "Log in here",
-      "gratitude":"Gratitude",
+      "learnMore": "Learn more...",
       "newCurrency": "The new currency",
-      "oneAnotherNature":"For One Another, For All, For Nature",
+      "oneAnotherNature": "For One Another, For All, For Nature"
-      "learnMore":"Learn more..."
     },
     "navbar": {
-      "overGradido":"Over Gradido",
+      "contact": "Contact",
       "greatCooperation": "Great Cooperation",
+      "overGradido": "Over Gradido",
       "podcast": "Podcast",
-      "press":"Press",
+      "press": "Press"
-      "contact":"Contact"
-
     }
   },
   "back": "Back",
+  "communitiesWorldWide": "Communities World Wide",
   "community": {
     "choose-another-community": "Choose another community",
     "community": "Community",
@@ -218,18 +223,24 @@
       "subtitle": "If you have forgotten your password, you can reset it here."
     }
   },
-  "signup": "Sign up",
   "signin": "Sign in",
+  "signup": "Sign up",
   "site": {
+    "forgotPassword": {
+      "heading": "Please enter the email address by which you're registered here."
+    },
     "login": {
       "community": "Choose your community",
       "heading": "Log in with your access data. Keep them safe!",
       "saveLogin": "Save login"
     },
+    "resetPassword": {
+      "heading": "Please enter your password and repeat it."
+    },
     "signup": {
-      "heading": "Register by entering all data completely and in the correct fields.",
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
+      "heading": "Register by entering all data completely and in the correct fields.",
       "lowercase": "One lowercase letter required.",
       "minimum": "8 characters minimum.",
       "no-whitespace": "No white spaces and tabs",
@@ -237,9 +248,6 @@
       "special-char": "One special character required (e.g. _ or ä)",
       "uppercase": "One uppercase letter required."
     },
-    "forgotPassword": {
-      "heading": "Please enter the email address by which you're registered here."
-    },
     "thx": {
       "activateEmail": "Your account has not been activated yet, please check your emails and click the activation link or order a new activation link over the password reset page.",
       "checkEmail": "Your email has been successfully verified. You can sign in now.",
@@ -274,11 +282,5 @@
   },
   "via_link": "via Link",
   "welcome": "Welcome",
-  "communitiesWorldWide":"Communities World Wide",
+  "|": " | "
-  "1000thanks":"1000 thanks for being with us!",
-  "A":"A",
-  "|":" | ",
-  "85":"85%",
-  "100":"100%",
-  "125":"125%"
 }

frontend/src/pages/ResetPassword.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="resetpwd-form">
-    <div class="pb-5">Trage bitte dein Passwort ein und wiederhole es.</div>
+    <div class="pb-5">{{ $t('site.resetPassword.heading') }}</div>
     <validation-observer ref="observer" v-slot="{ handleSubmit }">
       <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
         <input-password-confirmation v-model="form" />