From 203cc0b5766ff41a08e286651993b09bbb4e0d00 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Tue, 11 Mar 2014 18:08:45 +0100 Subject: [PATCH] [FIX] Render mini calendar with correct date.cultureInfo according to user language bzr revid: jke@openerp.com-20140311170845-sfm7txcllsmkk9wj --- .../web_calendar/static/src/js/web_calendar.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 1041a2a9c24..4c5473a2ed1 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -24,7 +24,13 @@ openerp.web_calendar = function(instance) { shortTimeformat = Date.CultureInfo.formatPatterns.shortTime; return { weekNumberTitle: _t("W"), - allDayText: _t("all-day"), + allDayText: _t("All day"), + buttonText : { + today: _t("Today"), + month: _t("Month"), + week: _t("Week"), + day: _t("Day") + }, monthNames: Date.CultureInfo.monthNames, monthNamesShort: Date.CultureInfo.abbreviatedMonthNames, dayNames: Date.CultureInfo.dayNames, @@ -294,11 +300,18 @@ openerp.web_calendar = function(instance) { var self = this; if (!this.sidebar && this.options.$sidebar) { + translate = get_fc_defaultOptions(); this.sidebar = new instance.web_calendar.Sidebar(this); this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container')); this.$small_calendar = self.$el.find(".oe_calendar_mini"); - this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self) }); + this.$small_calendar.datepicker({ + onSelect: self.calendarMiniChanged(self), + dayNamesMin : translate.dayNamesShort, + monthNames: translate.monthNamesShort, + firstDay: translate.firstDay, + }); + if (this.useContacts) { //Get my Partner ID