aboutsummaryrefslogtreecommitdiff
path: root/views/default/event_calendar
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-29 23:28:04 +0200
committerSem <sembrestels@riseup.net>2012-08-29 23:28:04 +0200
commit3d72bfc22b8a538da08a0f0919fb9799bdc975ec (patch)
tree3a2b1cea6886f3ed4a42767c59aff89470ee9cca /views/default/event_calendar
parent0eda6a0b003c84729176be8e069b7e5ab9d9f43c (diff)
downloadelgg-3d72bfc22b8a538da08a0f0919fb9799bdc975ec.tar.gz
elgg-3d72bfc22b8a538da08a0f0919fb9799bdc975ec.tar.bz2
24h supported for fullcalendar.
Diffstat (limited to 'views/default/event_calendar')
-rw-r--r--views/default/event_calendar/full_calendar_view.php5
1 files changed, 4 insertions, 1 deletions
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; ?>",
});
}