iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added more error messages

This commit is contained in:
Igor Scheller 2019-06-04 19:26:50 +02:00 committed by msquare
parent 142871f852
commit 0458ce9509
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/shift_entries_controller.php
View File

@ -212,6 +212,8 @@ function shift_entry_error_message(ShiftSignupState $shift_signup_state)
error(__('This shift ended already.'));
} elseif ($shift_signup_state->getState() == ShiftSignupState::NOT_ARRIVED) {
error(__('You are not marked as arrived.'));
} elseif ($shift_signup_state->getState() == ShiftSignupState::NOT_YET) {
error(__('You are not allowed to sign up yet.'));
} elseif ($shift_signup_state->getState() == ShiftSignupState::SIGNED_UP) {
error(__('You are signed up for this shift.'));
}

2
includes/model/ShiftSignupState.php
View File

@ -93,6 +93,7 @@ class ShiftSignupState
{
switch ($state) {
case ShiftSignupState::NOT_ARRIVED:
case ShiftSignupState::NOT_YET:
case ShiftSignupState::SHIFT_ENDED:
return 100;
@ -109,6 +110,7 @@ class ShiftSignupState
case ShiftSignupState::OCCUPIED:
case ShiftSignupState::ADMIN:
return 60;
default:
return 0;
}

2
includes/view/ShiftCalendarRenderer.php
View File

@ -313,7 +313,7 @@ class ShiftCalendarRenderer
label(__('Help needed'), 'danger'),
label(__('Other angeltype needed / collides with my shifts'), 'warning'),
label(__('Shift is full'), 'success'),
label(__('Shift running/ended or user not arrived'), 'default')
label(__('Shift running/ended or user not arrived/allowed'), 'default')
]);
}
}

2
includes/view/ShiftCalendarShiftRenderer.php
View File

@ -205,7 +205,7 @@ class ShiftCalendarShiftRenderer
break;
case ShiftSignupState::NOT_YET:
$entry_list[] = $inner_text . '(' . _('not yet') . ')';
$entry_list[] = $inner_text . ' (' . _('not yet') . ')';
break;
case ShiftSignupState::ANGELTYPE:

BIN
resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo
View File

Binary file not shown.

7
resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
View File

@ -178,6 +178,9 @@ msgstr "Die Schicht ist schon vorbei."
msgid "You are not marked as arrived."
msgstr "Du bist nicht als angekommen markiert."
msgid "You are not allowed to sign up yet."
msgstr "Du darfst dich noch nicht anmelden."
#: includes/controller/shift_entries_controller.php:216
#: includes/view/Shifts_view.php:129
msgid "You are signed up for this shift."
@ -2108,8 +2111,8 @@ msgid "Shift is full"
msgstr "Schicht ist voll"
#: includes/view/ShiftCalendarRenderer.php:316
msgid "Shift running/ended or user not arrived"
msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
msgid "Shift running/ended or user not arrived/allowed"
msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen/darfst dich noch nicht anmelden"
#: includes/view/ShiftCalendarShiftRenderer.php:134
msgid "Add more angels"