From: Sem <sembrestels@riseup.net>
Date: Wed, 29 Aug 2012 21:28:04 +0000 (+0200)
Subject: 24h supported for fullcalendar.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3d72bfc22b8a538da08a0f0919fb9799bdc975ec;p=lorea%2Felgg.git

24h supported for fullcalendar.
---

diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php
index adbb8a359..6fc59fcc8 100644
--- a/views/default/event_calendar/full_calendar_view.php
+++ b/views/default/event_calendar/full_calendar_view.php
@@ -3,6 +3,8 @@ elgg_load_js('elgg.full_calendar');
 elgg_load_js('lightbox');
 elgg_load_css('lightbox');
 
+$timeformat = elgg_get_plugin_setting('timeformat', 'event_calendar') == 24 ? 'H(:mm)' : 'h(:mm)t';
+
 // TODO: is there an easy way to avoid embedding JS?
 ?>
 <script>
@@ -187,7 +189,8 @@ fullcalendarInit = function() {
 				month: elgg.echo('event_calendar:month_label'),
 				week: elgg.echo('event_calendar:week_label'),
 				day: elgg.echo('event_calendar:day_label')
-			}
+			},
+			timeFormat: "<?php echo $timeformat; ?>",
 		});
 	}