diff options
| -rw-r--r-- | apps/calendar/js/calendar.js | 12 | ||||
| -rw-r--r-- | apps/calendar/templates/calendar.php | 6 | ||||
| -rw-r--r-- | lib/l10n.php | 16 |
3 files changed, 34 insertions, 0 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 876465a0e53..f8456c9bc08 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -662,9 +662,21 @@ $(document).ready(function(){ header: false, firstDay: 1, editable: true, + defaultView: defaultView, + timeFormat: { + agenda: 'HH:mm{ - HH:mm}', + '': 'HH:mm' + }, + axisFormat: 'HH:mm', + monthNames: monthNames, + monthNamesShort: monthNamesShort, + dayNames: dayNames, + dayNamesShort: dayNamesShort, + allDayText: allDayText, eventSources: eventSources, viewDisplay: function(view) { $('#datecontrol_date').html(view.title); + $.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name); } }); $('#oneweekview_radio').click(function(){ diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php index d09a5d45a1a..58f61661ce3 100644 --- a/apps/calendar/templates/calendar.php +++ b/apps/calendar/templates/calendar.php @@ -1,5 +1,11 @@ <script type='text/javascript'> +var defaultView = '<?php echo OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') ?>'; var eventSources = <?php echo json_encode($_['eventSources']) ?>; +var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>; +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 allDayText = '<?php echo $l->t('All day') ?>'; </script> <div id="sysbox"></div> <div id="controls"> diff --git a/lib/l10n.php b/lib/l10n.php index 54331d44ae4..a5544eb3a27 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -110,6 +110,22 @@ class OC_L10N{ } /** + * @brief Translating + * @param $textArray The text array we need a translation for + * @returns Translation or the same text + * + * Returns the translation. If no translation is found, $textArray will be + * returned. + */ + public function tA($textArray){ + $result = array(); + foreach($textArray as $key => $text){ + $result[$key] = $this->t($text); + } + return $result; + } + + /** * @brief getTranslations * @returns Fetch all translations * |