diff options
Diffstat (limited to 'includes/view/User_view.php')
| -rw-r--r-- | includes/view/User_view.php | 244 |
1 files changed, 123 insertions, 121 deletions
diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 5457e573..ca32b80e 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -4,19 +4,19 @@ * Available T-Shirt sizes */ $tshirt_sizes = [ - '' => _("Please select..."), - 'S' => "S", - 'M' => "M", - 'L' => "L", - 'XL' => "XL", - '2XL' => "2XL", - '3XL' => "3XL", - '4XL' => "4XL", - '5XL' => "5XL", - 'S-G' => "S Girl", - 'M-G' => "M Girl", - 'L-G' => "L Girl", - 'XL-G' => "XL Girl" + '' => _('Please select...'), + 'S' => 'S', + 'M' => 'M', + 'L' => 'L', + 'XL' => 'XL', + '2XL' => '2XL', + '3XL' => '3XL', + '4XL' => '4XL', + '5XL' => '5XL', + 'S-G' => 'S Girl', + 'M-G' => 'M Girl', + 'L-G' => 'L Girl', + 'XL-G' => 'XL Girl' ]; /** @@ -45,69 +45,69 @@ function User_settings_view( div('row', [ div('col-md-6', [ form([ - form_info('', _("Here you can change your user details.")), - form_info(entry_required() . ' = ' . _("Entry required!")), - form_text('nick', _("Nick"), $user_source['Nick'], true), - form_text('lastname', _("Last name"), $user_source['Name']), - form_text('prename', _("First name"), $user_source['Vorname']), + form_info('', _('Here you can change your user details.')), + form_info(entry_required() . ' = ' . _('Entry required!')), + form_text('nick', _('Nick'), $user_source['Nick'], true), + form_text('lastname', _('Last name'), $user_source['Name']), + form_text('prename', _('First name'), $user_source['Vorname']), form_date( 'planned_arrival_date', - _("Planned date of arrival") . ' ' . entry_required(), + _('Planned date of arrival') . ' ' . entry_required(), $user_source['planned_arrival_date'], $buildup_start_date, $teardown_end_date ), form_date( 'planned_departure_date', - _("Planned date of departure"), + _('Planned date of departure'), $user_source['planned_departure_date'], $buildup_start_date, $teardown_end_date ), - form_text('age', _("Age"), $user_source['Alter']), - form_text('tel', _("Phone"), $user_source['Telefon']), - form_text('dect', _("DECT"), $user_source['DECT']), - form_text('mobile', _("Mobile"), $user_source['Handy']), - form_text('mail', _("E-Mail") . ' ' . entry_required(), $user_source['email']), + form_text('age', _('Age'), $user_source['Alter']), + form_text('tel', _('Phone'), $user_source['Telefon']), + form_text('dect', _('DECT'), $user_source['DECT']), + form_text('mobile', _('Mobile'), $user_source['Handy']), + form_text('mail', _('E-Mail') . ' ' . entry_required(), $user_source['email']), form_checkbox( 'email_shiftinfo', - _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), + _('The engelsystem is allowed to send me an email (e.g. when my shifts change)'), $user_source['email_shiftinfo'] ), form_checkbox( 'email_by_human_allowed', - _("Humans are allowed to send me an email (e.g. for ticket vouchers)"), + _('Humans are allowed to send me an email (e.g. for ticket vouchers)'), $user_source['email_by_human_allowed'] ), - form_text('jabber', _("Jabber"), $user_source['jabber']), - form_text('hometown', _("Hometown"), $user_source['Hometown']), + form_text('jabber', _('Jabber'), $user_source['jabber']), + form_text('hometown', _('Hometown'), $user_source['Hometown']), $enable_tshirt_size ? form_select( 'tshirt_size', - _("Shirt size"), + _('Shirt size'), $tshirt_sizes, $user_source['Size'] ) : '', form_info('', _('Please visit the angeltypes page to manage your angeltypes.')), - form_submit('submit', _("Save")) + form_submit('submit', _('Save')) ]) ]), div('col-md-6', [ form([ - form_info(_("Here you can change your password.")), - form_password('password', _("Old password:")), - form_password('new_password', _("New password:")), - form_password('new_password2', _("Password confirmation:")), - form_submit('submit_password', _("Save")) + form_info(_('Here you can change your password.')), + form_password('password', _('Old password:')), + form_password('new_password', _('New password:')), + form_password('new_password2', _('Password confirmation:')), + form_submit('submit_password', _('Save')) ]), form([ - form_info(_("Here you can choose your color settings:")), - form_select('theme', _("Color settings:"), $themes, $user_source['color']), - form_submit('submit_theme', _("Save")) + form_info(_('Here you can choose your color settings:')), + form_select('theme', _('Color settings:'), $themes, $user_source['color']), + form_submit('submit_theme', _('Save')) ]), form([ - form_info(_("Here you can choose your language:")), - form_select('language', _("Language:"), $locales, $user_source['Sprache']), - form_submit('submit_language', _("Save")) + form_info(_('Here you can choose your language:')), + form_select('language', _('Language:'), $locales, $user_source['Sprache']), + form_submit('submit_language', _('Save')) ]) ]) ]) @@ -124,29 +124,29 @@ function User_registration_success_view($event_welcome_message) { $parsedown = new Parsedown(); $event_welcome_message = $parsedown->text($event_welcome_message); - return page_with_title(_("Registration successful"), [ + return page_with_title(_('Registration successful'), [ msg(), div('row', [ div('col-md-4', [ $event_welcome_message ]), div('col-md-4', [ - '<h2>' . _("Login") . '</h2>', + '<h2>' . _('Login') . '</h2>', form([ - form_text('nick', _("Nick"), ""), - form_password('password', _("Password")), - form_submit('submit', _("Login")), + form_text('nick', _('Nick'), ''), + form_password('password', _('Password')), + form_submit('submit', _('Login')), buttons([ - button(page_link_to('user_password_recovery'), _("I forgot my password")) + button(page_link_to('user_password_recovery'), _('I forgot my password')) ]), - info(_("Please note: You have to activate cookies!"), true) + info(_('Please note: You have to activate cookies!'), true) ], page_link_to('login')) ]), div('col-md-4', [ - '<h2>' . _("What can I do?") . '</h2>', - '<p>' . _("Please read about the jobs you can do to help us.") . '</p>', + '<h2>' . _('What can I do?') . '</h2>', + '<p>' . _('Please read about the jobs you can do to help us.') . '</p>', buttons([ - button(page_link_to('angeltypes') . '&action=about', _("Teams/Job description") . ' »') + button(page_link_to('angeltypes') . '&action=about', _('Teams/Job description') . ' »') ]) ]) ]) @@ -161,18 +161,18 @@ function User_registration_success_view($event_welcome_message) */ function User_delete_view($user) { - return page_with_title(sprintf(_("Delete %s"), User_Nick_render($user)), [ + return page_with_title(sprintf(_('Delete %s'), User_Nick_render($user)), [ msg(), buttons([ - button(user_edit_link($user), glyph('chevron-left') . _("back")) + button(user_edit_link($user), glyph('chevron-left') . _('back')) ]), error( - _("Do you really want to delete the user including all his shifts and every other piece of his data?"), + _('Do you really want to delete the user including all his shifts and every other piece of his data?'), true ), form([ - form_password('password', _("Your password")), - form_submit('submit', _("Delete")) + form_password('password', _('Your password')), + form_submit('submit', _('Delete')) ]) ]); } @@ -185,15 +185,15 @@ function User_delete_view($user) */ function User_edit_vouchers_view($user) { - return page_with_title(sprintf(_("%s's vouchers"), User_Nick_render($user)), [ + return page_with_title(sprintf(_('%s\'s vouchers'), User_Nick_render($user)), [ msg(), buttons([ - button(user_link($user), glyph('chevron-left') . _("back")) + button(user_link($user), glyph('chevron-left') . _('back')) ]), - info(sprintf(_("Angel should receive at least %d vouchers."), User_get_eligable_voucher_count($user)), true), + info(sprintf(_('Angel should receive at least %d vouchers.'), User_get_eligable_voucher_count($user)), true), form([ - form_spinner('vouchers', _("Number of vouchers given out"), $user['got_voucher']), - form_submit('submit', _("Save")) + form_spinner('vouchers', _('Number of vouchers given out'), $user['got_voucher']), + form_submit('submit', _('Save')) ], page_link_to('users') . '&action=edit_vouchers&user_id=' . $user['UID']) ]); } @@ -287,21 +287,21 @@ function User_shift_state_render($user) } if (count($upcoming_shifts) == 0) { - return '<span class="text-success">' . _("Free") . '</span>'; + return '<span class="text-success">' . _('Free') . '</span>'; } if ($upcoming_shifts[0]['start'] > time()) { if ($upcoming_shifts[0]['start'] - time() > 3600) { - return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>'; + return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _('Next shift %c') . '</span>'; } - return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>'; + return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _('Next shift %c') . '</span>'; } $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2; if (time() < $halfway) { - return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift starts %c") . '</span>'; + return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _('Shift starts %c') . '</span>'; } - return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends %c") . '</span>'; + return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _('Shift ends %c') . '</span>'; } /** @@ -347,18 +347,18 @@ function User_view_myshift($shift, $user_source, $its_me) } $myshift = [ - 'date' => date("Y-m-d", $shift['start']), - 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']), + 'date' => date('Y-m-d', $shift['start']), + 'time' => date('H:i', $shift['start']) . ' - ' . date('H:i', $shift['end']), 'room' => $shift['Name'], 'shift_info' => $shift_info, 'comment' => $shift['Comment'] ]; if ($shift['freeloaded']) { - if (in_array("user_shifts_admin", $privileges)) { - $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '</p>'; + if (in_array('user_shifts_admin', $privileges)) { + $myshift['comment'] .= '<br /><p class="error">' . _('Freeloaded') . ': ' . $shift['freeload_comment'] . '</p>'; } else { - $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>'; + $myshift['comment'] .= '<br /><p class="error">' . _('Freeloaded') . '</p>'; } } @@ -408,12 +408,12 @@ function User_view_myshifts($shifts, $user_source, $its_me) if (count($myshifts_table) > 0) { $myshifts_table[] = [ - 'date' => '<b>' . _("Sum:") . '</b>', - 'time' => "<b>" . round($timesum / 3600, 1) . " h</b>", - 'room' => "", - 'shift_info' => "", - 'comment' => "", - 'actions' => "" + 'date' => '<b>' . _('Sum:') . '</b>', + 'time' => '<b>' . round($timesum / 3600, 1) . ' h</b>', + 'room' => '', + 'shift_info' => '', + 'comment' => '', + 'actions' => '' ]; } return $myshifts_table; @@ -433,7 +433,7 @@ function User_view_myshifts($shifts, $user_source, $its_me) */ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { - $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']); + $user_name = htmlspecialchars($user_source['Vorname']) . ' ' . htmlspecialchars($user_source['Name']); $myshifts_table = User_view_myshifts($shifts, $user_source, $its_me); return page_with_title( @@ -445,28 +445,28 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel buttons([ $admin_user_privilege ? button( page_link_to('admin_user') . '&id=' . $user_source['UID'], - glyph("edit") . _("edit") + glyph('edit') . _('edit') ) : '', $admin_user_privilege ? button( user_driver_license_edit_link($user_source), - glyph("road") . _("driving license") + glyph('road') . _('driving license') ) : '', ($admin_user_privilege && !$user_source['Gekommen']) ? button( page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], - _("arrived") + _('arrived') ) : '', $admin_user_privilege ? button( page_link_to('users') . '&action=edit_vouchers&user_id=' . $user_source['UID'], glyph('cutlery') . _('Edit vouchers') ) : '', - $its_me ? button(page_link_to('user_settings'), glyph('list-alt') . _("Settings")) : '', + $its_me ? button(page_link_to('user_settings'), glyph('list-alt') . _('Settings')) : '', $its_me ? button( page_link_to('ical') . '&key=' . $user_source['api_key'], - glyph('calendar') . _("iCal Export") + glyph('calendar') . _('iCal Export') ) : '', $its_me ? button( page_link_to('shifts_json_export') . '&key=' . $user_source['api_key'], - glyph('export') . _("JSON Export") + glyph('export') . _('JSON Export') ) : '', $its_me ? button( page_link_to('user_myshifts') . '&reset', @@ -483,9 +483,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel '</h1>' ]), div('col-md-3', [ - '<h4>' . _("User state") . '</h4>', + '<h4>' . _('User state') . '</h4>', ($admin_user_privilege && $freeloader) - ? '<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> ' . _("Freeloader") . '</span><br />' + ? '<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> ' . _('Freeloader') . '</span><br />' : '', $user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' @@ -494,53 +494,53 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel ? ( $user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' - . sprintf(_("Arrived at %s"), date('Y-m-d', $user_source['arrival_date'])) + . sprintf(_('Arrived at %s'), date('Y-m-d', $user_source['arrival_date'])) . '</span>' : '<span class="text-danger">' - . sprintf(_("Not arrived (Planned: %s)"), date('Y-m-d', $user_source['planned_arrival_date'])) + . sprintf(_('Not arrived (Planned: %s)'), date('Y-m-d', $user_source['planned_arrival_date'])) . '</span>' ) : ( $user_source['Gekommen'] - ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' - : '<span class="text-danger">' . _("Not arrived") . '</span>'), + ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _('Arrived') . '</span>' + : '<span class="text-danger">' . _('Not arrived') . '</span>'), $admin_user_privilege ? ( $user_source['got_voucher'] > 0 ? '<br /><span class="text-success">' . glyph('cutlery') . sprintf( - ngettext("Got %s voucher", "Got %s vouchers", $user_source['got_voucher']), + ngettext('Got %s voucher', 'Got %s vouchers', $user_source['got_voucher']), $user_source['got_voucher'] ) . '</span><br />' - : '<br /><span class="text-danger">' . _("Got no vouchers") . '</span><br />') + : '<br /><span class="text-danger">' . _('Got no vouchers') . '</span><br />') : '', - ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _("Active") . '</span>' : '', - ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : '' + ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _('Active') . '</span>' : '', + ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _('T-Shirt') . '</span>' : '' ]), div('col-md-3', [ - '<h4>' . _("Angeltypes") . '</h4>', + '<h4>' . _('Angeltypes') . '</h4>', User_angeltypes_render($user_angeltypes) ]), div('col-md-3', [ - '<h4>' . _("Rights") . '</h4>', + '<h4>' . _('Rights') . '</h4>', User_groups_render($user_groups) ]) ]), - ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '', + ($its_me || $admin_user_privilege) ? '<h2>' . _('Shifts') . '</h2>' : '', ($its_me || $admin_user_privilege) ? table([ - 'date' => _("Day"), - 'time' => _("Time"), - 'room' => _("Location"), - 'shift_info' => _("Name & workmates"), - 'comment' => _("Comment"), - 'actions' => _("Action") + 'date' => _('Day'), + 'time' => _('Time'), + 'room' => _('Location'), + 'shift_info' => _('Name & workmates'), + 'comment' => _('Comment'), + 'actions' => _('Action') ], $myshifts_table) : '', - $its_me ? info(glyph('info-sign') . _("Your night shifts between 2 and 8 am count twice."), true) : '', + $its_me ? info(glyph('info-sign') . _('Your night shifts between 2 and 8 am count twice.'), true) : '', $its_me && count($shifts) == 0 ? error(sprintf( - _("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), + _('Go to the <a href="%s">shifts table</a> to sign yourself up for some shifts.'), page_link_to('user_shifts') ), true) : '' @@ -557,10 +557,10 @@ function User_password_recovery_view() { return page_with_title(user_password_recovery_title(), [ msg(), - _("We will send you an e-mail with a password recovery link. Please use the email address you used for registration."), + _('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.'), form([ - form_text('email', _("E-Mail"), ""), - form_submit('submit', _("Recover")) + form_text('email', _('E-Mail'), ''), + form_submit('submit', _('Recover')) ]) ]); } @@ -574,11 +574,11 @@ function User_password_set_view() { return page_with_title(user_password_recovery_title(), [ msg(), - _("Please enter a new password."), + _('Please enter a new password.'), form([ - form_password('password', _("Password")), - form_password('password2', _("Confirm password")), - form_submit('submit', _("Save")) + form_password('password', _('Password')), + form_password('password2', _('Confirm password')), + form_submit('submit', _('Save')) ]) ]); } @@ -595,7 +595,9 @@ function User_angeltypes_render($user_angeltypes) if ($angeltype['restricted'] == 1 && $angeltype['confirm_user_id'] == null) { $class = 'text-warning'; } - $output[] = '<a href="' . angeltype_link($angeltype['id']) . '" class="' . $class . '">' . ($angeltype['supporter'] ? glyph('education') : '') . $angeltype['name'] . '</a>'; + $output[] = '<a href="' . angeltype_link($angeltype['id']) . '" class="' . $class . '">' + . ($angeltype['supporter'] ? glyph('education') : '') . $angeltype['name'] + . '</a>'; } return join('<br />', $output); } @@ -634,7 +636,7 @@ function render_user_departure_date_hint() global $user; if (!isset($user['planned_departure_date']) || $user['planned_departure_date'] == null) { - return _("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."); + return _('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.'); } return null; @@ -649,7 +651,7 @@ function render_user_freeloader_hint() if (User_is_freeloader($user)) { return sprintf( - _("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), + _('You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again.'), $max_freeloadable_shifts ); } @@ -667,7 +669,7 @@ function render_user_arrived_hint() global $user; if ($user['Gekommen'] == 0) { - return _("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."); + return _('You are not marked as arrived. Please go to heaven\'s desk, get your angel badge and/or tell them that you arrived already.'); } return null; @@ -680,8 +682,8 @@ function render_user_tshirt_hint() { global $enable_tshirt_size, $user; - if ($enable_tshirt_size && $user['Size'] == "") { - return _("You need to specify a tshirt size in your settings!"); + if ($enable_tshirt_size && $user['Size'] == '') { + return _('You need to specify a tshirt size in your settings!'); } return null; @@ -694,8 +696,8 @@ function render_user_dect_hint() { global $user; - if ($user['DECT'] == "") { - return _("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."); + if ($user['DECT'] == '') { + return _('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.'); } return null; |