From 6454e686e924d357f90f4af3033a1b5f849c350a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 23 Nov 2020 13:34:07 +0100 Subject: [PATCH] changes requested implemented --- backend/src/config/index.js | 1 + backend/src/middleware/email/templates/emailVerification.html | 4 ++-- backend/src/middleware/email/templates/layout.html | 1 + backend/src/middleware/email/templates/resetPassword.html | 4 ++-- webapp/locales/de.json | 4 ++-- webapp/locales/en.json | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/backend/src/config/index.js b/backend/src/config/index.js index 96fcac44a..9ebde6cee 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -96,6 +96,7 @@ export const customConfigs = { EMAIL_DEFAULT_SENDER, SUPPORT_URL: links.SUPPORT, APPLICATION_NAME: metadata.APPLICATION_NAME, + ORGANIZATION_URL: links.ORGANIZATION, } export default { diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html index 9982ad192..3fc421dc5 100644 --- a/backend/src/middleware/email/templates/emailVerification.html +++ b/backend/src/middleware/email/templates/emailVerification.html @@ -74,7 +74,7 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

-

Bis bald bei Bis bald bei {{{APPLICATION_NAME}}}!

– Dein {{APPLICATION_NAME}} Team

@@ -172,7 +172,7 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

-

See you soon on See you soon on {{{APPLICATION_NAME}}}!

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html index cf024ab06..da2053a93 100644 --- a/backend/src/middleware/email/templates/layout.html +++ b/backend/src/middleware/email/templates/layout.html @@ -171,6 +171,7 @@ style="padding: 20px; font-family: Lato, sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;">

{{ORGANIZATION_NAME}} +
{{ORGANIZATION_URL}}


diff --git a/backend/src/middleware/email/templates/resetPassword.html b/backend/src/middleware/email/templates/resetPassword.html index 8eb2203cb..1f8c74ded 100644 --- a/backend/src/middleware/email/templates/resetPassword.html +++ b/backend/src/middleware/email/templates/resetPassword.html @@ -74,7 +74,7 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

-

Bis bald bei Bis bald bei {{APPLICATION_NAME}}!

– Dein {{APPLICATION_NAME}} Team

@@ -171,7 +171,7 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

-

See you soon on See you soon on {{APPLICATION_NAME}}!

– The {{APPLICATION_NAME}} Team

diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 75c3b01e2..1e082f434 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -150,7 +150,7 @@ }, "signup": { "form": { - "data-privacy": "Ich habe die Datenschutzerklärung gelesen und verstanden", + "data-privacy": "Ich habe die Datenschutzerklärung gelesen und verstanden", "description": "Um loszulegen, kannst Du Dich hier kostenfrei registrieren:", "errors": { "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail-Adresse!", @@ -162,7 +162,7 @@ "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk.", "submit": "Konto erstellen", "success": "Eine E-Mail mit einem Link zum Abschließen Deiner Registrierung wurde an {email} geschickt", - "terms-and-condition": "Ich stimme den Nutzungsbedingungen zu." + "terms-and-condition": "Ich stimme den Nutzungsbedingungen zu." }, "title": "Mach mit bei {APPLICATION_NAME}!", "unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich." diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 45c8b2138..1d86e2e52 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -150,7 +150,7 @@ }, "signup": { "form": { - "data-privacy": " I have read and understood the Privacy Statement.", + "data-privacy": "I have read and understood the Privacy Statement.", "description": "To get started, you can register here for free:", "errors": { "email-exists": "There is already a user account with this e-mail address!", @@ -162,7 +162,7 @@ "no-political": "I am not on behalf of a party or political organization in the network.", "submit": "Create an account", "success": "A mail with a link to complete your registration has been sent to {email}", - "terms-and-condition": "I confirm to the Terms and conditions." + "terms-and-condition": "I confirm to the Terms and conditions." }, "title": "Join {APPLICATION_NAME}!", "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server."