From d23da5b64119ffdc204831fe9ecd9457e8012417 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 14 Dec 2016 11:10:25 -0500 Subject: [PATCH] FIX: digest email preview error in Persian and other languages --- app/assets/javascripts/admin/models/email-preview.js.es6 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js.es6 index cfe96c6e0d5..acc7462b925 100644 --- a/app/assets/javascripts/admin/models/email-preview.js.es6 +++ b/app/assets/javascripts/admin/models/email-preview.js.es6 @@ -5,7 +5,7 @@ EmailPreview.reopenClass({ findDigest: function(lastSeenAt, username) { if (Em.isEmpty(lastSeenAt)) { - lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD'); + lastSeenAt = this.oneWeekAgo(); } if (Em.isEmpty(username)) { @@ -21,7 +21,7 @@ EmailPreview.reopenClass({ sendDigest: function(lastSeenAt, username, email) { if (Em.isEmpty(lastSeenAt)) { - lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD'); + lastSeenAt = this.oneWeekAgo(); } if (Em.isEmpty(username)) { @@ -31,6 +31,11 @@ EmailPreview.reopenClass({ return ajax("/admin/email/send-digest.json", { data: { last_seen_at: lastSeenAt, username: username, email: email } }); + }, + + oneWeekAgo() { + const en = moment().locale('en'); + return en.subtract(7, 'days').format('YYYY-MM-DD'); } });