From a30b2b0752f668d75b9429221702e32fefcd0e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Dec 2022 16:18:20 +0100 Subject: [PATCH] Change German sentence spelling and Gradido plural in email subject --- backend/src/emails/sendEmailVariants.test.ts | 10 +++++----- .../emails/templates/accountMultiRegistration/html.pug | 2 +- backend/src/locales/de.json | 4 ++-- backend/src/locales/en.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 3a9a24e3e..e111137f9 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -269,7 +269,7 @@ describe('sendEmailVariants', () => { 'or copy the link above into your browser window.', ) expect(result.originalMessage.html).toContain( - 'If you are not the one who tried to register again, please contact our support:', + 'If you are not the one who tried to register again, please contact our support:
support@supportmail.com', ) expect(result.originalMessage.html).toContain('Kind regards,
your Gradido team') expect(result.originalMessage.html).toContain('—————') @@ -642,18 +642,18 @@ describe('sendEmailVariants', () => { to: 'Peter Lustig ', from: 'Gradido (do not answer) ', attachments: [], - subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', + subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradido', html: expect.any(String), - text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDOS'), + text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDO'), }), }) expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain( - 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', + 'Gradido: Bibi Bloxberg has sent you 37.40 Gradido', ) expect(result.originalMessage.html).toContain( - '>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', + '>Gradido: Bibi Bloxberg has sent you 37.40 Gradido', ) expect(result.originalMessage.html).toContain('Hello Peter Lustig') expect(result.originalMessage.html).toContain( diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug index e648df291..f8570422c 100644 --- a/backend/src/emails/templates/accountMultiRegistration/html.pug +++ b/backend/src/emails/templates/accountMultiRegistration/html.pug @@ -19,5 +19,5 @@ html(lang=locale) p = t('emails.accountMultiRegistration.ifYouAreNotTheOne') br - a(href='https://gradido.net/de/contact/') https://gradido.net/de/contact/ + a(href='mailto:' + supportEmail)= supportEmail include ../greatingFormularImprint.pug diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index 6ebd1703b..0886e10e6 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -14,7 +14,7 @@ "accountMultiRegistration": { "emailExists": "Es existiert jedoch zu deiner E-Mail-Adresse schon ein Konto.", "emailReused": "deine E-Mail-Adresse wurde soeben erneut benutzt, um bei Gradido ein Konto zu registrieren.", - "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der sich versucht hat erneut zu registrieren, wende dich bitte an unseren support:", + "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der versucht hat sich erneut zu registrieren, wende dich bitte an unseren support:", "onForgottenPasswordClickLink": "Klicke bitte auf den folgenden Link, falls du dein Passwort vergessen haben solltest:", "onForgottenPasswordCopyLink": "oder kopiere den obigen Link in dein Browserfenster.", "subject": "Gradido: Erneuter Registrierungsversuch mit deiner E-Mail" @@ -52,7 +52,7 @@ }, "transactionReceived": { "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.", - "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradidos gesendet" + "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet" } }, "general": { diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 946d46919..c4aaf315f 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -52,7 +52,7 @@ }, "transactionReceived": { "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).", - "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradidos" + "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido" } }, "general": {