From e4712658a443ecde49eda4227a05c9f3cbb9f9b9 Mon Sep 17 00:00:00 2001 From: Christian Kleinbach Date: Thu, 23 Apr 2020 12:03:15 +0200 Subject: [PATCH] added german date format for ticks in calender view + corresponding translation --- includes/view/ShiftCalendarRenderer.php | 4 ++-- resources/lang/de_DE/default.po | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php index 3a6df4fa..4bcbd38d 100644 --- a/includes/view/ShiftCalendarRenderer.php +++ b/includes/view/ShiftCalendarRenderer.php @@ -222,14 +222,14 @@ class ShiftCalendarRenderer return div('tick day'); } return div('tick day', [ - date('m-dH:i', $time) + date(__('m-d'), $time) .'
'.date(__('H:i'), $time) ]); } elseif ($time % (60 * 60) == 0) { if (!$label) { return div('tick hour'); } return div('tick hour', [ - date('m-dH:i', $time) + date(__('m-d'), $time) .'
'.date(__('H:i'), $time) ]); } return div('tick'); diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 2a8ff3ff..77fb5c88 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -2280,6 +2280,11 @@ msgstr "noch nicht" msgid "Become %s" msgstr "Werde ein %s" +#: includes/view/ShiftCalenderRenderer.php:225 +#: includes/view/ShiftCalenderRenderer.php:232 +msgid "m-d" +msgstr "d.m." + #: includes/view/ShiftEntry_view.php:18 #, php-format msgid "Do you want to sign off %s from shift %s from %s to %s as %s?"