diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 4e45ede62..5127fc1cc 100644 --- a/frontend/.eslintrc.js +++ b/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', diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 6533f3eb6..0aa084022 100644 --- a/frontend/src/locales/de.json +++ b/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": { - "hasAccount":"Du hast schon einen Account?", + "gratitude": "Dankbarkeit", + "hasAccount": "Du hast schon einen Account?", "hereLogin": "Hier Anmelden", - "gratitude":"Dankbarkeit", - "newCurrency":"Die neue Währung", - "oneAnotherNature":"Für Einander, Für alle, Für die Natur", - "learnMore":"Erfahre mehr..." + "learnMore": "Erfahre mehr...", + "newCurrency": "Die neue Währung", + "oneAnotherNature": "Für Einander, Für alle, Für die Natur" }, "navbar": { - "overGradido":"Über Gradido", - "greatCooperation":"Gute Zusammenarbeit", - "podcast":"Podcast", - "press":"Presse", - "contact":"Kontakt" + "contact": "Kontakt", + "greatCooperation": "Gute Zusammenarbeit", + "overGradido": "Über Gradido", + "podcast": "Podcast", + "press": "Presse" } }, "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" + "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 Datenschutzerklärung 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.", @@ -272,12 +281,6 @@ "send_you": "sendet dir" }, "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%" + "welcome": "Willkommen", + "|": " | " } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 9c1bf8a02..1e769bbd2 100644 --- a/frontend/src/locales/en.json +++ b/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": { - "hasAccount":"You already have an account?", + "gratitude": "Gratitude", + "hasAccount": "You already have an account?", "hereLogin": "Log in here", - "gratitude":"Gratitude", - "newCurrency":"The new currency", - "oneAnotherNature":"For One Another, For All, For Nature", - "learnMore":"Learn more..." + "learnMore": "Learn more...", + "newCurrency": "The new currency", + "oneAnotherNature": "For One Another, For All, For Nature" }, "navbar": { - "overGradido":"Over Gradido", - "greatCooperation":"Great Cooperation", - "podcast":"Podcast", - "press":"Press", - "contact":"Contact" - + "contact": "Contact", + "greatCooperation": "Great Cooperation", + "overGradido": "Over Gradido", + "podcast": "Podcast", + "press": "Press" } }, "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" + "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 privacy policy.", "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.", @@ -273,12 +281,6 @@ "send_you": "wants to send you" }, "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%" + "welcome": "Welcome", + "|": " | " } diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 03d9e59ae..6a843e250 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -1,6 +1,6 @@