From cb9baaade95fcc78968b0945b2801f2cf52a8d3e Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 14 May 2018 16:31:50 +1000
Subject: [PATCH] correct localization for dashboard periods

previously would fail for non roman numerals
---
 .../admin/components/dashboard-mini-chart.js.es6       |  4 ++--
 .../admin/controllers/admin-dashboard-next.js.es6      | 10 +++++-----
 app/assets/javascripts/admin/models/report.js.es6      | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
index 02f4ad39433..e8dee7a5b3f 100644
--- a/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
+++ b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
@@ -66,11 +66,11 @@ export default Ember.Component.extend(AsyncReport, {
     };
 
     if (this.get("startDate")) {
-      payload.data.start_date = this.get("startDate").format('YYYY-MM-DD[T]HH:mm:ss.SSSZZ');
+      payload.data.start_date = this.get("startDate").locale('en').format('YYYY-MM-DD[T]HH:mm:ss.SSSZZ');
     }
 
     if (this.get("endDate")) {
-      payload.data.end_date = this.get("endDate").format('YYYY-MM-DD[T]HH:mm:ss.SSSZZ');
+      payload.data.end_date = this.get("endDate").locale('en').format('YYYY-MM-DD[T]HH:mm:ss.SSSZZ');
     }
 
     if (this._chart) {
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
index 95d248a4af7..1dead81e483 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
@@ -80,12 +80,12 @@ export default Ember.Controller.extend({
 
   @computed('problemsFetchedAt')
   problemsTimestamp(problemsFetchedAt) {
-    return moment(problemsFetchedAt).format('LLL');
+    return moment(problemsFetchedAt).locale('en').format('LLL');
   },
 
   @computed("period")
   startDate(period) {
-    let fullDay = moment().utc().subtract(1, "day");
+    let fullDay = moment().locale('en').utc().subtract(1, "day");
 
     switch (period) {
       case "yearly":
@@ -107,12 +107,12 @@ export default Ember.Controller.extend({
 
   @computed()
   lastWeek() {
-    return moment().utc().endOf("day").subtract(1, "week");
+    return moment().locale('en').utc().endOf("day").subtract(1, "week");
   },
 
   @computed()
   endDate() {
-    return moment().utc().subtract(1, "day").endOf("day");
+    return moment().locale('en').utc().subtract(1, "day").endOf("day");
   },
 
   @computed("updated_at")
@@ -135,6 +135,6 @@ export default Ember.Controller.extend({
   },
 
   _reportsForPeriodURL(period) {
-    return `/admin/dashboard-next?period=${period}`;
+    return Discourse.getURL(`/admin?period=${period}`);
   }
 });
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index c24e753baf3..49c2508abb3 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -8,14 +8,14 @@ const Report = Discourse.Model.extend({
 
   @computed("type", "start_date", "end_date")
   reportUrl(type, start_date, end_date) {
-    start_date = moment(start_date).format("YYYY-MM-DD");
-    end_date = moment(end_date).format("YYYY-MM-DD");
+    start_date = moment(start_date).locale('en').format("YYYY-MM-DD");
+    end_date = moment(end_date).locale('en').format("YYYY-MM-DD");
     return Discourse.getURL(`/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`);
   },
 
   valueAt(numDaysAgo) {
     if (this.data) {
-      const wantedDate = moment().subtract(numDaysAgo, "days").format("YYYY-MM-DD");
+      const wantedDate = moment().subtract(numDaysAgo, "days").locale('en').format("YYYY-MM-DD");
       const item = this.data.find(d => d.x === wantedDate);
       if (item) {
         return item.y;
@@ -225,8 +225,8 @@ Report.reopenClass({
   fillMissingDates(report) {
     if (_.isArray(report.data)) {
 
-      const startDateFormatted = moment.utc(report.start_date).format('YYYY-MM-DD');
-      const endDateFormatted = moment.utc(report.end_date).format('YYYY-MM-DD');
+      const startDateFormatted = moment.utc(report.start_date).locale('en').format('YYYY-MM-DD');
+      const endDateFormatted = moment.utc(report.end_date).locale('en').format('YYYY-MM-DD');
       report.data = fillMissingDates(report.data, startDateFormatted, endDateFormatted);
     }
   },