From 46162bd6a2ade8dcf0480700f8abb9fd4fb33d14 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 20 Jan 2015 13:22:39 +0100 Subject: [PATCH] [FIX] web_calendar: adapt date format to fullcalendar v1 --- addons/web_calendar/static/src/js/web_calendar.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 46c4b7f542d..07480a3965f 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -22,6 +22,14 @@ openerp.web_calendar = function(instance) { function get_fc_defaultOptions() { shortTimeformat = moment._locale._longDateFormat.LT; var dateFormat = instance.web.normalize_format(_t.database.parameters.date_format); + + // adapt format for fullcalendar v1. + // see http://fullcalendar.io/docs1/utilities/formatDate/ + var conversions = [['YYYY', 'yyyy'], ['YY', 'y'], ['DDDD', 'dddd'], ['DD', 'dd']]; + _.each(conversions, function(conv) { + dateFormat = dateFormat.replace(conv[0], conv[1]); + }); + return { weekNumberTitle: _t("W"), allDayText: _t("All day"),