[js] fix $.fullCalendar.regional call (closes #2232028) stable
authorKatia Saurfelt <katia.saurfelt@logilab.fr>
Fri, 02 Mar 2012 15:15:20 +0100
branchstable
changeset 8295 302dcb3c6858
parent 8294 73c9f22064b3
child 8296 f23782a2cdee
[js] fix $.fullCalendar.regional call (closes #2232028)
web/data/fullcalendar.locale.js
web/views/calendar.py
--- 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
--- 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);