IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

use <p> inseatd of \n\n for new line, fix bug with missing infos, fix tests

Browse Source
This commit is contained in:
einhornimmond 2025-05-29 07:46:33 +02:00
parent 932f0ad990
commit a8a6c7250f
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap
View File

@ -496,9 +496,10 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr
</div>
<div class=\\"content\\" style=\\"display: block; width: 78%; margin: 40px 1% 40px 1%; padding: 20px 10% 40px 10%; border-radius: 24px; background-image: linear-gradient(180deg, #f5f5f5, #f5f5f5);\\">
<h2 style=\\"margin-top: 15px; color: #383838;\\">Read and reply to message</h2>
<div class=\\"p_content\\" style=\\"margin: 15px 0 15px 0; line-height: 26px; color: #696c72;\\">„My message.“
To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.</div><a class=\\"button-3\\" href=\\"https://gradido.net/contributions/own-contributions/1#contributionListItem-1\\" style=\\"display: inline-block; padding: 9px 15px; color: white; border: 0; line-height: inherit; text-decoration: none; cursor: pointer; border-radius: 20px; background-image: radial-gradient(circle farthest-corner at 0% 0%, #f9cd69, #c58d38); box-shadow: 16px 13px 35px 0 rgba(56, 56, 56, 0.3); margin: 25px 0 25px 0; width: 50%;\\">To account</a>
<div class=\\"p_content\\" style=\\"margin: 15px 0 15px 0; line-height: 26px; color: #696c72;\\">
<p>„My message.“</p>
<p>To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.</p>
</div><a class=\\"button-3\\" href=\\"https://gradido.net/contributions/own-contributions/1#contributionListItem-1\\" style=\\"display: inline-block; padding: 9px 15px; color: white; border: 0; line-height: inherit; text-decoration: none; cursor: pointer; border-radius: 20px; background-image: radial-gradient(circle farthest-corner at 0% 0%, #f9cd69, #c58d38); box-shadow: 16px 13px 35px 0 rgba(56, 56, 56, 0.3); margin: 25px 0 25px 0; width: 50%;\\">To account</a>
<div class=\\"p_content\\" style=\\"margin: 15px 0 15px 0; line-height: 26px; color: #696c72;\\">Please do not reply to this email.</div>
</div>
<div class=\\"text-block\\" style=\\"margin-top: 20px; color: #9ca0a8;\\">

4
backend/src/emails/templates/addedContributionMessage/html.pug
View File

@ -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')}

3
backend/src/locales/de.json
View File

@ -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“."

3
backend/src/locales/en.json
View File

@ -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."

8
frontend/src/layouts/templates/ContributionsTemplate.spec.js
View File

@ -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"', () => {

4
frontend/src/layouts/templates/ContributionsTemplate.vue
View File

@ -12,7 +12,7 @@
</div>
</div>
</template>
<template #contributions>
<template #own-contributions>
<div class="text-dark">
<h4 class="alert-heading">{{ $t('community.myContributions') }}</h4>
<p>
@ -26,7 +26,7 @@
</ul>
</div>
</template>
<template #community>
<template #all-contributions>
<div class="text-dark">
<h4 class="alert-heading">{{ $t('navigation.community') }}</h4>
<p>