diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 816d1a370..117367540 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -642,17 +642,19 @@ describe('sendEmailVariants', () => { to: 'Peter Lustig ', from: 'Gradido (do not answer) ', attachments: [], - subject: 'Gradido: You have received Gradidos', + subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', html: expect.any(String), - text: expect.stringContaining('GRADIDO: YOU HAVE RECEIVED GRADIDOS'), + text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDOS'), }), }) expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain( - 'Gradido: You have received Gradidos', + 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', + ) + expect(result.originalMessage.html).toContain( + '>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos', ) - expect(result.originalMessage.html).toContain('>Gradido: You have received Gradidos') expect(result.originalMessage.html).toContain('Hello Peter Lustig') expect(result.originalMessage.html).toContain( 'You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).', diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug index e9e84990f..e6807f539 100644 --- a/backend/src/emails/templates/transactionReceived/html.pug +++ b/backend/src/emails/templates/transactionReceived/html.pug @@ -1,9 +1,9 @@ doctype html html(lang=locale) head - title= t('emails.transactionReceived.subject') + title= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount }) body - h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject') + h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount }) #container.col include ../hello.pug p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail }) diff --git a/backend/src/emails/templates/transactionReceived/subject.pug b/backend/src/emails/templates/transactionReceived/subject.pug index 630752b02..872806ebc 100644 --- a/backend/src/emails/templates/transactionReceived/subject.pug +++ b/backend/src/emails/templates/transactionReceived/subject.pug @@ -1 +1 @@ -= t('emails.transactionReceived.subject') += t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount }) diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index 97907f36e..75ae49167 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -52,7 +52,7 @@ }, "transactionReceived": { "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.", - "subject": "Gradido: Du hast Gradidos erhalten" + "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradidos gesendet" } }, "general": { diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index c4de7e05a..e11f5200f 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: You have received Gradidos" + "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradidos" } }, "general": {