fix timeformat setting for fullcalendar

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index af5ecd8281680671b63275c8c12bebdc71b07544..5592e418a446c786cf2094597bb95d1cefec2142 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -138,9 +138,9 @@ Calendar={
                },
                getEventPopupText:function(event){
                        if (event.allDay){
-                               var timespan = $.fullCalendar.formatDates(event.start, event.end, t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"));
+                               var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}")
                        }else{
-                               var timespan = $.fullCalendar.formatDates(event.start, event.end, t('calendar', "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}"));
+                               var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy] ' + defaulttime + '{ -[ ddd d MMMM yyyy]' + defaulttime + '}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}")
                                // Tue 18 October 2011 08:00 - 16:00
                        }
                        var html =
@@ -482,13 +482,13 @@ $(document).ready(function(){
                editable: true,
                defaultView: defaultView,
                timeFormat: {
-                       agenda: 'HH:mm{ - HH:mm}',
-                       '': 'HH:mm'
+                       agenda: agendatime,
+                       '': defaulttime
                        },
                titleFormat: {
                        list: 'yyyy/MMM/d dddd'
                        },
-               axisFormat: 'HH:mm',
+               axisFormat: defaulttime,
                monthNames: monthNames,
                monthNamesShort: monthNamesShort,
                dayNames: dayNames,

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 76c0249e265a3e39eaf0919b5ef6f48c105c2666..2003b7efc491f7ac38e96c86e7b3a90a7598d0d4 100755 (executable)
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -5,6 +5,8 @@
                                var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>;
                                var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
                                var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
+                               var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
+                               var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
                                var allDayText = '<?php echo $l->t('All day') ?>';
                                var missing_field = '<?php echo $l->t('Missing fields') ?>';
                                var missing_field_title = '<?php echo $l->t('Title') ?>';