diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php index 7c9947a56f8292f6a95b3fe20c5878a60a024829..b967afa4f0fe1913aa9f81a89c0adda6bc7658ec 100644 --- a/app/controllers/calendar/calendar.php +++ b/app/controllers/calendar/calendar.php @@ -34,6 +34,7 @@ class Calendar_CalendarController extends AuthenticatedController $sidebar = Sidebar::get(); $actions = new ActionsWidget(); + $export = new ExportWidget(); if ($schedule) { //Add the semester selector widget first: $semester_widget = new SemesterSelectorWidget( @@ -67,20 +68,20 @@ class Calendar_CalendarController extends AuthenticatedController if (!$GLOBALS['perm']->have_perm('admin')) { $actions->addLink( - _('Veranstaltung auswählen'), + _('Veranstaltungen auswählen'), $this->url_for('calendar/calendar/add_courses'), Icon::create('seminar'), ['data-dialog' => 'size=medium'] ); } if (!$schedule) { - $actions->addLink( + $export->addLink( _('Termine exportieren'), $this->url_for('calendar/calendar/export', ['timestamp' => time()]), Icon::create('export'), ['data-dialog' => 'size=auto', 'class' => 'calendar-action'] ); - $actions->addLink( + $export->addLink( _('Termine importieren'), $this->url_for('calendar/calendar/import'), Icon::create('import'), @@ -98,7 +99,7 @@ class Calendar_CalendarController extends AuthenticatedController Icon::create('group2') ); } - $actions->addLink( + $export->addLink( _('Drucken'), 'javascript:void(window.print());', Icon::create('print') @@ -110,6 +111,7 @@ class Calendar_CalendarController extends AuthenticatedController ['data-dialog' => 'size=auto;reload-on-close'] ); $sidebar->addWidget($actions); + $sidebar->addWidget($export); if (!$schedule) { $date = new DateSelectWidget(); diff --git a/app/views/calendar/date/_add_edit_form.php b/app/views/calendar/date/_add_edit_form.php index 6596a388fda2f875bce2df3789ccf82844fbc8c5..74dc955382cc710a16845d49defb80189f82d0d9 100644 --- a/app/views/calendar/date/_add_edit_form.php +++ b/app/views/calendar/date/_add_edit_form.php @@ -86,7 +86,7 @@ <label> <?= _('Zugriff') ?> <?= tooltipIcon( - _('Öffentliche Termine sind systemweit sichtbar. Private Termine sind für Personen, denen der Kalender freigegeben wurde, sichtbar. Vertrauliche Termine sind hingegen nur für einen selbst sichtbar.') + _('Öffentliche Termine sind systemweit sichtbar. Private Termine sind für Personen, denen der Kalender freigegeben wurde, sichtbar. Vertrauliche Termine sind hingegen nur für Sie selbst sichtbar.') ) ?> <div class="flex-row"> <select name="access"> diff --git a/app/views/settings/calendar.php b/app/views/settings/calendar.php index 6772829c52e9fd767032462249824570fd4d6bc8..38ac4bdd00edaa3b43078efc6937123bf6c94aa0 100644 --- a/app/views/settings/calendar.php +++ b/app/views/settings/calendar.php @@ -66,22 +66,22 @@ $cal_step_weeks = [ <div class="hgroup"> <label> - <?= _('Startuhrzeit') ?> + <?= _('Beginn') ?> <select name="cal_start" aria-label="<?= _('Startzeit der Tages- und Wochenansicht') ?>" class="size-s"> <? for ($i = 0; $i < 24; $i += 1): ?> <option value="<?= $i ?>" <? if ($start == $i) echo 'selected'; ?>> - <?= sprintf(_('%02u:00 Uhr'), $i) ?> + <?= sprintf('%02u:00', $i) ?> </option> <? endfor; ?> </select> </label> <label> - <?= _('Enduhrzeit') ?> + <?= _('Ende') ?> <select name="cal_end" aria-label="<?= _('Endzeit der Tages- und Wochenansicht') ?>" class="size-s"> <? for ($i = 1; $i < 25; $i += 1): ?> <option value="<?= $i ?>" <? if ($end == $i) echo 'selected'; ?>> - <?= sprintf(_('%02u:00 Uhr'), $i) ?> + <?= sprintf('%02u:00', $i) ?> </option> <? endfor; ?> </select> diff --git a/lib/navigation/StartNavigation.php b/lib/navigation/StartNavigation.php index 0bc9125ad5155c4e971c98cd8bdb4c92fee6f950..9e0f78c7c28f1a8fd34692013f5a52de3838c371 100644 --- a/lib/navigation/StartNavigation.php +++ b/lib/navigation/StartNavigation.php @@ -273,7 +273,7 @@ class StartNavigation extends Navigation $this->addSubNavigation('profile', $navigation); - $navigation = new Navigation(_('Stundenplan')); + $navigation = new Navigation(_('Planer')); if (Config::get()->CALENDAR_ENABLE) { $navigation->addSubNavigation('calendar', new Navigation(_('Kalender'), 'dispatch.php/calendar/calendar'));