From d807e079492e3ce93e99c87e28d7f801bb872aee Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Thu, 14 Nov 2019 06:53:31 +0000 Subject: [PATCH] [FIX] website: use localized date format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- addons/website/static/src/js/backend/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index f074bb0df84..c1dcfdb39d1 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -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];