From c5dd21cbd6d0d8f3fe8e003e6b75b3b46a54fa00 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 18 Sep 2019 04:38:49 +0200 Subject: [PATCH] Deleted shift: Added message about worklog entry --- includes/mailer/shifts_mailer.php | 7 ++++++- resources/lang/de_DE/default.mo | Bin 46206 -> 46468 bytes resources/lang/de_DE/default.po | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/includes/mailer/shifts_mailer.php b/includes/mailer/shifts_mailer.php index 37b26838..b496a007 100644 --- a/includes/mailer/shifts_mailer.php +++ b/includes/mailer/shifts_mailer.php @@ -94,7 +94,12 @@ function mail_shift_delete($shift) foreach ($users as $user) { $user = (new User())->forceFill($user); if ($user->settings->email_shiftinfo) { - engelsystem_email_to_user($user, __('Your Shift was deleted'), $message, true); + $userMessage = $message; + if ($shift['start'] < time() && !$user['freeloaded']) { + $userMessage .= "\n" . __('Since the deleted shift was already done, we added a worklog entry instead, to keep your work hours correct.') . "\n"; + } + + engelsystem_email_to_user($user, __('Your Shift was deleted'), $userMessage, true); } } } diff --git a/resources/lang/de_DE/default.mo b/resources/lang/de_DE/default.mo index fb93d59098f243fc9f3d8f04dc65da27eb7ce8d5..be387d9c0d395824073d3b564c18dbff8f5cb920 100644 GIT binary patch delta 11467 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 delta 11186 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 U)2m0%AqCxg6l~kH_4{J~19$xD)&Kwi diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 091e1114..3c1e0d15 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -674,6 +674,9 @@ msgstr "Eine deiner Schichten wurde gelöscht:" msgid "Your Shift was deleted" msgstr "Deine Schicht wurde gelöscht" +msgid "Since the deleted shift was already done, we added a worklog entry instead, to keep your work hours correct." +msgstr "Da die gelöschte Schicht bereits vergangen ist, haben wir einen entsprechenden Arbeitseinsatz hinzugefügt." + #: includes/mailer/shifts_mailer.php:114 msgid "You have been assigned to a Shift:" msgstr "Du wurdest in eine Schicht eingetragen:"