github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct localization for dashboard periods

Browse Source 
previously would fail for non roman numerals
This commit is contained in:
Sam
2018-05-14 16:31:50 +10:00
parent e1d7f3bb94
commit cb9baaade9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
View File

@ -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}`);
}
});