From dd760a650b34ad308690c56d66ea0d2776de516c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Dec 2022 13:59:41 +0100 Subject: [PATCH] Add imprint to 'accountMultiRegistration' --- backend/src/emails/sendEmailVariants.ts | 2 ++ .../accountMultiRegistration/html.pug | 19 ++++++++++--------- .../templates/greatingFormularImprint.pug | 11 +++++++++++ backend/src/emails/templates/hello.pug | 1 + backend/src/locales/de.json | 6 ++++-- backend/src/locales/en.json | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 backend/src/emails/templates/greatingFormularImprint.pug create mode 100644 backend/src/emails/templates/hello.pug diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index 356f95e39..bb76ff2ee 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -65,6 +65,8 @@ export const sendAccountMultiRegistrationEmail = (data: { lastName: data.lastName, locale: data.language, resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD, + supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL, + communityURL: CONFIG.COMMUNITY_URL, }, }) } diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug index b3764403b..e648df291 100644 --- a/backend/src/emails/templates/accountMultiRegistration/html.pug +++ b/backend/src/emails/templates/accountMultiRegistration/html.pug @@ -5,18 +5,19 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.accountMultiRegistration.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) - p= t('emails.accountMultiRegistration.emailReused') + include ../hello.pug + p + = t('emails.accountMultiRegistration.emailReused') br - span= t('emails.accountMultiRegistration.emailExists') - p= t('emails.accountMultiRegistration.onForgottenPasswordClickLink') + = t('emails.accountMultiRegistration.emailExists') + p + = t('emails.accountMultiRegistration.onForgottenPasswordClickLink') br a(href=resendLink) #{resendLink} br - span= t('emails.accountMultiRegistration.onForgottenPasswordCopyLink') - p= t('emails.accountMultiRegistration.ifYouAreNotTheOne') + = t('emails.accountMultiRegistration.onForgottenPasswordCopyLink') + p + = t('emails.accountMultiRegistration.ifYouAreNotTheOne') br a(href='https://gradido.net/de/contact/') https://gradido.net/de/contact/ - p(style='margin-top: 24px;')= t('emails.general.sincerelyYours') - br - span= t('emails.general.yourGradidoTeam') + include ../greatingFormularImprint.pug diff --git a/backend/src/emails/templates/greatingFormularImprint.pug b/backend/src/emails/templates/greatingFormularImprint.pug new file mode 100644 index 000000000..678f5fd51 --- /dev/null +++ b/backend/src/emails/templates/greatingFormularImprint.pug @@ -0,0 +1,11 @@ +p(style='margin-top: 24px;')= t('emails.general.sincerelyYours') + br + = t('emails.general.yourGradidoTeam') +p(style='margin-top: 24px;')= '—————' +p(style='margin-top: 24px;') + each line in t('general.imprint').split(/\n/) + = line + br + a(href='mailto:' + supportEmail)= supportEmail + br + a(href=communityURL)= communityURL diff --git a/backend/src/emails/templates/hello.pug b/backend/src/emails/templates/hello.pug new file mode 100644 index 000000000..aca50a907 --- /dev/null +++ b/backend/src/emails/templates/hello.pug @@ -0,0 +1 @@ +p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index 8aff6caa4..bf621d1ef 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -47,7 +47,7 @@ }, "transactionLinkRedeemed": { "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) hat soeben deinen Link eingelöst.", - "memo": "Memo: {transactionMemo}", + "memo": "Nachricht: {transactionMemo}", "subject": "Gradido: Dein Gradido-Link wurde eingelöst" }, "transactionReceived": { @@ -56,6 +56,8 @@ } }, "general": { - "decimalSeparator": "," + "decimalSeparator": ",", + "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland", + "supportEmail": "support@gradido.net" } } diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 99217840e..4b158ca6d 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -47,7 +47,7 @@ }, "transactionLinkRedeemed": { "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) has just redeemed your link.", - "memo": "Memo: {transactionMemo}", + "memo": "Message: {transactionMemo}", "subject": "Gradido: Your Gradido link has been redeemed" }, "transactionReceived": {