diff options
| author | Ivan Yelizariev <yelizariev@it-projects.info> | 2019-11-14 06:53:31 +0000 |
|---|---|---|
| committer | Mathieu Duckerts-Antoine <dam@odoo.com> | 2019-11-18 15:31:46 +0000 |
| commit | d807e079492e3ce93e99c87e28d7f801bb872aee (patch) | |
| tree | 3140305f7f431e4ac03ec67ed2ee757a722933f8 /addons/website/static/src/js/backend/dashboard.js | |
| parent | 1a364b4eebf3994f86eb6e509cf6e9e20b19fb48 (diff) | |
[FIX] website: use localized date format
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>
Diffstat (limited to 'addons/website/static/src/js/backend/dashboard.js')
| -rw-r--r-- | addons/website/static/src/js/backend/dashboard.js | 6 |
1 files 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]; |
