Commit 2b9adb53 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

Merge branch 'staging' into 'master'

Staging

See merge request arsnova/flashcards!1705
parents 9d65b4be b59be717
......@@ -1673,7 +1673,7 @@
"newCards2Plural": " Karten aus der Kartei ",
"textIntro": "Hallo, ",
"textIntro1": "es ist an der Zeit, einen Blick auf deine Lernkarten zu werfen! ",
"textDate1": "Du hast noch bis zum <strong>",
"textDate1": "Du hast noch bis <strong>",
"textDate2": "</strong> Zeit, um die derzeit freigegebenen Karten zu lernen, sonst wird deine Lernstatistik zurückgesetzt.",
"mailCard": "die Kartei <strong>",
"mailCard1": "</strong> benötigt deine Aufmerksamkeit! ",
......
......@@ -38,9 +38,9 @@ export class MailNotifier {
var active = Leitner.findOne({cardset_id: cardset._id, user_id: user_id, active: true});
var deadline = new Date(active.currentDate.getTime() + cardset.daysBeforeReset * 86400000);
if (deadline.getTime() > cardset.learningEnd.getTime() && Bonus.isInBonus(cardset._id, user_id)) {
return (TAPi18n.__('deadlinePrologue', null, Meteor.settings.mail.language) + moment(cardset.learningEnd).format("DD.MM.YYYY") + TAPi18n.__('deadlineEpilogue1', null, Meteor.settings.mail.language));
return (TAPi18n.__('deadlinePrologue', null, Meteor.settings.mail.language) + moment(cardset.learningEnd).format("LLlL") + TAPi18n.__('deadlineEpilogue1', null, Meteor.settings.mail.language));
} else {
return (TAPi18n.__('mailNotification.textDate1', null, Meteor.settings.mail.language) + moment(deadline).format("DD.MM.YYYY") + TAPi18n.__('mailNotification.textDate2', null, Meteor.settings.mail.language));
return (TAPi18n.__('mailNotification.textDate1', null, Meteor.settings.mail.language) + moment(deadline).format("LLLL") + TAPi18n.__('mailNotification.textDate2', null, Meteor.settings.mail.language));
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment