diff --git a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap index d69802abd..aec3510fe 100644 --- a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap +++ b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap @@ -496,9 +496,10 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr

Read and reply to message

-
„My message.“ - -To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account +
+

„My message.“

+

To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.

+
To account
Please do not reply to this email.
diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug index 5d2fd8da1..df5ba35c4 100644 --- a/backend/src/emails/templates/addedContributionMessage/html.pug +++ b/backend/src/emails/templates/addedContributionMessage/html.pug @@ -7,7 +7,9 @@ block content p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo }) .content h2= t('emails.addedContributionMessage.readMessage') - div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage', { message }) + div(class="p_content") + p= t('emails.addedContributionMessage.message', { message }) + p= t('emails.addedContributionMessage.toSeeAndAnswerMessage') a.button-3(href=`${contributionFrontendLink}`) #{t('emails.general.toAccount')} diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index f7bc796cf..8b34f61f4 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -21,7 +21,8 @@ "readMessage": "Nachricht lesen und beantworten", "subject": "Nachricht zu deinem Gemeinwohl-Beitrag", "title": "Nachricht zu deinem Gemeinwohl-Beitrag", - "toSeeAndAnswerMessage": "„{message}“\n\nUm auf die Nachricht zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“." + "message": "„{message}“", + "toSeeAndAnswerMessage": "Um auf die Nachricht zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“." }, "contribution": { "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“." diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index c782ac695..fb90a0334 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -21,7 +21,8 @@ "readMessage": "Read and reply to message", "subject": "Message about your common good contribution", "title": "Message about your common good contribution", - "toSeeAndAnswerMessage": "„{message}“\n\nTo reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab." + "message": "„{message}“", + "toSeeAndAnswerMessage": "To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab." }, "contribution": { "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." diff --git a/frontend/src/layouts/templates/ContributionsTemplate.spec.js b/frontend/src/layouts/templates/ContributionsTemplate.spec.js index 75448c0ae..30552edfc 100644 --- a/frontend/src/layouts/templates/ContributionsTemplate.spec.js +++ b/frontend/src/layouts/templates/ContributionsTemplate.spec.js @@ -40,9 +40,9 @@ describe('ContributionsTemplate', () => { expect(wrapper.findComponent({ name: 'ContributionInfo' }).exists()).toBe(true) }) - describe('mounted with parameter contributions', () => { + describe('mounted with parameter own-contributions', () => { beforeEach(() => { - wrapper = createWrapper('contributions') + wrapper = createWrapper('own-contributions') }) it('has a header related to "my contributions"', () => { @@ -73,9 +73,9 @@ describe('ContributionsTemplate', () => { }) }) - describe('mounted with parameter community', () => { + describe('mounted with parameter all-contributions', () => { beforeEach(() => { - wrapper = createWrapper('community') + wrapper = createWrapper('all-contributions') }) it('has a header related to "the community"', () => { diff --git a/frontend/src/layouts/templates/ContributionsTemplate.vue b/frontend/src/layouts/templates/ContributionsTemplate.vue index 85213c972..0e1692e69 100644 --- a/frontend/src/layouts/templates/ContributionsTemplate.vue +++ b/frontend/src/layouts/templates/ContributionsTemplate.vue @@ -12,7 +12,7 @@
-