diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 9396c2b13..6dbde1196 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -563,18 +563,18 @@ describe('sendEmailVariants', () => { to: 'Peter Lustig ', from: 'Gradido (do not answer) ', attachments: [], - subject: 'Gradido: Your Gradido link has been redeemed', + subject: 'Gradido: Bibi Bloxberg has redeemed your Gradido link', html: expect.any(String), - text: expect.stringContaining('GRADIDO: YOUR GRADIDO LINK HAS BEEN REDEEMED'), + text: expect.stringContaining('BIBI BLOXBERG HAS REDEEMED YOUR GRADIDO LINK'), }), }) expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain( - 'Gradido: Your Gradido link has been redeemed', + 'Gradido: Bibi Bloxberg has redeemed your Gradido link', ) expect(result.originalMessage.html).toContain( - '>Gradido: Your Gradido link has been redeemed', + '>Gradido: Bibi Bloxberg has redeemed your Gradido link', ) expect(result.originalMessage.html).toContain('Hello Peter Lustig') expect(result.originalMessage.html).toContain( diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug index fb561f5c5..30146e27f 100644 --- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug +++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug @@ -1,9 +1,9 @@ doctype html html(lang=locale) head - title= t('emails.transactionLinkRedeemed.subject') + title= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName }) body - h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject') + h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName }) #container.col include ../hello.pug p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) diff --git a/backend/src/emails/templates/transactionLinkRedeemed/subject.pug b/backend/src/emails/templates/transactionLinkRedeemed/subject.pug index 6f4f74f04..9070b60b3 100644 --- a/backend/src/emails/templates/transactionLinkRedeemed/subject.pug +++ b/backend/src/emails/templates/transactionLinkRedeemed/subject.pug @@ -1 +1 @@ -= t('emails.transactionLinkRedeemed.subject') += t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName }) diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts index 6be317e16..d9ccf6936 100644 --- a/backend/src/graphql/resolver/util/creations.test.ts +++ b/backend/src/graphql/resolver/util/creations.test.ts @@ -183,8 +183,10 @@ describe('util/creation', () => { }) it('has the clock set correctly', () => { + const targetMonthString = + (targetDate.getMonth() + 1 < 10 ? '0' : '') + String(targetDate.getMonth() + 1) expect(new Date().toISOString()).toContain( - `${targetDate.getFullYear()}-${targetDate.getMonth() + 1}-${targetDate.getDate()}T23:`, + `${targetDate.getFullYear()}-${targetMonthString}-${targetDate.getDate()}T23:`, ) }) diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index 2e6796794..38b53508b 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -48,7 +48,7 @@ "transactionLinkRedeemed": { "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) hat soeben deinen Link eingelöst.", "memo": "Nachricht: {transactionMemo}", - "subject": "Gradido: Dein Gradido-Link wurde eingelöst" + "subject": "Gradido: {senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst" }, "transactionReceived": { "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.", diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 3b25f8ae4..6131bb501 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -48,7 +48,7 @@ "transactionLinkRedeemed": { "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) has just redeemed your link.", "memo": "Message: {transactionMemo}", - "subject": "Gradido: Your Gradido link has been redeemed" + "subject": "Gradido: {senderFirstName} {senderLastName} has redeemed your Gradido link" }, "transactionReceived": { "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).", diff --git a/frontend/src/components/ContentFooter.spec.js b/frontend/src/components/ContentFooter.spec.js index 175ef347b..29d13bc28 100644 --- a/frontend/src/components/ContentFooter.spec.js +++ b/frontend/src/components/ContentFooter.spec.js @@ -32,8 +32,8 @@ describe('ContentFooter', () => { expect(wrapper.find('div.copyright').exists()).toBeTruthy() }) - it('renders the copyright year', () => { - expect(mocks.$t).toBeCalledWith('footer.copyright.year', { year: 2023 }) + it('renders the current year as copyright year', () => { + expect(mocks.$t).toBeCalledWith('footer.copyright.year', { year: new Date().getFullYear() }) }) it('renders a link to Gradido-Akademie', () => { diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3d593de4f..52da80cc6 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -178,7 +178,7 @@ "link-copied": "Link wurde in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.", "link-deleted": "Der Link wurde am {date} gelöscht.", "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.", - "link-hint": "Achtung: Jeder kann diesen Link einlösen. Gib ihn bitte nicht weiter!", + "link-hint": "Achtung: Jeder kann diesen Link einlösen. Bitte geh achtsam mit ihm um!", "link-overview": "Linkübersicht", "links_count": "Aktive Links", "links_sum": "Offene Links und QR-Codes", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4f3f40782..7837743e0 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -178,7 +178,7 @@ "link-copied": "Link has been copied to the clipboard. You can now paste it into an email or message.", "link-deleted": "The link was deleted on {date}.", "link-expired": "The link is no longer valid. The validity expired on {date}.", - "link-hint": "Attention: Anyone can redeem this link. Please do not share it!", + "link-hint": "Attention: Anyone can redeem this link. Please be careful with it!", "link-overview": "Link overview", "links_count": "Active links", "links_sum": "Open links and QR codes", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 324427ef8..0377dcb4e 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -172,7 +172,7 @@ "link-copied": "El enlace se ha copiado en el portapapeles. Ahora puedes pegarlo en un correo electrónico o mensaje.", "link-deleted": "El enlace se eliminó el {date}.", "link-expired": "El enlace ya no es válido. La validez expiró el {date}.", - "link-hint": "Atención: cualquiera puede canjear este enlace. Por favor, no lo transmitan.", + "link-hint": "Atención: cualquiera puede canjear este enlace. Por favor, ¡ten cuidado con él!", "link-overview": "Resumen de enlaces", "links_count": "Enlaces activos", "links_sum": "Enlaces abiertos y códigos QR", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 95d0426de..e911af300 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -172,7 +172,7 @@ "link-copied": "Le lien a été copié dans le presse-papier. Vous pouvez désormais le coller dans votre email ou votre message.", "link-deleted": "Le lien a été supprimé le on {date}.", "link-expired": "Le lien n´est plus valide. Sa validité a expiré le {date}.", - "link-hint": "Attention : tout le monde peut utiliser ce lien. Ne le partage pas, s'il te plaît!", + "link-hint": "Attention : tout le monde peut utiliser ce lien. Veuillez en prendre soin!", "link-overview": "Aperçu du lien", "links_count": "Liens actifs", "links_sum": "Ouvrir les liens et les QR codes", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 244813b09..ed1181e4c 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -172,7 +172,7 @@ "link-copied": "Link werd naar het klembord gekopieerd. Je kunt deze nu in een email of bericht invoegen.", "link-deleted": "De link werd op {date} verwijderd.", "link-expired": "De link is niet meer geldig. De geldigheid is op {date} afgelopen.", - "link-hint": "Attentie: Iedereen kan deze link inwisselen. Geef het alsjeblieft niet door!", + "link-hint": "Attentie: Ledereen kan deze link inwisselen. Wees er voorzichtig mee!", "link-overview": "Overzicht links", "links_count": "Actieve links", "links_sum": "Open links en QR-Codes",