From 9314f8e427cb4518e4a709a482b5533282dad02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Dec 2022 14:03:48 +0100 Subject: [PATCH] Replace hello line in emails by include --- backend/src/emails/templates/accountActivation/html.pug | 2 +- backend/src/emails/templates/addedContributionMessage/html.pug | 2 +- backend/src/emails/templates/contributionConfirmed/html.pug | 2 +- backend/src/emails/templates/contributionRejected/html.pug | 2 +- backend/src/emails/templates/resetPassword/html.pug | 2 +- backend/src/emails/templates/transactionLinkRedeemed/html.pug | 2 +- backend/src/emails/templates/transactionReceived/html.pug | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug index 24d86ea56..e25737394 100644 --- a/backend/src/emails/templates/accountActivation/html.pug +++ b/backend/src/emails/templates/accountActivation/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.accountActivation.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.accountActivation.emailRegistered') p = t('emails.accountActivation.pleaseClickLink') diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug index 6fa89caaf..7232358a4 100644 --- a/backend/src/emails/templates/addedContributionMessage/html.pug +++ b/backend/src/emails/templates/addedContributionMessage/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.addedContributionMessage.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo }) p= t('emails.addedContributionMessage.toSeeAndAnswerMessage') p diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug index dffad4224..7a8f026ae 100644 --- a/backend/src/emails/templates/contributionConfirmed/html.pug +++ b/backend/src/emails/templates/contributionConfirmed/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.contributionConfirmed.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName, contributionMemo }) p= t('emails.general.amountGDD', { amountGDD: contributionAmount }) p diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug index 8c37bfcbc..fdbbf23ec 100644 --- a/backend/src/emails/templates/contributionRejected/html.pug +++ b/backend/src/emails/templates/contributionRejected/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.contributionRejected.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.contributionRejected.commonGoodContributionRejected', { senderFirstName, senderLastName, contributionMemo }) p= t('emails.contributionRejected.toSeeContributionsAndMessages') p diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug index 96aabcec4..6a15eaf79 100644 --- a/backend/src/emails/templates/resetPassword/html.pug +++ b/backend/src/emails/templates/resetPassword/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.resetPassword.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.resetPassword.youOrSomeoneResetPassword') p = t('emails.resetPassword.pleaseClickLink') diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug index 1bb06514f..062bc8059 100644 --- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug +++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) p = t('emails.general.amountGDD', { amountGDD: transactionAmount }) diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug index 887d4b471..da17f2e97 100644 --- a/backend/src/emails/templates/transactionReceived/html.pug +++ b/backend/src/emails/templates/transactionReceived/html.pug @@ -5,7 +5,7 @@ html(lang=locale) body h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject') #container.col - p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName }) + include ../hello.pug p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail }) p = t('emails.general.detailsYouFindOnLinkToYourAccount')