# HG changeset patch # User Katia Saurfelt # Date 1330697720 -3600 # Node ID 302dcb3c68580c21e6c0526db48b2d5a75d2ca43 # Parent 73c9f22064b384c43c9e9624ebb1fe6da9fda217 [js] fix $.fullCalendar.regional call (closes #2232028) diff -r 73c9f22064b3 -r 302dcb3c6858 web/data/fullcalendar.locale.js --- a/web/data/fullcalendar.locale.js Fri Mar 02 09:57:47 2012 +0100 +++ b/web/data/fullcalendar.locale.js Fri Mar 02 15:15:20 2012 +0100 @@ -1,5 +1,8 @@ -jQuery(function($){ - $.fullCalendar.regional = function(lng, options){ +/* + translations for fullCalendar plugin + */ + +$.fullCalendar.regional = function(lng, options){ var defaults = {'fr' : { monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Décembre'], @@ -32,4 +35,4 @@ } else {return options;}; }; -}); \ No newline at end of file +; \ No newline at end of file diff -r 73c9f22064b3 -r 302dcb3c6858 web/views/calendar.py --- a/web/views/calendar.py Fri Mar 02 09:57:47 2012 +0100 +++ b/web/views/calendar.py Fri Mar 02 15:15:20 2012 +0100 @@ -190,7 +190,7 @@ def call(self): self._cw.demote_to_html() self._cw.add_css(('fullcalendar.css', 'cubicweb.calendar.css')) - self._cw.add_js(('jquery.ui.js', 'fullcalendar.min.js', 'jquery.qtip.min.js')) + self._cw.add_js(('jquery.ui.js', 'fullcalendar.min.js', 'jquery.qtip.min.js', 'fullcalendar.locale.js')) self.calendar_id = 'cal' + make_uid('uid') self.add_onload() # write calendar div to load jquery fullcalendar object @@ -200,7 +200,6 @@ fullcalendar_options = self.fullcalendar_options.copy() fullcalendar_options['events'] = self.get_events() # i18n - self._cw.add_js('fullcalendar.locale.js') # js callback to add a tooltip and to put html in event's title js = """ var options = $.fullCalendar.regional('%s', %s);