diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-12-06 12:02:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-12-06 12:02:58 +0100 |
| commit | 8ef7af6afe54fbd59051bbbce76daadd6fdb0e86 (patch) | |
| tree | b21971e972eacc87e198fbc38b48ac9b70d168fc /addons/website/static/src/js/menu/content.js | |
| parent | 010add290342ae1e2887450a381e0d1f0acd34e5 (diff) | |
| parent | f96a797fe6238306ec70d3db013b8a4d348ef181 (diff) | |
[MERGE] forward port branch 11.0 up to f96a797fe62
Diffstat (limited to 'addons/website/static/src/js/menu/content.js')
| -rw-r--r-- | addons/website/static/src/js/menu/content.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 566c23f316c..6ba5e3dfa9e 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -150,7 +150,7 @@ var PagePropertiesDialog = widget.Dialog.extend({ down: 'fa fa-chevron-down', }, locale : moment.locale(), - format : time.strftime_to_moment_format(l10n.date_format +' '+ l10n.time_format), + format : time.getLangDatetimeFormat(), widgetPositioning : { horizontal: 'auto', vertical: 'top', |