diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-10 19:36:00 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-10 19:36:00 +0100 |
| commit | a8b7ae515ce07747d636b11260d01d8d77deb45c (patch) | |
| tree | 2cab596e0572a5c08eebe20c5187524ffa79fb6f /apps/calendar/js/calendar.js | |
| parent | 9fd07ee10dee3665b7f718fb793bb52ba0bcaba2 (diff) | |
| parent | 1d6b4f8f3c2872b25ded28553925dd35ebd82997 (diff) | |
| download | nextcloud-server-a8b7ae515ce07747d636b11260d01d8d77deb45c.tar.gz nextcloud-server-a8b7ae515ce07747d636b11260d01d8d77deb45c.zip | |
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'apps/calendar/js/calendar.js')
| -rw-r--r-- | apps/calendar/js/calendar.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 404a0ed6089..f6a353edd62 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -769,8 +769,18 @@ $(document).ready(function(){ agenda: agendatime, '': defaulttime }, + columnFormat: { + month: t('calendar', 'ddd'), // Mon + week: t('calendar', 'ddd M/d'), // Mon 9/7 + day: t('calendar', 'dddd M/d') // Monday 9/7 + }, titleFormat: { - list: 'yyyy/MMM/d dddd' + month: t('calendar', 'MMMM yyyy'), + // September 2009 + week: t('calendar', "MMM d[ yyyy]{ '—'[ MMM] d yyyy}"), + // Sep 7 - 13 2009 + day: t('calendar', 'dddd, MMM d, yyyy'), + // Tuesday, Sep 8, 2009 }, axisFormat: defaulttime, monthNames: monthNames, |