summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorLucas Perais (lpe) <lpe@odoo.com>2019-01-24 16:39:41 +0000
committerLucas Perais (lpe) <lpe@odoo.com>2019-02-07 09:57:32 +0000
commitf9a80a6e84ec3dd9e47f547e44c3bce1d134bda0 (patch)
treeda56785c0c36d984106e1f20386692eac8e7e6d6 /addons/web/static/src
parentc47dc928f6ec67f0e76c8b7907d7f62ae2452d89 (diff)
[FIX] web: calendar: take locale to format dates
Backport of d9fed5381a78c19ce14ddc8b9233f60d53c65453 Before this commit, when opening the calendar view with a specific locale in the "week" view the days were translated but the date format was wrong and fell back to english This was because the translated terms were passed explicitly, but the locale did not get passed After this commit, we do what it takes to pass the locale to fullcalendar and the dates are formatted with the right pattern Also, there may be a bug in fullcalendar, because just passing the locale in the options won't work, it should be instanciated first in fullcalendar's "locales cache" OPW 1922092 OPW 1934127 closes odoo/odoo#30909
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_renderer.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js
index 6565cbb8385..4c0fabadfdf 100644
--- a/addons/web/static/src/js/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js
@@ -317,6 +317,11 @@ return AbstractRenderer.extend({
this.$calendar = this.$(".o_calendar_widget");
+ // This seems like a workaround but apparently passing the locale
+ // in the options is not enough. We should initialize it beforehand
+ var locale = moment.locale();
+ $.fullCalendar.locale(locale);
+
//Documentation here : http://arshaw.com/fullcalendar/docs/
var fc_options = $.extend({}, this.state.fc_options, {
eventDrop: function (event) {
@@ -370,6 +375,7 @@ return AbstractRenderer.extend({
},
height: 'parent',
unselectAuto: false,
+ locale: locale, // reset locale when fullcalendar has already been instanciated before now
});
this.$calendar.fullCalendar(fc_options);