diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-09-18 04:38:49 +0200 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2019-09-18 04:38:49 +0200 |
| commit | c5dd21cbd6d0d8f3fe8e003e6b75b3b46a54fa00 (patch) | |
| tree | b85814fd7a014b37317671c0b76ccce1f9d3d97e | |
| parent | 85e440339267859f9d3f70183c32f9443ca9a27a (diff) | |
Deleted shift: Added message about worklog entry
| -rw-r--r-- | includes/mailer/shifts_mailer.php | 7 | ||||
| -rw-r--r-- | resources/lang/de_DE/default.mo | bin | 46206 -> 46468 bytes | |||
| -rw-r--r-- | resources/lang/de_DE/default.po | 3 |
3 files changed, 9 insertions, 1 deletions
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 Binary files differindex fb93d590..be387d9c 100644 --- a/resources/lang/de_DE/default.mo +++ b/resources/lang/de_DE/default.mo 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:" |