summaryrefslogtreecommitdiffstats
path: root/apps/calendar/js/calendar.js
diff options
context:
space:
mode:
authorGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-20 14:23:26 +0100
committerGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-20 14:23:26 +0100
commita38778f9115d3c6463e74bdf27d003e01e7dc88c (patch)
tree34f6b525b71d8eab4a38bb2c5d05619e524dfdf3 /apps/calendar/js/calendar.js
parent6c4692380fa0bd220610306bee1aa425a2c324b7 (diff)
downloadnextcloud-server-a38778f9115d3c6463e74bdf27d003e01e7dc88c.tar.gz
nextcloud-server-a38778f9115d3c6463e74bdf27d003e01e7dc88c.zip
fix timeformat setting for fullcalendar
Diffstat (limited to 'apps/calendar/js/calendar.js')
-rw-r--r--apps/calendar/js/calendar.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index af5ecd82816..5592e418a44 100644
--- 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,