pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: use localized date format

Browse Source 
If getLangDateFormat is called right in loading the js file, it returns
default format. We now call it when translations are ready.

closes odoo/odoo#42126

X-original-commit: e7a58430a382ca1161131e562d53bef3ea0e6ce0
Signed-off-by: Géry Debongnie (ged) <ged@openerp.com>
This commit is contained in:
Ivan Yelizariev
2019-11-18 15:31:46 +00:00
committed by Mathieu Duckerts-Antoine
parent 1a364b4eeb
commit d807e07949
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/backend/dashboard.js
+3 -3
View File
@@ -13,7 +13,6 @@ var web_client = require('web.web_client');
var _t = core._t;
var QWeb = core.qweb;
var DATE_FORMAT = time.getLangDateFormat();
var COLORS = ["#1f77b4", "#aec7e8"];
var FORMAT_OPTIONS = {
// allow to decide if utils.human_number should be used
@@ -44,6 +43,7 @@ var Dashboard = AbstractAction.extend({
init: function(parent, context) {
this._super(parent, context);
this.DATE_FORMAT = time.getLangDateFormat();
this.date_range = 'week'; // possible values : 'week', 'month', year'
this.date_from = moment.utc().subtract(1, 'week');
this.date_to = moment.utc();
@@ -214,7 +214,7 @@ var Dashboard = AbstractAction.extend({
xAxes: [{
ticks: {
callback: function (moment) {
return moment.format(DATE_FORMAT);
return moment.format(self.DATE_FORMAT);
},
}
}],
@@ -237,7 +237,7 @@ var Dashboard = AbstractAction.extend({
var date = tooltipItem.datasetIndex === 0 ?
moment :
moment.subtract(1, self.date_range);
return date.format(DATE_FORMAT) + ': ' + self.formatValue(tooltipItem.yLabel);
return date.format(self.DATE_FORMAT) + ': ' + self.formatValue(tooltipItem.yLabel);
},
labelColor: function (tooltipItem, chart) {
var dataset = chart.data.datasets[tooltipItem.datasetIndex];