mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: digest email preview error in Persian and other languages
This commit is contained in:
parent
2164d7d21c
commit
d23da5b641
@ -5,7 +5,7 @@ EmailPreview.reopenClass({
|
|||||||
findDigest: function(lastSeenAt, username) {
|
findDigest: function(lastSeenAt, username) {
|
||||||
|
|
||||||
if (Em.isEmpty(lastSeenAt)) {
|
if (Em.isEmpty(lastSeenAt)) {
|
||||||
lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD');
|
lastSeenAt = this.oneWeekAgo();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Em.isEmpty(username)) {
|
if (Em.isEmpty(username)) {
|
||||||
@ -21,7 +21,7 @@ EmailPreview.reopenClass({
|
|||||||
|
|
||||||
sendDigest: function(lastSeenAt, username, email) {
|
sendDigest: function(lastSeenAt, username, email) {
|
||||||
if (Em.isEmpty(lastSeenAt)) {
|
if (Em.isEmpty(lastSeenAt)) {
|
||||||
lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD');
|
lastSeenAt = this.oneWeekAgo();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Em.isEmpty(username)) {
|
if (Em.isEmpty(username)) {
|
||||||
@ -31,6 +31,11 @@ EmailPreview.reopenClass({
|
|||||||
return ajax("/admin/email/send-digest.json", {
|
return ajax("/admin/email/send-digest.json", {
|
||||||
data: { last_seen_at: lastSeenAt, username: username, email: email }
|
data: { last_seen_at: lastSeenAt, username: username, email: email }
|
||||||
});
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
oneWeekAgo() {
|
||||||
|
const en = moment().locale('en');
|
||||||
|
return en.subtract(7, 'days').format('YYYY-MM-DD');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user