summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/pages/user_shifts.php4
-rw-r--r--includes/view/ShiftCalendarRenderer.php2
-rw-r--r--includes/view/ShiftCalendarShiftRenderer.php2
3 files changed, 3 insertions, 5 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 39dcc101..b3db0391 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -200,9 +200,8 @@ function view_user_shifts()
$end_day = date('Y-m-d', $shiftsFilter->getEndTime());
$end_time = date('H:i', $shiftsFilter->getEndTime());
- $assignNotice = '';
if (config('signup_requires_arrival') && !$user['Gekommen']) {
- $assignNotice = info(render_user_arrived_hint(), true);
+ info(render_user_arrived_hint());
}
return page([
@@ -228,7 +227,6 @@ function view_user_shifts()
. ' <a href="' . page_link_to('angeltypes', ['action' => 'about']) . '">'
. _('Description of the jobs.')
. '</a>',
- 'assign_notice' => $assignNotice,
'shifts_table' => msg() . $shiftCalendarRenderer->render(),
'ical_text' => '<h2>' . _('iCal export') . '</h2><p>' . sprintf(
_('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),
diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php
index 354d0336..40642947 100644
--- a/includes/view/ShiftCalendarRenderer.php
+++ b/includes/view/ShiftCalendarRenderer.php
@@ -305,7 +305,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'), 'default')
+ label(_('Shift running/ended or user not arrived'), 'default')
]);
}
}
diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php
index 61e3ecec..97a40ed9 100644
--- a/includes/view/ShiftCalendarShiftRenderer.php
+++ b/includes/view/ShiftCalendarShiftRenderer.php
@@ -189,7 +189,7 @@ class ShiftCalendarShiftRenderer
case ShiftSignupState::NOT_ARRIVED:
// No link and add a text hint, when the shift ended
- $entry_list[] = $inner_text . ' (' . _('not arrived') . ')';
+ $entry_list[] = $inner_text . ' (' . _('please arrive for signup') . ')';
break;
case ShiftSignupState::ANGELTYPE: