mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge branch 'master' into add_hide_amount_to_users
This commit is contained in:
Hannes Heine
GitHub
commit
85744a100e
@ -563,18 +563,18 @@ describe('sendEmailVariants', () => {
|
||||
to: 'Peter Lustig <peter@lustig.de>',
|
||||
from: 'Gradido (do not answer) <info@gradido.net>',
|
||||
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('<!DOCTYPE html>')
|
||||
expect(result.originalMessage.html).toContain('<html lang="en">')
|
||||
expect(result.originalMessage.html).toContain(
|
||||
'<title>Gradido: Your Gradido link has been redeemed</title>',
|
||||
'<title>Gradido: Bibi Bloxberg has redeemed your Gradido link</title>',
|
||||
)
|
||||
expect(result.originalMessage.html).toContain(
|
||||
'>Gradido: Your Gradido link has been redeemed</h1>',
|
||||
'>Gradido: Bibi Bloxberg has redeemed your Gradido link</h1>',
|
||||
)
|
||||
expect(result.originalMessage.html).toContain('Hello Peter Lustig')
|
||||
expect(result.originalMessage.html).toContain(
|
||||
|
||||
@ -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 })
|
||||
|
||||
@ -1 +1 @@
|
||||
= t('emails.transactionLinkRedeemed.subject')
|
||||
= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName })
|
||||
|
||||
@ -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:`,
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@ -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.",
|
||||
|
||||
@ -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}).",
|
||||
|
||||
@ -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: 2022 })
|
||||
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', () => {
|
||||
|
||||
@ -172,7 +172,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",
|
||||
|
||||
@ -172,7 +172,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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user