From 3f9de705a83ba650a66564108adb12fc73175949 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 9 May 2023 17:47:57 +0200 Subject: [PATCH] refine contribution related email templates --- .../emails/templates/contributionConfirmed/html.pug | 10 ++-------- .../src/emails/templates/contributionDeleted/html.pug | 6 +----- .../src/emails/templates/contributionDenied/html.pug | 6 +----- .../emails/templates/transactionLinkRedeemed/html.pug | 2 +- backend/src/locales/de.json | 4 ++-- backend/src/locales/en.json | 4 ++-- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug index 984572acd..cc4d778d7 100644 --- a/backend/src/emails/templates/contributionConfirmed/html.pug +++ b/backend/src/emails/templates/contributionConfirmed/html.pug @@ -6,13 +6,7 @@ block content h1.headline.h1= t('emails.contributionConfirmed.title') .text-block include ../includes/salutation.pug - p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName }) + p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount }) .content.w-container - h2.heading= t('emails.general.contributionDetails') - div(class="p_content") - = t('emails.general.amountGDD') - br - = t('emails.general.contribution') - a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')} - + include ../includes/contributionDetailsCTA.pug include ../includes/doNotReply.pug \ No newline at end of file diff --git a/backend/src/emails/templates/contributionDeleted/html.pug b/backend/src/emails/templates/contributionDeleted/html.pug index ebf16be28..1a4aab038 100644 --- a/backend/src/emails/templates/contributionDeleted/html.pug +++ b/backend/src/emails/templates/contributionDeleted/html.pug @@ -8,9 +8,5 @@ block content include ../includes/salutation.pug p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName }) .content.w-container - h2.heading= t('emails.general.contributionDetails') - div(class="p_content") - = t('emails.contribution.toSeeContributionsAndMessages') - a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')} - + include ../includes/contributionDetailsCTA.pug include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/contributionDenied/html.pug b/backend/src/emails/templates/contributionDenied/html.pug index f26ff74ef..0c082a1e0 100644 --- a/backend/src/emails/templates/contributionDenied/html.pug +++ b/backend/src/emails/templates/contributionDenied/html.pug @@ -8,9 +8,5 @@ block content include ../includes/salutation.pug p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName }) .content.w-container - h2.heading= t('emails.general.contributionDetails') - div(class="p_content") - = t('emails.contribution.toSeeContributionsAndMessages') - a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')} - + include ../includes/contributionDetailsCTA.pug include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug index d3abec4f7..46e112b54 100644 --- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug +++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug @@ -3,7 +3,7 @@ extend ../layout.pug block content .wrapper.wf-section .w-container(class="wrapper_head") - h1.headline.h1= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) + h1.headline.h1= t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName }) .text-block include ../includes/salutation.pug p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index 809146b37..3be616561 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -27,7 +27,7 @@ "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“." }, "contributionConfirmed": { - "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag wurde soeben von {senderFirstName} {senderLastName} bestätigt und in deinem Gradido-Konto gutgeschrieben.", + "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt. Es wurden deinem Gradido-Konto {amountGDD} GDD gutgeschrieben.", "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde bestätigt", "title": "Dein Gemeinwohl-Beitrag wurde bestätigt" }, @@ -54,7 +54,7 @@ "completeRegistration": "Registrierung abschließen", "contribution": "Gemeinwohl-Beitrag: {contributionMemo}", "contributionDetails": "Beitragsdetails", - "detailsYouFindOnLinkToYourAccount": "Details zur Transaktion findest du in deinem Gradido-Konto:", + "detailsYouFindOnLinkToYourAccount": "Details zur Transaktion findest du in deinem Gradido-Konto.", "helloName": "Hallo {firstName} {lastName},", "linkValidity": "Der Link hat eine Gültigkeit von {hours} Stunden.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen:", "linkValidityWithMinutes": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen:", diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 77501e994..f7244e14e 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -27,7 +27,7 @@ "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab." }, "contributionConfirmed": { - "commonGoodContributionConfirmed": "Your common good contribution has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.", + "commonGoodContributionConfirmed": "Your common good contribution "{contributionMemo}" has just been approved by {senderFirstName} {senderLastName}. Your Gradido account has been credited with {amountGDD} GDD.", "subject": "Gradido: Your contribution to the common good was confirmed", "title": "Your contribution to the common good was confirmed" }, @@ -54,7 +54,7 @@ "completeRegistration": "Complete registration", "contribution": "Contribution: : {contributionMemo}", "contributionDetails": "Contribution details", - "detailsYouFindOnLinkToYourAccount": "You can find transaction details in your Gradido account:", + "detailsYouFindOnLinkToYourAccount": "You can find transaction details in your Gradido account.", "helloName": "Hello {firstName} {lastName}", "linkValidity": "The link has a validity of {hours} hours.\nIf the validity of the link has already expired, you can have a new link sent to you here:", "linkValidityWithMinutes": "The link has a validity of {hours} hours and {minutes} minutes.\nIf the validity of the link has already expired, you can have a new link sent to you here:",