Replaced gettext translation `_()` with `__()` that uses the Translator class

14 files changed, 389 insertions, 389 deletions

diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index 93fa03b5..c64297c2 100644
--- a/includes/view/AngelTypes_view.php
+++ b/includes/view/AngelTypes_view.php
@@ -31,15 +31,15 @@ function AngelType_render_membership($user_angeltype)
     if (!empty($user_angeltype['user_angeltype_id'])) {
         if ($user_angeltype['restricted']) {
             if (empty($user_angeltype['confirm_user_id'])) {
-                return glyph('lock') . _('Unconfirmed');
+                return glyph('lock') . __('Unconfirmed');
             } elseif ($user_angeltype['supporter']) {
-                return glyph_bool(true) . _('Supporter');
+                return glyph_bool(true) . __('Supporter');
             }
-            return glyph_bool(true) . _('Member');
+            return glyph_bool(true) . __('Member');
         } elseif ($user_angeltype['supporter']) {
-            return glyph_bool(true) . _('Supporter');
+            return glyph_bool(true) . __('Supporter');
         }
-        return glyph_bool(true) . _('Member');
+        return glyph_bool(true) . __('Member');
     }
     return glyph_bool(false);
 }
@@ -50,16 +50,16 @@ function AngelType_render_membership($user_angeltype)
  */
 function AngelType_delete_view($angeltype)
 {
-    return page_with_title(sprintf(_('Delete angeltype %s'), $angeltype['name']), [
-        info(sprintf(_('Do you want to delete angeltype %s?'), $angeltype['name']), true),
+    return page_with_title(sprintf(__('Delete angeltype %s'), $angeltype['name']), [
+        info(sprintf(__('Do you want to delete angeltype %s?'), $angeltype['name']), true),
         buttons([
-            button(page_link_to('angeltypes'), glyph('remove') . _('cancel')),
+            button(page_link_to('angeltypes'), glyph('remove') . __('cancel')),
             button(
                 page_link_to(
                     'angeltypes',
                     ['action' => 'delete', 'angeltype_id' => $angeltype['id'], 'confirmed' => 1]
                 ),
-                glyph('ok') . _('delete'),
+                glyph('ok') . __('delete'),
                 'btn-danger'
             )
         ])
@@ -75,48 +75,48 @@ function AngelType_delete_view($angeltype)
  */
 function AngelType_edit_view($angeltype, $supporter_mode)
 {
-    return page_with_title(sprintf(_('Edit %s'), $angeltype['name']), [
+    return page_with_title(sprintf(__('Edit %s'), $angeltype['name']), [
         buttons([
-            button(page_link_to('angeltypes'), _('Angeltypes'), 'back')
+            button(page_link_to('angeltypes'), __('Angeltypes'), 'back')
         ]),
         msg(),
         form([
             $supporter_mode
-                ? form_info(_('Name'), $angeltype['name'])
-                : form_text('name', _('Name'), $angeltype['name']),
+                ? form_info(__('Name'), $angeltype['name'])
+                : form_text('name', __('Name'), $angeltype['name']),
             $supporter_mode
-                ? form_info(_('Restricted'), $angeltype['restricted'] ? _('Yes') : _('No'))
-                : form_checkbox('restricted', _('Restricted'), $angeltype['restricted']),
+                ? form_info(__('Restricted'), $angeltype['restricted'] ? __('Yes') : __('No'))
+                : form_checkbox('restricted', __('Restricted'), $angeltype['restricted']),
             form_info(
                 '',
-                _('Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).')
+                __('Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).')
             ),
             $supporter_mode
-                ? form_info(_('No Self Sign Up'), $angeltype['no_self_signup'] ? _('Yes') : _('No'))
-                : form_checkbox('no_self_signup', _('No Self Sign Up'), $angeltype['no_self_signup']),
+                ? form_info(__('No Self Sign Up'), $angeltype['no_self_signup'] ? __('Yes') : __('No'))
+                : form_checkbox('no_self_signup', __('No Self Sign Up'), $angeltype['no_self_signup']),
             $supporter_mode
-                ? form_info(_('Requires driver license'),
+                ? form_info(__('Requires driver license'),
                 $angeltype['requires_driver_license']
-                    ? _('Yes')
-                    : _('No'))
+                    ? __('Yes')
+                    : __('No'))
                 : form_checkbox(
                 'requires_driver_license',
-                _('Requires driver license'),
+                __('Requires driver license'),
                 $angeltype['requires_driver_license']),
             $supporter_mode
-                ? form_info(_('Show on dashboard'), $angeltype['show_on_dashboard'] ? _('Yes') : _('No'))
-                : form_checkbox('show_on_dashboard', _('Show on dashboard'), $angeltype['show_on_dashboard']),
-            form_textarea('description', _('Description'), $angeltype['description']),
-            form_info('', _('Please use markdown for the description.')),
-            heading(_('Contact'), 3),
+                ? form_info(__('Show on dashboard'), $angeltype['show_on_dashboard'] ? __('Yes') : __('No'))
+                : form_checkbox('show_on_dashboard', __('Show on dashboard'), $angeltype['show_on_dashboard']),
+            form_textarea('description', __('Description'), $angeltype['description']),
+            form_info('', __('Please use markdown for the description.')),
+            heading(__('Contact'), 3),
             form_info(
                 '',
-                _('Primary contact person/desk for user questions.')
+                __('Primary contact person/desk for user questions.')
             ),
-            form_text('contact_name', _('Name'), $angeltype['contact_name']),
-            form_text('contact_dect', _('DECT'), $angeltype['contact_dect']),
-            form_text('contact_email', _('E-Mail'), $angeltype['contact_email']),
-            form_submit('submit', _('Save'))
+            form_text('contact_name', __('Name'), $angeltype['contact_name']),
+            form_text('contact_dect', __('DECT'), $angeltype['contact_dect']),
+            form_text('contact_email', __('E-Mail'), $angeltype['contact_email']),
+            form_submit('submit', __('Save'))
         ])
     ]);
 }
@@ -135,50 +135,50 @@ function AngelType_edit_view($angeltype, $supporter_mode)
 function AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user)
 {
     $buttons = [
-        button(page_link_to('angeltypes'), _('Angeltypes'), 'back')
+        button(page_link_to('angeltypes'), __('Angeltypes'), 'back')
     ];
 
     if ($angeltype['requires_driver_license']) {
         $buttons[] = button(
             user_driver_license_edit_link($user),
-            glyph('road') . _('my driving license')
+            glyph('road') . __('my driving license')
         );
     }
 
     if (is_null($user_angeltype)) {
         $buttons[] = button(
             page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype['id']]),
-            _('join'),
+            __('join'),
             'add'
         );
     } else {
         if ($angeltype['requires_driver_license'] && empty($user_driver_license)) {
-            error(_('This angeltype requires a driver license. Please enter your driver license information!'));
+            error(__('This angeltype requires a driver license. Please enter your driver license information!'));
         }
 
         if ($angeltype['restricted'] && empty($user_angeltype['confirm_user_id'])) {
             error(sprintf(
-                _('You are unconfirmed for this angeltype. Please go to the introduction for %s to get confirmed.'),
+                __('You are unconfirmed for this angeltype. Please go to the introduction for %s to get confirmed.'),
                 $angeltype['name']
             ));
         }
         $buttons[] = button(
             page_link_to('user_angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype['id']]),
-            _('leave')
+            __('leave')
         );
     }
 
     if ($admin_angeltypes || $supporter) {
         $buttons[] = button(
             page_link_to('angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype['id']]),
-            _('edit'),
+            __('edit'),
             'edit'
         );
     }
     if ($admin_angeltypes) {
         $buttons[] = button(
             page_link_to('angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype['id']]),
-            _('delete'),
+            __('delete'),
             'delete'
         );
     }
@@ -219,7 +219,7 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
                         'user_angeltypes',
                         ['action' => 'confirm', 'user_angeltype_id' => $member['user_angeltype_id']]
                     ),
-                    _('confirm'),
+                    __('confirm'),
                     'btn-xs'
                 ),
                 button(
@@ -227,7 +227,7 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
                         'user_angeltypes',
                         ['action' => 'delete', 'user_angeltype_id' => $member['user_angeltype_id']]
                     ),
-                    _('deny'),
+                    __('deny'),
                     'btn-xs'
                 )
             ]);
@@ -241,7 +241,7 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
                             'user_angeltype_id' => $member['user_angeltype_id'],
                             'supporter'         => 0
                         ]),
-                        _('Remove supporter rights'),
+                        __('Remove supporter rights'),
                         'btn-xs'
                     )
                 ]);
@@ -258,14 +258,14 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
                         'user_angeltype_id' => $member['user_angeltype_id'],
                         'supporter'         => 1
                     ]),
-                        _('Add supporter rights'), 'btn-xs')
+                        __('Add supporter rights'), 'btn-xs')
                         : '',
                     button(
                         page_link_to('user_angeltypes', [
                             'action'            => 'delete',
                             'user_angeltype_id' => $member['user_angeltype_id']
                         ]),
-                        _('remove'),
+                        __('remove'),
                         'btn-xs'
                     )
                 ]);
@@ -293,21 +293,21 @@ function AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes)
 {
     if ($angeltype['requires_driver_license'] && ($supporter || $admin_angeltypes)) {
         return [
-            'Nick'                         => _('Nick'),
-            'DECT'                         => _('DECT'),
-            'wants_to_drive'               => _('Driver'),
-            'has_car'                      => _('Has car'),
-            'has_license_car'              => _('Car'),
-            'has_license_3_5t_transporter' => _('3,5t Transporter'),
-            'has_license_7_5t_truck'       => _('7,5t Truck'),
-            'has_license_12_5t_truck'      => _('12,5t Truck'),
-            'has_license_forklift'         => _('Forklift'),
+            'Nick'                         => __('Nick'),
+            'DECT'                         => __('DECT'),
+            'wants_to_drive'               => __('Driver'),
+            'has_car'                      => __('Has car'),
+            'has_license_car'              => __('Car'),
+            'has_license_3_5t_transporter' => __('3,5t Transporter'),
+            'has_license_7_5t_truck'       => __('7,5t Truck'),
+            'has_license_12_5t_truck'      => __('12,5t Truck'),
+            'has_license_forklift'         => __('Forklift'),
             'actions'                      => ''
         ];
     }
     return [
-        'Nick'    => _('Nick'),
-        'DECT'    => _('DECT'),
+        'Nick'    => __('Nick'),
+        'DECT'    => __('DECT'),
         'actions' => ''
     ];
 }
@@ -341,18 +341,18 @@ function AngelType_view(
     ShiftCalendarRenderer $shiftCalendarRenderer,
     $tab
 ) {
-    return page_with_title(sprintf(_('Team %s'), $angeltype['name']), [
+    return page_with_title(sprintf(__('Team %s'), $angeltype['name']), [
         AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user),
         msg(),
         tabs([
-            _('Info')   => AngelType_view_info(
+            __('Info')   => AngelType_view_info(
                 $angeltype,
                 $members,
                 $admin_user_angeltypes,
                 $admin_angeltypes,
                 $supporter
             ),
-            _('Shifts') => AngelType_view_shifts(
+            __('Shifts') => AngelType_view_shifts(
                 $angeltype,
                 $shiftsFilterRenderer,
                 $shiftCalendarRenderer
@@ -398,7 +398,7 @@ function AngelType_view_info(
         $info[] = AngelTypes_render_contact_info($angeltype);
     }
 
-    $info[] = '<h3>' . _('Description') . '</h3>';
+    $info[] = '<h3>' . __('Description') . '</h3>';
     $parsedown = new Parsedown();
     if ($angeltype['description'] != '') {
         $info[] = '<div class="well">' . $parsedown->parse($angeltype['description']) . '</div>';
@@ -413,13 +413,13 @@ function AngelType_view_info(
     $table_headers = AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes);
 
     if (count($supporters) > 0) {
-        $info[] = '<h3>' . _('Supporters') . '</h3>';
+        $info[] = '<h3>' . __('Supporters') . '</h3>';
         $info[] = table($table_headers, $supporters);
     }
 
     if (count($members_confirmed) > 0) {
         $members_confirmed[] = [
-            'Nick'    => _('Sum'),
+            'Nick'    => __('Sum'),
             'DECT'    => count($members_confirmed),
             'actions' => ''
         ];
@@ -427,13 +427,13 @@ function AngelType_view_info(
 
     if (count($members_unconfirmed) > 0) {
         $members_unconfirmed[] = [
-            'Nick'    => _('Sum'),
+            'Nick'    => __('Sum'),
             'DECT'    => count($members_unconfirmed),
             'actions' => ''
         ];
     }
 
-    $info[] = '<h3>' . _('Members') . '</h3>';
+    $info[] = '<h3>' . __('Members') . '</h3>';
     if ($admin_user_angeltypes) {
         $info[] = buttons([
             button(
@@ -441,7 +441,7 @@ function AngelType_view_info(
                     'user_angeltypes',
                     ['action' => 'add', 'angeltype_id' => $angeltype['id']]
                 ),
-                _('Add'),
+                __('Add'),
                 'add'
             )
         ]);
@@ -449,15 +449,15 @@ function AngelType_view_info(
     $info[] = table($table_headers, $members_confirmed);
 
     if ($admin_user_angeltypes && $angeltype['restricted'] && count($members_unconfirmed) > 0) {
-        $info[] = '<h3>' . _('Unconfirmed') . '</h3>';
+        $info[] = '<h3>' . __('Unconfirmed') . '</h3>';
         $info[] = buttons([
             button(
                 page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype['id']]),
-                glyph('ok') . _('confirm all')
+                glyph('ok') . __('confirm all')
             ),
             button(
                 page_link_to('user_angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype['id']]),
-                glyph('remove') . _('deny all')
+                glyph('remove') . __('deny all')
             )
         ]);
         $info[] = table($table_headers, $members_unconfirmed);
@@ -474,10 +474,10 @@ function AngelType_view_info(
  */
 function AngelTypes_render_contact_info($angeltype)
 {
-    return heading(_('Contact'), 3) . description([
-            _('Name')   => $angeltype['contact_name'],
-            _('DECT')   => $angeltype['contact_dect'],
-            _('E-Mail') => $angeltype['contact_email']
+    return heading(__('Contact'), 3) . description([
+            __('Name')   => $angeltype['contact_name'],
+            __('DECT')   => $angeltype['contact_dect'],
+            __('E-Mail') => $angeltype['contact_email']
         ]);
 }
 
@@ -494,15 +494,15 @@ function AngelTypes_list_view($angeltypes, $admin_angeltypes)
         msg(),
         buttons([
             $admin_angeltypes
-                ? button(page_link_to('angeltypes', ['action' => 'edit']), _('New angeltype'), 'add')
+                ? button(page_link_to('angeltypes', ['action' => 'edit']), __('New angeltype'), 'add')
                 : '',
-            button(page_link_to('angeltypes', ['action' => 'about']), _('Teams/Job description'))
+            button(page_link_to('angeltypes', ['action' => 'about']), __('Teams/Job description'))
         ]),
         table([
-            'name'           => _('Name'),
-            'restricted'     => glyph('lock') . _('Restricted'),
-            'no_self_signup' => glyph('share') . _('Self Sign Up Allowed'),
-            'membership'     => _('Membership'),
+            'name'           => __('Name'),
+            'restricted'     => glyph('lock') . __('Restricted'),
+            'no_self_signup' => glyph('share') . __('Self Sign Up Allowed'),
+            'membership'     => __('Membership'),
             'actions'        => ''
         ], $angeltypes)
     ]);
@@ -532,12 +532,12 @@ function AngelTypes_about_view_angeltype($angeltype)
                     'user_angeltypes',
                     ['action' => 'delete', 'user_angeltype_id' => $angeltype['user_angeltype_id']]
                 ),
-                _('leave')
+                __('leave')
             );
         } else {
             $buttons[] = button(
                 page_link_to('user_angeltypes', ['action' => 'add', 'angeltype_id' => $angeltype['id']]),
-                _('join'),
+                __('join'),
                 'add'
             );
         }
@@ -546,7 +546,7 @@ function AngelTypes_about_view_angeltype($angeltype)
 
     if ($angeltype['restricted']) {
         $html .= info(
-            _('This angeltype is restricted by double-opt-in by a team supporter. Please show up at the according introduction meetings.'),
+            __('This angeltype is restricted by double-opt-in by a team supporter. Please show up at the according introduction meetings.'),
             true
         );
     }
@@ -583,17 +583,17 @@ function AngelTypes_about_view($angeltypes, $user_logged_in)
 
     $faqUrl = config('faq_url');
     if (!empty($faqUrl)) {
-        $buttons[] = button($faqUrl, _('FAQ'), 'btn-primary');
+        $buttons[] = button($faqUrl, __('FAQ'), 'btn-primary');
     }
 
     $content = [
         buttons($buttons),
-        '<p>' . _('Here is the list of teams and their tasks. If you have questions, read the FAQ.') . '</p>',
+        '<p>' . __('Here is the list of teams and their tasks. If you have questions, read the FAQ.') . '</p>',
         '<hr />'
     ];
     foreach ($angeltypes as $angeltype) {
         $content[] = AngelTypes_about_view_angeltype($angeltype);
     }
 
-    return page_with_title(_('Teams/Job description'), $content);
+    return page_with_title(__('Teams/Job description'), $content);
 }
diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php
index fe6de670..2525182a 100644
--- a/includes/view/EventConfig_view.php
+++ b/includes/view/EventConfig_view.php
@@ -10,7 +10,7 @@ function EventConfig_countdown_page($event_config)
 {
     if (empty($event_config)) {
         return div('col-md-12 text-center', [
-            heading(sprintf(_('Welcome to the %s!'), '<span class="icon-icon_angel"></span> ENGELSYSTEM'), 2)
+            heading(sprintf(__('Welcome to the %s!'), '<span class="icon-icon_angel"></span> ENGELSYSTEM'), 2)
         ]);
     }
 
@@ -19,7 +19,7 @@ function EventConfig_countdown_page($event_config)
     if (!is_null($event_config['event_name'])) {
         $elements[] = div('col-sm-12 text-center', [
             heading(sprintf(
-                _('Welcome to the %s!'),
+                __('Welcome to the %s!'),
                 $event_config['event_name'] . ' <span class="icon-icon_angel"></span> ENGELSYSTEM'
             ), 2)
         ]);
@@ -27,33 +27,33 @@ function EventConfig_countdown_page($event_config)
 
     if (!is_null($event_config['buildup_start_date']) && time() < $event_config['buildup_start_date']) {
         $elements[] = div('col-sm-3 text-center hidden-xs', [
-            heading(_('Buildup starts'), 4),
+            heading(__('Buildup starts'), 4),
             '<span class="moment-countdown text-big" data-timestamp="' . $event_config['buildup_start_date'] . '">%c</span>',
-            '<small>' . date(_('Y-m-d'), $event_config['buildup_start_date']) . '</small>'
+            '<small>' . date(__('Y-m-d'), $event_config['buildup_start_date']) . '</small>'
         ]);
     }
 
     if (!is_null($event_config['event_start_date']) && time() < $event_config['event_start_date']) {
         $elements[] = div('col-sm-3 text-center hidden-xs', [
-            heading(_('Event starts'), 4),
+            heading(__('Event starts'), 4),
             '<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_start_date'] . '">%c</span>',
-            '<small>' . date(_('Y-m-d'), $event_config['event_start_date']) . '</small>'
+            '<small>' . date(__('Y-m-d'), $event_config['event_start_date']) . '</small>'
         ]);
     }
 
     if (!is_null($event_config['event_end_date']) && time() < $event_config['event_end_date']) {
         $elements[] = div('col-sm-3 text-center hidden-xs', [
-            heading(_('Event ends'), 4),
+            heading(__('Event ends'), 4),
             '<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_end_date'] . '">%c</span>',
-            '<small>' . date(_('Y-m-d'), $event_config['event_end_date']) . '</small>'
+            '<small>' . date(__('Y-m-d'), $event_config['event_end_date']) . '</small>'
         ]);
     }
 
     if (!is_null($event_config['teardown_end_date']) && time() < $event_config['teardown_end_date']) {
         $elements[] = div('col-sm-3 text-center hidden-xs', [
-            heading(_('Teardown ends'), 4),
+            heading(__('Teardown ends'), 4),
             '<span class="moment-countdown text-big" data-timestamp="' . $event_config['teardown_end_date'] . '">%c</span>',
-            '<small>' . date(_('Y-m-d'), $event_config['teardown_end_date']) . '</small>'
+            '<small>' . date(__('Y-m-d'), $event_config['teardown_end_date']) . '</small>'
         ]);
     }
 
@@ -79,27 +79,27 @@ function EventConfig_info($event_config)
         && !is_null($event_config['event_end_date'])
     ) {
         return sprintf(
-            _('%s, from %s to %s'),
+            __('%s, from %s to %s'),
             $event_config['event_name'],
-            date(_('Y-m-d'), $event_config['event_start_date']),
-            date(_('Y-m-d'), $event_config['event_end_date'])
+            date(__('Y-m-d'), $event_config['event_start_date']),
+            date(__('Y-m-d'), $event_config['event_end_date'])
         );
     }
 
     // Event name, start date are set
     if (!is_null($event_config['event_name']) && !is_null($event_config['event_start_date'])) {
         return sprintf(
-            _('%s, starting %s'), $event_config['event_name'],
-            date(_('Y-m-d'), $event_config['event_start_date'])
+            __('%s, starting %s'), $event_config['event_name'],
+            date(__('Y-m-d'), $event_config['event_start_date'])
         );
     }
 
     // Event start+end date are set
     if (!is_null($event_config['event_start_date']) && !is_null($event_config['event_end_date'])) {
         return sprintf(
-            _('Event from %s to %s'),
-            date(_('Y-m-d'), $event_config['event_start_date']),
-            date(_('Y-m-d'), $event_config['event_end_date'])
+            __('Event from %s to %s'),
+            date(__('Y-m-d'), $event_config['event_start_date']),
+            date(__('Y-m-d'), $event_config['event_end_date'])
         );
     }
 
@@ -135,26 +135,26 @@ function EventConfig_edit_view(
         form([
             div('row', [
                 div('col-md-6', [
-                    form_text('event_name', _('Event Name'), $event_name),
-                    form_info('', _('Event Name is shown on the start page.')),
-                    form_textarea('event_welcome_msg', _('Event Welcome Message'), $event_welcome_msg),
+                    form_text('event_name', __('Event Name'), $event_name),
+                    form_info('', __('Event Name is shown on the start page.')),
+                    form_textarea('event_welcome_msg', __('Event Welcome Message'), $event_welcome_msg),
                     form_info(
                         '',
-                        _('Welcome message is shown after successful registration. You can use markdown.')
+                        __('Welcome message is shown after successful registration. You can use markdown.')
                     )
                 ]),
                 div('col-md-3 col-xs-6', [
-                    form_date('buildup_start_date', _('Buildup date'), $buildup_start_date),
-                    form_date('event_start_date', _('Event start date'), $event_start_date)
+                    form_date('buildup_start_date', __('Buildup date'), $buildup_start_date),
+                    form_date('event_start_date', __('Event start date'), $event_start_date)
                 ]),
                 div('col-md-3 col-xs-6', [
-                    form_date('teardown_end_date', _('Teardown end date'), $teardown_end_date),
-                    form_date('event_end_date', _('Event end date'), $event_end_date)
+                    form_date('teardown_end_date', __('Teardown end date'), $teardown_end_date),
+                    form_date('event_end_date', __('Event end date'), $event_end_date)
                 ])
             ]),
             div('row', [
                 div('col-md-6', [
-                    form_submit('submit', _('Save'))
+                    form_submit('submit', __('Save'))
                 ])
             ])
         ])
diff --git a/includes/view/PublicDashboard_view.php b/includes/view/PublicDashboard_view.php
index 6fef8f54..2bfca3fa 100644
--- a/includes/view/PublicDashboard_view.php
+++ b/includes/view/PublicDashboard_view.php
@@ -23,7 +23,7 @@ function public_dashboard_view($stats, $free_shifts)
         $shift_panels[] = '</div>';
         $needed_angels = div('first', [
             div('col-md-12', [
-                heading(_('Needed angels:'), 1)
+                heading(__('Needed angels:'), 1)
             ]),
             div('container-fluid', [
                 join($shift_panels)
@@ -34,10 +34,10 @@ function public_dashboard_view($stats, $free_shifts)
     return page([
         div('public-dashboard', [
             div('first', [
-                stats(_('Angels needed in the next 3 hrs'), $stats['needed-3-hours']),
-                stats(_('Angels needed for nightshifts'), $stats['needed-night']),
-                stats(_('Angels currently working'), $stats['angels-working'], 'default'),
-                stats(_('Hours to be worked'), $stats['hours-to-work'], 'default'),
+                stats(__('Angels needed in the next 3 hrs'), $stats['needed-3-hours']),
+                stats(__('Angels needed for nightshifts'), $stats['needed-night']),
+                stats(__('Angels currently working'), $stats['angels-working'], 'default'),
+                stats(__('Hours to be worked'), $stats['hours-to-work'], 'default'),
                 '<script>
                 $(function() {
                     setInterval(function() {
@@ -52,8 +52,8 @@ function public_dashboard_view($stats, $free_shifts)
             buttons([
                 button_js('
                         $(\'#navbar-collapse-1,#footer,#fullscreen-button\').remove();
-                        $(\'.navbar-brand\').append(\' ' . _('Public Dashboard') . '\');
-                        ', glyph('fullscreen') . _('Fullscreen'))
+                        $(\'.navbar-brand\').append(\' ' . __('Public Dashboard') . '\');
+                        ', glyph('fullscreen') . __('Fullscreen'))
             ])
         ], 'fullscreen-button')
     ]);
diff --git a/includes/view/Questions_view.php b/includes/view/Questions_view.php
index a44a099d..4008b7cd 100644
--- a/includes/view/Questions_view.php
+++ b/includes/view/Questions_view.php
@@ -12,7 +12,7 @@ function Questions_view($open_questions, $answered_questions, $ask_action)
         $question['actions'] = '<a href="'
             . page_link_to('user_questions', ['action' => 'delete', 'id' => $question['QID']])
             . '">'
-            . _('delete')
+            . __('delete')
             . '</a>';
         $question['Question'] = str_replace("\n", '<br />', $question['Question']);
     }
@@ -23,28 +23,28 @@ function Questions_view($open_questions, $answered_questions, $ask_action)
         $question['actions'] = '<a href="'
             . page_link_to('user_questions', ['action' => 'delete', 'id' => $question['QID']])
             . '">'
-            . _('delete')
+            . __('delete')
             . '</a>';
     }
 
     return page_with_title(questions_title(), [
         msg(),
-        heading(_('Open questions'), 2),
+        heading(__('Open questions'), 2),
         table([
-            'Question' => _('Question'),
+            'Question' => __('Question'),
             'actions'  => ''
         ], $open_questions),
-        heading(_('Answered questions'), 2),
+        heading(__('Answered questions'), 2),
         table([
-            'Question'    => _('Question'),
-            'answer_user' => _('Answered by'),
-            'Answer'      => _('Answer'),
+            'Question'    => __('Question'),
+            'answer_user' => __('Answered by'),
+            'Answer'      => __('Answer'),
             'actions'     => ''
         ], $answered_questions),
-        heading(_('Ask the Heaven'), 2),
+        heading(__('Ask the Heaven'), 2),
         form([
-            form_textarea('question', _('Your Question:'), ''),
-            form_submit('submit', _('Save'))
+            form_textarea('question', __('Your Question:'), ''),
+            form_submit('submit', __('Save'))
         ], $ask_action)
     ]);
 }
diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php
index 4c38208e..d883e4b2 100644
--- a/includes/view/Rooms_view.php
+++ b/includes/view/Rooms_view.php
@@ -21,14 +21,14 @@ function Room_view($room, ShiftsFilterRenderer $shiftsFilterRenderer, ShiftCalen
 
     $description = '';
     if (!empty($room['description'])) {
-        $description = '<h3>' . _('Description') . '</h3>';
+        $description = '<h3>' . __('Description') . '</h3>';
         $parsedown = new Parsedown();
         $description .= '<div class="well">' . $parsedown->parse($room['description']) . '</div>';
     }
 
     $tabs = [];
     if (!empty($room['map_url'])) {
-        $tabs[_('Map')] = sprintf(
+        $tabs[__('Map')] = sprintf(
             '<div class="map">'
             . '<iframe style="width: 100%%; min-height: 400px; border: 0 none;" src="%s"></iframe>'
             . '</div>',
@@ -36,7 +36,7 @@ function Room_view($room, ShiftsFilterRenderer $shiftsFilterRenderer, ShiftCalen
         );
     }
 
-    $tabs[_('Shifts')] = div('first', [
+    $tabs[__('Shifts')] = div('first', [
         $shiftsFilterRenderer->render(page_link_to('rooms', [
             'action'  => 'view',
             'room_id' => $room['RID']
diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php
index 731d063a..fc099d7d 100644
--- a/includes/view/ShiftCalendarRenderer.php
+++ b/includes/view/ShiftCalendarRenderer.php
@@ -143,7 +143,7 @@ class ShiftCalendarRenderer
     public function render()
     {
         if (count($this->lanes) == 0) {
-            return info(_('No shifts found.'), true);
+            return info(__('No shifts found.'), true);
         }
         return div('shift-calendar', [
                 $this->renderTimeLane(),
@@ -245,7 +245,7 @@ class ShiftCalendarRenderer
     {
         $time_slot = [
             div('header', [
-                _('Time')
+                __('Time')
             ])
         ];
         for ($block = 0; $block < $this->getBlocksPerSlot(); $block++) {
@@ -311,11 +311,11 @@ class ShiftCalendarRenderer
     private function renderLegend()
     {
         return div('legend', [
-            label(_('Your shift'), 'primary'),
-            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(__('Your shift'), 'primary'),
+            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')
         ]);
     }
 }
diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php
index 9643f195..9e40b1c6 100644
--- a/includes/view/ShiftCalendarShiftRenderer.php
+++ b/includes/view/ShiftCalendarShiftRenderer.php
@@ -131,7 +131,7 @@ class ShiftCalendarShiftRenderer
         if (in_array('user_shifts_admin', $privileges)) {
             $html .= '<li class="list-group-item">';
             $html .= button(shift_entry_create_link_admin($shift),
-                glyph('plus') . _('Add more angels'),
+                glyph('plus') . __('Add more angels'),
                 'btn-xs'
             );
             $html .= '</li>';
@@ -191,18 +191,18 @@ class ShiftCalendarShiftRenderer
                     . '</a> '
                     . button(
                         shift_entry_create_link($shift, $angeltype),
-                        _('Sign up'), 'btn-xs btn-primary'
+                        __('Sign up'), 'btn-xs btn-primary'
                     );
                 break;
 
             case ShiftSignupState::SHIFT_ENDED:
                 // No link and add a text hint, when the shift ended
-                $entry_list[] = $inner_text . ' (' . _('ended') . ')';
+                $entry_list[] = $inner_text . ' (' . __('ended') . ')';
                 break;
 
             case ShiftSignupState::NOT_ARRIVED:
                 // No link and add a text hint, when the shift ended
-                $entry_list[] = $inner_text . ' (' . _('please arrive for signup') . ')';
+                $entry_list[] = $inner_text . ' (' . __('please arrive for signup') . ')';
                 break;
 
             case ShiftSignupState::ANGELTYPE:
@@ -217,7 +217,7 @@ class ShiftCalendarShiftRenderer
                                 'user_angeltypes',
                                 ['action' => 'add', 'angeltype_id' => $angeltype['id']]
                             ),
-                            sprintf(_('Become %s'), $angeltype['name']),
+                            sprintf(__('Become %s'), $angeltype['name']),
                             'btn-xs'
                         );
                 }
diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php
index 1b646557..7884e404 100644
--- a/includes/view/ShiftEntry_view.php
+++ b/includes/view/ShiftEntry_view.php
@@ -14,7 +14,7 @@ function ShiftEntry_delete_view_admin($shiftEntry, $shift, $angeltype, $signoff_
 {
     return page_with_title(ShiftEntry_delete_title(), [
         info(sprintf(
-            _('Do you want to sign off %s from shift %s from %s to %s as %s?'),
+            __('Do you want to sign off %s from shift %s from %s to %s as %s?'),
             User_Nick_render($signoff_user),
             $shift['name'],
             date('Y-m-d H:i', $shift['start']),
@@ -22,10 +22,10 @@ function ShiftEntry_delete_view_admin($shiftEntry, $shift, $angeltype, $signoff_
             $angeltype['name']
         ), true),
         buttons([
-            button(user_link($signoff_user), glyph('remove') . _('cancel')),
+            button(user_link($signoff_user), glyph('remove') . __('cancel')),
             button(shift_entry_delete_link($shiftEntry, [
                 'continue' => 1
-            ]), glyph('ok') . _('delete'), 'btn-danger')
+            ]), glyph('ok') . __('delete'), 'btn-danger')
         ])
     ]);
 }
@@ -44,17 +44,17 @@ function ShiftEntry_delete_view($shiftEntry, $shift, $angeltype, $signoff_user)
 {
     return page_with_title(ShiftEntry_delete_title(), [
         info(sprintf(
-            _('Do you want to sign off from your shift %s from %s to %s as %s?'),
+            __('Do you want to sign off from your shift %s from %s to %s as %s?'),
             $shift['name'],
             date('Y-m-d H:i', $shift['start']),
             date('Y-m-d H:i', $shift['end']),
             $angeltype['name']
         ), true),
         buttons([
-            button(user_link($signoff_user), glyph('remove') . _('cancel')),
+            button(user_link($signoff_user), glyph('remove') . __('cancel')),
             button(shift_entry_delete_link($shiftEntry, [
                 'continue' => 1
-            ]), glyph('ok') . _('delete'), 'btn-danger')
+            ]), glyph('ok') . __('delete'), 'btn-danger')
         ])
     ]);
 }
@@ -64,7 +64,7 @@ function ShiftEntry_delete_view($shiftEntry, $shift, $angeltype, $signoff_user)
  */
 function ShiftEntry_delete_title()
 {
-    return _('Shift sign off');
+    return __('Shift sign off');
 }
 
 /**
@@ -85,11 +85,11 @@ function ShiftEntry_create_view_admin($shift, $room, $angeltype, $angeltypes_sel
         . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>',
         [
             Shift_view_header($shift, $room),
-            info(_('Do you want to sign up the following user for this shift?'), true),
+            info(__('Do you want to sign up the following user for this shift?'), true),
             form([
-                form_select('angeltype_id', _('Angeltype'), $angeltypes_select, $angeltype['id']),
-                form_select('user_id', _('User'), $users_select, $signup_user['UID']),
-                form_submit('submit', glyph('ok') . _('Save'))
+                form_select('angeltype_id', __('Angeltype'), $angeltypes_select, $angeltype['id']),
+                form_select('user_id', __('User'), $users_select, $signup_user['UID']),
+                form_submit('submit', glyph('ok') . __('Save'))
             ])
         ]);
 }
@@ -110,11 +110,11 @@ function ShiftEntry_create_view_supporter($shift, $room, $angeltype, $signup_use
         . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>',
         [
             Shift_view_header($shift, $room),
-            info(sprintf(_('Do you want to sign up the following user for this shift as %s?'),
+            info(sprintf(__('Do you want to sign up the following user for this shift as %s?'),
                 AngelType_name_render($angeltype)), true),
             form([
-                form_select('user_id', _('User'), $users_select, $signup_user['UID']),
-                form_submit('submit', glyph('ok') . _('Save'))
+                form_select('user_id', __('User'), $users_select, $signup_user['UID']),
+                form_submit('submit', glyph('ok') . __('Save'))
             ])
         ]);
 }
@@ -134,10 +134,10 @@ function ShiftEntry_create_view_user($shift, $room, $angeltype, $comment)
         . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>',
         [
             Shift_view_header($shift, $room),
-            info(sprintf(_('Do you want to sign up for this shift as %s?'), AngelType_name_render($angeltype)), true),
+            info(sprintf(__('Do you want to sign up for this shift as %s?'), AngelType_name_render($angeltype)), true),
             form([
-                form_textarea('comment', _('Comment (for your eyes only):'), $comment),
-                form_submit('submit', glyph('ok') . _('Save'))
+                form_textarea('comment', __('Comment (for your eyes only):'), $comment),
+                form_submit('submit', glyph('ok') . __('Save'))
             ])
         ]);
 }
@@ -147,7 +147,7 @@ function ShiftEntry_create_view_user($shift, $room, $angeltype, $comment)
  */
 function ShiftEntry_create_title()
 {
-    return _('Shift signup');
+    return __('Shift signup');
 }
 
 /**
@@ -178,25 +178,25 @@ function ShiftEntry_edit_view(
     $freeload_form = [];
     if ($user_admin_shifts) {
         $freeload_form = [
-            form_checkbox('freeloaded', _('Freeloaded'), $freeloaded),
+            form_checkbox('freeloaded', __('Freeloaded'), $freeloaded),
             form_textarea(
                 'freeload_comment',
-                _('Freeload comment (Only for shift coordination):'),
+                __('Freeload comment (Only for shift coordination):'),
                 $freeload_comment
             )
         ];
     }
-    return page_with_title(_('Edit shift entry'), [
+    return page_with_title(__('Edit shift entry'), [
         msg(),
         form([
-            form_info(_('Angel:'), $angel),
-            form_info(_('Date, Duration:'), $date),
-            form_info(_('Location:'), $location),
-            form_info(_('Title:'), $title),
-            form_info(_('Type:'), $type),
-            form_textarea('comment', _('Comment (for your eyes only):'), $comment),
+            form_info(__('Angel:'), $angel),
+            form_info(__('Date, Duration:'), $date),
+            form_info(__('Location:'), $location),
+            form_info(__('Title:'), $title),
+            form_info(__('Type:'), $type),
+            form_textarea('comment', __('Comment (for your eyes only):'), $comment),
             join('', $freeload_form),
-            form_submit('submit', _('Save'))
+            form_submit('submit', __('Save'))
         ])
     ]);
 }
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 7dee4521..7053f164 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -19,16 +19,16 @@ function ShiftType_name_render($shifttype)
  */
 function ShiftType_delete_view($shifttype)
 {
-    return page_with_title(sprintf(_('Delete shifttype %s'), $shifttype['name']), [
-        info(sprintf(_('Do you want to delete shifttype %s?'), $shifttype['name']), true),
+    return page_with_title(sprintf(__('Delete shifttype %s'), $shifttype['name']), [
+        info(sprintf(__('Do you want to delete shifttype %s?'), $shifttype['name']), true),
         buttons([
-            button(page_link_to('shifttypes'), glyph('remove') . _('cancel')),
+            button(page_link_to('shifttypes'), glyph('remove') . __('cancel')),
             button(
                 page_link_to(
                     'shifttypes',
                     ['action' => 'delete', 'shifttype_id' => $shifttype['id'], 'confirmed' => 1]
                 ),
-                glyph('ok') . _('delete'),
+                glyph('ok') . __('delete'),
                 'btn-danger'
             )
         ])
@@ -46,23 +46,23 @@ function ShiftType_delete_view($shifttype)
 function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id)
 {
     $angeltypes_select = [
-        '' => _('All')
+        '' => __('All')
     ];
     foreach ($angeltypes as $angeltype) {
         $angeltypes_select[$angeltype['id']] = $angeltype['name'];
     }
 
-    return page_with_title($shifttype_id ? _('Edit shifttype') : _('Create shifttype'), [
+    return page_with_title($shifttype_id ? __('Edit shifttype') : __('Create shifttype'), [
         msg(),
         buttons([
             button(page_link_to('shifttypes'), shifttypes_title(), 'back')
         ]),
         form([
-            form_text('name', _('Name'), $name),
-            form_select('angeltype_id', _('Angeltype'), $angeltypes_select, $angeltype_id),
-            form_textarea('description', _('Description'), $description),
-            form_info('', _('Please use markdown for the description.')),
-            form_submit('submit', _('Save'))
+            form_text('name', __('Name'), $name),
+            form_select('angeltype_id', __('Angeltype'), $angeltypes_select, $angeltype_id),
+            form_textarea('description', __('Description'), $description),
+            form_info('', __('Please use markdown for the description.')),
+            form_submit('submit', __('Save'))
         ])
     ]);
 }
@@ -77,7 +77,7 @@ function ShiftType_view($shifttype, $angeltype)
     $parsedown = new Parsedown();
     $title = $shifttype['name'];
     if ($angeltype) {
-        $title .= ' <small>' . sprintf(_('for team %s'), $angeltype['name']) . '</small>';
+        $title .= ' <small>' . sprintf(__('for team %s'), $angeltype['name']) . '</small>';
     }
     return page_with_title($title, [
         msg(),
@@ -89,16 +89,16 @@ function ShiftType_view($shifttype, $angeltype)
             ) : '',
             button(
                 page_link_to('shifttypes', ['action' => 'edit', 'shifttype_id' => $shifttype['id']]),
-                _('edit'),
+                __('edit'),
                 'edit'
             ),
             button(
                 page_link_to('shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype['id']]),
-                _('delete'),
+                __('delete'),
                 'delete'
             )
         ]),
-        heading(_('Description'), 2),
+        heading(__('Description'), 2),
         $parsedown->parse($shifttype['description'])
     ]);
 }
@@ -121,12 +121,12 @@ function ShiftTypes_list_view($shifttypes)
                     'shifttypes',
                     ['action' => 'edit', 'shifttype_id' => $shifttype['id']]
                 ),
-                _('edit'),
+                __('edit'),
                 'btn-xs'
             ),
             button(
                 page_link_to('shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype['id']]),
-                _('delete'),
+                __('delete'),
                 'btn-xs'
             )
         ]);
@@ -135,10 +135,10 @@ function ShiftTypes_list_view($shifttypes)
     return page_with_title(shifttypes_title(), [
         msg(),
         buttons([
-            button(page_link_to('shifttypes', ['action' => 'edit']), _('New shifttype'), 'add')
+            button(page_link_to('shifttypes', ['action' => 'edit']), __('New shifttype'), 'add')
         ]),
         table([
-            'name'    => _('Name'),
+            'name'    => __('Name'),
             'actions' => ''
         ], $shifttypes)
     ]);
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index c5680578..0aa89f2e 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -13,7 +13,7 @@ function Shift_view_header($shift, $room)
 {
     return div('row', [
         div('col-sm-3 col-xs-6', [
-            '<h4>' . _('Title') . '</h4>',
+            '<h4>' . __('Title') . '</h4>',
             '<p class="lead">'
             . ($shift['URL'] != ''
                 ? '<a href="' . $shift['URL'] . '">' . $shift['title'] . '</a>'
@@ -21,23 +21,23 @@ function Shift_view_header($shift, $room)
             . '</p>'
         ]),
         div('col-sm-3 col-xs-6', [
-            '<h4>' . _('Start') . '</h4>',
+            '<h4>' . __('Start') . '</h4>',
             '<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">',
-            glyph('calendar') . date(_('Y-m-d'), $shift['start']),
+            glyph('calendar') . date(__('Y-m-d'), $shift['start']),
             '<br />',
             glyph('time') . date('H:i', $shift['start']),
             '</p>'
         ]),
         div('col-sm-3 col-xs-6', [
-            '<h4>' . _('End') . '</h4>',
+            '<h4>' . __('End') . '</h4>',
             '<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">',
-            glyph('calendar') . date(_('Y-m-d'), $shift['end']),
+            glyph('calendar') . date(__('Y-m-d'), $shift['end']),
             '<br />',
             glyph('time') . date('H:i', $shift['end']),
             '</p>'
         ]),
         div('col-sm-3 col-xs-6', [
-            '<h4>' . _('Location') . '</h4>',
+            '<h4>' . __('Location') . '</h4>',
             '<p class="lead">' . Room_name_render($room) . '</p>'
         ])
     ]);
@@ -52,14 +52,14 @@ function Shift_editor_info_render($shift)
     $info = [];
     if (!empty($shift['created_by_user_id'])) {
         $info[] = sprintf(
-            glyph('plus') . _('created at %s by %s'),
+            glyph('plus') . __('created at %s by %s'),
             date('Y-m-d H:i', $shift['created_at_timestamp']),
             User_Nick_render(User($shift['created_by_user_id']))
         );
     }
     if (!empty($shift['edited_by_user_id'])) {
         $info[] = sprintf(
-            glyph('pencil') . _('edited at %s by %s'),
+            glyph('pencil') . __('edited at %s by %s'),
             date('Y-m-d H:i', $shift['edited_at_timestamp']),
             User_Nick_render(User($shift['edited_by_user_id']))
         );
@@ -82,11 +82,11 @@ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null)
     }
 
     if ($angeltype['shift_signup_state']->isSignupAllowed()) {
-        return button(shift_entry_create_link($shift, $angeltype), _('Sign up'));
+        return button(shift_entry_create_link($shift, $angeltype), __('Sign up'));
     } elseif (empty($user_angeltype)) {
         return button(
             page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]),
-            sprintf(_('Become %s'),
+            sprintf(__('Become %s'),
                 $angeltype['name'])
         );
     }
@@ -125,33 +125,33 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
     $content = [msg()];
 
     if ($shift_signup_state->getState() == ShiftSignupState::COLLIDES) {
-        $content[] = info(_('This shift collides with one of your shifts.'), true);
+        $content[] = info(__('This shift collides with one of your shifts.'), true);
     }
 
     if ($shift_signup_state->getState() == ShiftSignupState::SIGNED_UP) {
-        $content[] = info(_('You are signed up for this shift.'), true);
+        $content[] = info(__('You are signed up for this shift.'), true);
     }
 
     $buttons = [];
     if ($shift_admin || $admin_shifttypes || $admin_rooms) {
         $buttons = [
-            $shift_admin ? button(shift_edit_link($shift), glyph('pencil') . _('edit')) : '',
-            $shift_admin ? button(shift_delete_link($shift), glyph('trash') . _('delete')) : '',
+            $shift_admin ? button(shift_edit_link($shift), glyph('pencil') . __('edit')) : '',
+            $shift_admin ? button(shift_delete_link($shift), glyph('trash') . __('delete')) : '',
             $admin_shifttypes ? button(shifttype_link($shifttype), $shifttype['name']) : '',
             $admin_rooms ? button(room_link($room), glyph('map-marker') . $room['Name']) : '',
         ];
     }
-    $buttons[] = button(user_link($user), '<span class="icon-icon_angel"></span> ' . _('My shifts'));
+    $buttons[] = button(user_link($user), '<span class="icon-icon_angel"></span> ' . __('My shifts'));
     $content[] = buttons($buttons);
 
     $content[] = Shift_view_header($shift, $room);
     $content[] = div('row', [
         div('col-sm-6', [
-            '<h2>' . _('Needed angels') . '</h2>',
+            '<h2>' . __('Needed angels') . '</h2>',
             '<div class="list-group">' . $needed_angels . '</div>'
         ]),
         div('col-sm-6', [
-            '<h2>' . _('Description') . '</h2>',
+            '<h2>' . __('Description') . '</h2>',
             $parsedown->parse($shifttype['description'])
         ])
     ]);
diff --git a/includes/view/UserAngelTypes_view.php b/includes/view/UserAngelTypes_view.php
index 1f802de4..965a353a 100644
--- a/includes/view/UserAngelTypes_view.php
+++ b/includes/view/UserAngelTypes_view.php
@@ -9,19 +9,19 @@
  */
 function UserAngelType_update_view($user_angeltype, $user, $angeltype, $supporter)
 {
-    return page_with_title($supporter ? _('Add supporter rights') : _('Remove supporter rights'), [
+    return page_with_title($supporter ? __('Add supporter rights') : __('Remove supporter rights'), [
         msg(),
         info(sprintf(
             $supporter
-                ? _('Do you really want to add supporter rights for %s to %s?')
-                : _('Do you really want to remove supporter rights for %s from %s?'),
+                ? __('Do you really want to add supporter rights for %s to %s?')
+                : __('Do you really want to remove supporter rights for %s from %s?'),
             $angeltype['name'],
             User_Nick_render($user)
         ), true),
         buttons([
             button(
                 page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]),
-                glyph('remove') . _('cancel')
+                glyph('remove') . __('cancel')
             ),
             button(
                 page_link_to('user_angeltypes', [
@@ -30,7 +30,7 @@ function UserAngelType_update_view($user_angeltype, $user, $angeltype, $supporte
                     'supporter'         => ($supporter ? '1' : '0'),
                     'confirmed'         => 1,
                 ]),
-                glyph('ok') . _('yes'),
+                glyph('ok') . __('yes'),
                 'btn-primary'
             )
         ])
@@ -43,23 +43,23 @@ function UserAngelType_update_view($user_angeltype, $user, $angeltype, $supporte
  */
 function UserAngelTypes_delete_all_view($angeltype)
 {
-    return page_with_title(_('Deny all users'), [
+    return page_with_title(__('Deny all users'), [
         msg(),
-        info(sprintf(_('Do you really want to deny all users for %s?'), $angeltype['name']), true),
+        info(sprintf(__('Do you really want to deny all users for %s?'), $angeltype['name']), true),
         buttons([
             button(
                 page_link_to(
                     'angeltypes',
                     ['action' => 'view', 'angeltype_id' => $angeltype['id']]
                 ),
-                glyph('remove') . _('cancel')
+                glyph('remove') . __('cancel')
             ),
             button(
                 page_link_to(
                     'user_angeltypes',
                     ['action' => 'delete_all', 'angeltype_id' => $angeltype['id'], 'confirmed' => 1]
                 ),
-                glyph('ok') . _('yes'),
+                glyph('ok') . __('yes'),
                 'btn-primary'
             )
         ])
@@ -72,15 +72,15 @@ function UserAngelTypes_delete_all_view($angeltype)
  */
 function UserAngelTypes_confirm_all_view($angeltype)
 {
-    return page_with_title(_('Confirm all users'), [
+    return page_with_title(__('Confirm all users'), [
         msg(),
-        info(sprintf(_('Do you really want to confirm all users for %s?'), $angeltype['name']), true),
+        info(sprintf(__('Do you really want to confirm all users for %s?'), $angeltype['name']), true),
         buttons([
-            button(angeltype_link($angeltype['id']), glyph('remove') . _('cancel')),
+            button(angeltype_link($angeltype['id']), glyph('remove') . __('cancel')),
             button(
                 page_link_to('user_angeltypes',
                     ['action' => 'confirm_all', 'angeltype_id' => $angeltype['id'], 'confirmed' => 1]),
-                glyph('ok') . _('yes'),
+                glyph('ok') . __('yes'),
                 'btn-primary'
             )
         ])
@@ -95,21 +95,21 @@ function UserAngelTypes_confirm_all_view($angeltype)
  */
 function UserAngelType_confirm_view($user_angeltype, $user, $angeltype)
 {
-    return page_with_title(_('Confirm angeltype for user'), [
+    return page_with_title(__('Confirm angeltype for user'), [
         msg(),
         info(sprintf(
-            _('Do you really want to confirm %s for %s?'),
+            __('Do you really want to confirm %s for %s?'),
             User_Nick_render($user),
             $angeltype['name']
         ), true),
         buttons([
-            button(angeltype_link($angeltype['id']), glyph('remove') . _('cancel')),
+            button(angeltype_link($angeltype['id']), glyph('remove') . __('cancel')),
             button(
                 page_link_to(
                     'user_angeltypes',
                     ['action' => 'confirm', 'user_angeltype_id' => $user_angeltype['id'], 'confirmed' => 1]
                 ),
-                glyph('ok') . _('yes'),
+                glyph('ok') . __('yes'),
                 'btn-primary'
             )
         ])
@@ -124,19 +124,19 @@ function UserAngelType_confirm_view($user_angeltype, $user, $angeltype)
  */
 function UserAngelType_delete_view($user_angeltype, $user, $angeltype)
 {
-    return page_with_title(_('Remove angeltype'), [
+    return page_with_title(__('Remove angeltype'), [
         msg(),
         info(sprintf(
-            _('Do you really want to delete %s from %s?'),
+            __('Do you really want to delete %s from %s?'),
             User_Nick_render($user),
             $angeltype['name']
         ), true),
         buttons([
-            button(angeltype_link($angeltype['id']), glyph('remove') . _('cancel')),
+            button(angeltype_link($angeltype['id']), glyph('remove') . __('cancel')),
             button(
                 page_link_to('user_angeltypes',
                     ['action' => 'delete', 'user_angeltype_id' => $user_angeltype['id'], 'confirmed' => 1]),
-                glyph('ok') . _('yes'),
+                glyph('ok') . __('yes'),
                 'btn-primary'
             )
         ])
@@ -156,19 +156,19 @@ function UserAngelType_add_view($angeltype, $users_source, $user_id)
         $users[$user_source['UID']] = User_Nick_render($user_source);
     }
 
-    return page_with_title(_('Add user to angeltype'), [
+    return page_with_title(__('Add user to angeltype'), [
         msg(),
         buttons([
             button(
                 page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']]),
-                _('back'),
+                __('back'),
                 'back'
             )
         ]),
         form([
-            form_info(_('Angeltype'), $angeltype['name']),
-            form_select('user_id', _('User'), $users, $user_id),
-            form_submit('submit', _('Add'))
+            form_info(__('Angeltype'), $angeltype['name']),
+            form_select('user_id', __('User'), $users, $user_id),
+            form_submit('submit', __('Add'))
         ])
     ]);
 }
@@ -180,21 +180,21 @@ function UserAngelType_add_view($angeltype, $users_source, $user_id)
  */
 function UserAngelType_join_view($user, $angeltype)
 {
-    return page_with_title(sprintf(_('Become a %s'), $angeltype['name']), [
+    return page_with_title(sprintf(__('Become a %s'), $angeltype['name']), [
         msg(),
         info(sprintf(
-            _('Do you really want to add %s to %s?'),
+            __('Do you really want to add %s to %s?'),
             User_Nick_render($user),
             $angeltype['name']
         ), true),
         buttons([
-            button(angeltype_link($angeltype['id']), glyph('remove') . _('cancel')),
+            button(angeltype_link($angeltype['id']), glyph('remove') . __('cancel')),
             button(
                 page_link_to(
                     'user_angeltypes',
                     ['action' => 'add', 'angeltype_id' => $angeltype['id'], 'user_id' => $user['UID'], 'confirmed' => 1]
                 ),
-                glyph('ok') . _('save'),
+                glyph('ok') . __('save'),
                 'btn-primary'
             )
         ])
diff --git a/includes/view/UserDriverLicenses_view.php b/includes/view/UserDriverLicenses_view.php
index b92f5f07..0c46b567 100644
--- a/includes/view/UserDriverLicenses_view.php
+++ b/includes/view/UserDriverLicenses_view.php
@@ -10,46 +10,46 @@
  */
 function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver_license)
 {
-    return page_with_title(sprintf(_('Edit %s driving license information'), User_Nick_render($user_source)), [
+    return page_with_title(sprintf(__('Edit %s driving license information'), User_Nick_render($user_source)), [
         buttons([
-            button(user_link($user_source), _('Back to profile'), 'back')
+            button(user_link($user_source), __('Back to profile'), 'back')
         ]),
         msg(),
         form([
-            form_info(_('Privacy'), _('Your driving license information is only visible for supporters and admins.')),
-            form_checkbox('wants_to_drive', _('I am willing to drive a car for the event'), $wants_to_drive),
+            form_info(__('Privacy'), __('Your driving license information is only visible for supporters and admins.')),
+            form_checkbox('wants_to_drive', __('I am willing to drive a car for the event'), $wants_to_drive),
             div('panel panel-default', [
                 div('panel-body', [
                     form_checkbox(
                         'has_car',
-                        _('I have my own car with me and am willing to use it for the event (You\'ll get reimbursed for fuel)'),
+                        __('I have my own car with me and am willing to use it for the event (You\'ll get reimbursed for fuel)'),
                         $user_driver_license['has_car']
                     ),
-                    heading(_('Driver license'), 3),
-                    form_checkbox('has_license_car', _('Car'), $user_driver_license['has_license_car']),
+                    heading(__('Driver license'), 3),
+                    form_checkbox('has_license_car', __('Car'), $user_driver_license['has_license_car']),
                     form_checkbox(
                         'has_license_3_5t_transporter',
-                        _('Transporter 3,5t'),
+                        __('Transporter 3,5t'),
                         $user_driver_license['has_license_3_5t_transporter']
                     ),
                     form_checkbox(
                         'has_license_7_5t_truck',
-                        _('Truck 7,5t'),
+                        __('Truck 7,5t'),
                         $user_driver_license['has_license_7_5t_truck']
                     ),
                     form_checkbox(
                         'has_license_12_5t_truck',
-                        _('Truck 12,5t'),
+                        __('Truck 12,5t'),
                         $user_driver_license['has_license_12_5t_truck']
                     ),
                     form_checkbox(
                         'has_license_forklift',
-                        _('Forklift'),
+                        __('Forklift'),
                         $user_driver_license['has_license_forklift']
                     )
                 ])
             ], 'driving_license'),
-            form_submit('submit', _('Save'))
+            form_submit('submit', __('Save'))
         ]),
         '<script type="text/javascript">
         $(function() {
diff --git a/includes/view/UserWorkLog_view.php b/includes/view/UserWorkLog_view.php
index 772d4aee..e64f5412 100644
--- a/includes/view/UserWorkLog_view.php
+++ b/includes/view/UserWorkLog_view.php
@@ -11,14 +11,14 @@ function UserWorkLog_delete_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_delete_title(), [
         info(sprintf(
-            _('Do you want to delete the worklog entry for %s?'),
+            __('Do you want to delete the worklog entry for %s?'),
             User_Nick_render($user_source)
         ), true),
         buttons([
-            button(user_link($user_source), glyph('remove') . _('cancel')),
+            button(user_link($user_source), glyph('remove') . __('cancel')),
             button(user_worklog_delete_link($userWorkLog, [
                 'confirmed' => 1
-            ]), glyph('ok') . _('delete'), 'btn-danger')
+            ]), glyph('ok') . __('delete'), 'btn-danger')
         ])
     ]);
 }
@@ -28,7 +28,7 @@ function UserWorkLog_delete_view($user_source, $userWorkLog)
  */
 function UserWorkLog_delete_title()
 {
-    return _('Delete work log entry');
+    return __('Delete work log entry');
 }
 
 /**
@@ -41,11 +41,11 @@ function UserWorkLog_delete_title()
 function UserWorkLog_edit_form($user_source, $userWorkLog)
 {
     return form([
-        form_info(_('User'), User_Nick_render($user_source)),
-        form_date('work_timestamp', _('Work date'), $userWorkLog['work_timestamp'], null, time()),
-        form_text('work_hours', _('Work hours'), $userWorkLog['work_hours']),
-        form_text('comment', _('Comment'), $userWorkLog['comment']),
-        form_submit('submit', _('Save'))
+        form_info(__('User'), User_Nick_render($user_source)),
+        form_date('work_timestamp', __('Work date'), $userWorkLog['work_timestamp'], null, time()),
+        form_text('work_hours', __('Work hours'), $userWorkLog['work_hours']),
+        form_text('comment', __('Comment'), $userWorkLog['comment']),
+        form_submit('submit', __('Save'))
     ]);
 }
 
@@ -60,7 +60,7 @@ function UserWorkLog_edit_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_edit_title(), [
         buttons([
-            button(user_link($user_source), _('back'))
+            button(user_link($user_source), __('back'))
         ]),
         msg(),
         UserWorkLog_edit_form($user_source, $userWorkLog)
@@ -78,7 +78,7 @@ function UserWorkLog_add_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_add_title(), [
         buttons([
-            button(user_link($user_source), _('back'))
+            button(user_link($user_source), __('back'))
         ]),
         msg(),
         UserWorkLog_edit_form($user_source, $userWorkLog)
@@ -90,7 +90,7 @@ function UserWorkLog_add_view($user_source, $userWorkLog)
  */
 function UserWorkLog_edit_title()
 {
-    return _('Edit work log entry');
+    return __('Edit work log entry');
 }
 
 /**
@@ -98,5 +98,5 @@ function UserWorkLog_edit_title()
  */
 function UserWorkLog_add_title()
 {
-    return _('Add work log entry');
+    return __('Add work log entry');
 }
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index c4ae03f6..40e7bfe1 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -26,70 +26,70 @@ 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'],
-                        _('Please select...')
+                        __('Please select...')
                     ) : '',
-                    form_info('', _('Please visit the angeltypes page to manage your angeltypes.')),
-                    form_submit('submit', _('Save'))
+                    form_info('', __('Please visit the angeltypes page to manage your angeltypes.')),
+                    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'))
                 ])
             ])
         ])
@@ -107,29 +107,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') . ' &raquo;')
+                    button(page_link_to('angeltypes', ['action' => 'about']), __('Teams/Job description') . ' &raquo;')
                 ])
             ])
         ])
@@ -144,18 +144,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'))
         ])
     ]);
 }
@@ -168,19 +168,19 @@ 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.'),
+            __('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']])
         )
@@ -214,13 +214,13 @@ function Users_view(
         $user['Aktiv'] = glyph_bool($user['Aktiv']);
         $user['force_active'] = glyph_bool($user['force_active']);
         $user['Tshirt'] = glyph_bool($user['Tshirt']);
-        $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
+        $user['lastLogIn'] = date(__('m/d/Y h:i a'), $user['lastLogIn']);
         $user['actions'] = table_buttons([
             button_glyph(page_link_to('admin_user', ['id' => $user['UID']]), 'edit', 'btn-xs')
         ]);
     }
     $users[] = [
-        'Nick'         => '<strong>' . _('Sum') . '</strong>',
+        'Nick'         => '<strong>' . __('Sum') . '</strong>',
         'Gekommen'     => $arrived_count,
         'got_voucher'  => $voucher_count,
         'Aktiv'        => $active_count,
@@ -230,24 +230,24 @@ function Users_view(
         'actions'      => '<strong>' . count($users) . '</strong>'
     ];
 
-    return page_with_title(_('All users'), [
+    return page_with_title(__('All users'), [
         msg(),
         buttons([
-            button(page_link_to('register'), glyph('plus') . _('New user'))
+            button(page_link_to('register'), glyph('plus') . __('New user'))
         ]),
         table([
-            'Nick'         => Users_table_header_link('Nick', _('Nick'), $order_by),
-            'Vorname'      => Users_table_header_link('Vorname', _('Prename'), $order_by),
-            'Name'         => Users_table_header_link('Name', _('Name'), $order_by),
-            'DECT'         => Users_table_header_link('DECT', _('DECT'), $order_by),
-            'Gekommen'     => Users_table_header_link('Gekommen', _('Arrived'), $order_by),
-            'got_voucher'  => Users_table_header_link('got_voucher', _('Voucher'), $order_by),
-            'freeloads'    => _('Freeloads'),
-            'Aktiv'        => Users_table_header_link('Aktiv', _('Active'), $order_by),
-            'force_active' => Users_table_header_link('force_active', _('Forced'), $order_by),
-            'Tshirt'       => Users_table_header_link('Tshirt', _('T-Shirt'), $order_by),
-            'Size'         => Users_table_header_link('Size', _('Size'), $order_by),
-            'lastLogIn'    => Users_table_header_link('lastLogIn', _('Last login'), $order_by),
+            'Nick'         => Users_table_header_link('Nick', __('Nick'), $order_by),
+            'Vorname'      => Users_table_header_link('Vorname', __('Prename'), $order_by),
+            'Name'         => Users_table_header_link('Name', __('Name'), $order_by),
+            'DECT'         => Users_table_header_link('DECT', __('DECT'), $order_by),
+            'Gekommen'     => Users_table_header_link('Gekommen', __('Arrived'), $order_by),
+            'got_voucher'  => Users_table_header_link('got_voucher', __('Voucher'), $order_by),
+            'freeloads'    => __('Freeloads'),
+            'Aktiv'        => Users_table_header_link('Aktiv', __('Active'), $order_by),
+            'force_active' => Users_table_header_link('force_active', __('Forced'), $order_by),
+            'Tshirt'       => Users_table_header_link('Tshirt', __('T-Shirt'), $order_by),
+            'Size'         => Users_table_header_link('Size', __('Size'), $order_by),
+            'lastLogIn'    => Users_table_header_link('lastLogIn', __('Last login'), $order_by),
             'actions'      => ''
         ], $users)
     ]);
@@ -281,7 +281,7 @@ function User_shift_state_render($user)
     $upcoming_shifts = ShiftEntries_upcoming_for_user($user);
 
     if (empty($upcoming_shifts)) {
-        return '<span class="text-success">' . _('Free') . '</span>';
+        return '<span class="text-success">' . __('Free') . '</span>';
     }
 
     $nextShift = array_shift($upcoming_shifts);
@@ -289,23 +289,23 @@ function User_shift_state_render($user)
     if ($nextShift['start'] > time()) {
         if ($nextShift['start'] - time() > 3600) {
             return '<span class="text-success moment-countdown" data-timestamp="' . $nextShift['start'] . '">'
-                . _('Next shift %c')
+                . __('Next shift %c')
                 . '</span>';
         }
         return '<span class="text-warning moment-countdown" data-timestamp="' . $nextShift['start'] . '">'
-            . _('Next shift %c')
+            . __('Next shift %c')
             . '</span>';
     }
     $halfway = ($nextShift['start'] + $nextShift['end']) / 2;
 
     if (time() < $halfway) {
         return '<span class="text-danger moment-countdown" data-timestamp="' . $nextShift['start'] . '">'
-            . _('Shift started %c')
+            . __('Shift started %c')
             . '</span>';
     }
 
     return '<span class="text-danger moment-countdown" data-timestamp="' . $nextShift['end'] . '">'
-        . _('Shift ends %c')
+        . __('Shift ends %c')
         . '</span>';
 }
 
@@ -373,26 +373,26 @@ function User_view_myshift($shift, $user_source, $its_me)
             . '</p>';
         if (in_array('user_shifts_admin', $privileges)) {
             $myshift['comment'] .= '<br />'
-                . '<p class="text-danger">' . _('Freeloaded') . ': ' . $shift['freeload_comment'] . '</p>';
+                . '<p class="text-danger">' . __('Freeloaded') . ': ' . $shift['freeload_comment'] . '</p>';
         } else {
-            $myshift['comment'] .= '<br /><p class="text-danger">' . _('Freeloaded') . '</p>';
+            $myshift['comment'] .= '<br /><p class="text-danger">' . __('Freeloaded') . '</p>';
         }
     }
 
     $myshift['actions'] = [
-        button(shift_link($shift), glyph('eye-open') . _('view'), 'btn-xs')
+        button(shift_link($shift), glyph('eye-open') . __('view'), 'btn-xs')
     ];
     if ($its_me || in_array('user_shifts_admin', $privileges)) {
         $myshift['actions'][] = button(
             page_link_to('user_myshifts', ['edit' => $shift['id'], 'id' => $user_source['UID']]),
-            glyph('edit') . _('edit'),
+            glyph('edit') . __('edit'),
             'btn-xs'
         );
     }
     if (Shift_signout_allowed($shift, ['id' => $shift['TID']], $user_source)) {
         $myshift['actions'][] = button(
             shift_entry_delete_link($shift),
-            glyph('trash') . _('sign off'),
+            glyph('trash') . __('sign off'),
             'btn-xs'
         );
     }
@@ -442,7 +442,7 @@ function User_view_myshifts(
     if (count($myshifts_table) > 0) {
         ksort($myshifts_table);
         $myshifts_table[] = [
-            'date'       => '<b>' . _('Sum:') . '</b>',
+            'date'       => '<b>' . __('Sum:') . '</b>',
             'duration'   => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . '&nbsp;h</b>',
             'room'       => '',
             'shift_info' => '',
@@ -451,7 +451,7 @@ function User_view_myshifts(
         ];
         if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) {
             $myshifts_table[] = [
-                'date'       => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
+                'date'       => '<b>' . __('Your t-shirt score') . '&trade;:</b>',
                 'duration'   => '<b>' . $tshirt_score . '</b>',
                 'room'       => '',
                 'shift_info' => '',
@@ -477,12 +477,12 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege)
         $actions = table_buttons([
             button(
                 user_worklog_edit_link($worklog),
-                glyph('edit') . _('edit'),
+                glyph('edit') . __('edit'),
                 'btn-xs'
             ),
             button(
                 user_worklog_delete_link($worklog),
-                glyph('trash') . _('delete'),
+                glyph('trash') . __('delete'),
                 'btn-xs'
             )
         ]);
@@ -492,10 +492,10 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege)
         'date'       => glyph('calendar') . date('Y-m-d', $worklog['work_timestamp']),
         'duration'   => '<b>' . sprintf('%.2f', $worklog['work_hours']) . '</b>',
         'room'       => '',
-        'shift_info' => _('Work log entry'),
+        'shift_info' => __('Work log entry'),
         'comment'    => $worklog['comment'] . '<br>'
             . sprintf(
-                _('Added by %s at %s'),
+                __('Added by %s at %s'),
                 User_Nick_render(User($worklog['created_user_id'])),
                 date('Y-m-d H:i', $worklog['created_timestamp'])
             ),
@@ -546,15 +546,15 @@ function User_view(
         );
         if (count($my_shifts) > 0) {
             $myshifts_table = table([
-                'date'       => _('Day &amp; time'),
-                'duration'   => _('Duration'),
-                'room'       => _('Location'),
-                'shift_info' => _('Name &amp; workmates'),
-                'comment'    => _('Comment'),
-                'actions'    => _('Action')
+                'date'       => __('Day &amp; time'),
+                'duration'   => __('Duration'),
+                'room'       => __('Location'),
+                'shift_info' => __('Name &amp; workmates'),
+                'comment'    => __('Comment'),
+                'actions'    => __('Action')
             ], $my_shifts);
         } elseif ($user_source['force_active']) {
-            $myshifts_table = success(_('You have done enough to get a t-shirt.'), true);
+            $myshifts_table = success(__('You have done enough to get a t-shirt.'), true);
         }
     }
 
@@ -569,42 +569,42 @@ function User_view(
                     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')
+                            glyph('cutlery') . __('Edit vouchers')
                         ) : '',
                         $admin_user_worklog_privilege ? button(
                             user_worklog_add_link($user_source),
-                            glyph('list') . _('Add work log')
+                            glyph('list') . __('Add work log')
                         ) : '',
                         $its_me ? button(
                             page_link_to('user_settings'),
-                            glyph('list-alt') . _('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' => 1]),
-                            glyph('repeat') . _('Reset API key')
+                            glyph('repeat') . __('Reset API key')
                         ) : ''
                     ])
                 ])
@@ -617,15 +617,15 @@ function User_view(
                 User_angeltypes_render($user_angeltypes),
                 User_groups_render($user_groups)
             ]),
-            ($its_me || $admin_user_privilege) ? '<h2>' . _('Shifts') . '</h2>' : '',
+            ($its_me || $admin_user_privilege) ? '<h2>' . __('Shifts') . '</h2>' : '',
             $myshifts_table,
             $its_me ? info(
-                glyph('info-sign') . _('Your night shifts between 2 and 8 am count twice.'),
+                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)
                 : '',
@@ -651,7 +651,7 @@ function User_view_state($admin_user_privilege, $freeloader, $user_source)
     }
 
     return div('col-md-3', [
-        heading(_('User state'), 4),
+        heading(__('User state'), 4),
         join('<br>', $state)
     ]);
 }
@@ -669,9 +669,9 @@ function User_view_state_user($user_source)
     ];
 
     if ($user_source['Gekommen']) {
-        $state[] = '<span class="text-success">' . glyph('home') . _('Arrived') . '</span>';
+        $state[] = '<span class="text-success">' . glyph('home') . __('Arrived') . '</span>';
     } else {
-        $state[] = '<span class="text-danger">' . _('Not arrived') . '</span>';
+        $state[] = '<span class="text-danger">' . __('Not arrived') . '</span>';
     }
 
     return $state;
@@ -690,27 +690,27 @@ function User_view_state_admin($freeloader, $user_source)
     $state = [];
 
     if ($freeloader) {
-        $state[] = '<span class="text-danger">' . glyph('exclamation-sign') . _('Freeloader') . '</span>';
+        $state[] = '<span class="text-danger">' . glyph('exclamation-sign') . __('Freeloader') . '</span>';
     }
 
     $state[] = User_shift_state_render($user_source);
 
     if ($user_source['Gekommen']) {
         $state[] = '<span class="text-success">' . glyph('home')
-            . 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>';
 
         if ($user_source['force_active']) {
-            $state[] = '<span class="text-success">' . _('Active (forced)') . '</span>';
+            $state[] = '<span class="text-success">' . __('Active (forced)') . '</span>';
         } elseif ($user_source['Aktiv']) {
-            $state[] = '<span class="text-success">' . _('Active') . '</span>';
+            $state[] = '<span class="text-success">' . __('Active') . '</span>';
         }
         if ($user_source['Tshirt']) {
-            $state[] = '<span class="text-success">' . _('T-Shirt') . '</span>';
+            $state[] = '<span class="text-success">' . __('T-Shirt') . '</span>';
         }
     } else {
         $state[] = '<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>';
     }
 
@@ -723,7 +723,7 @@ function User_view_state_admin($freeloader, $user_source)
             )
             . '</span>';
     } else {
-        $state[] = '<span class="text-danger">' . _('Got no vouchers') . '</span>';
+        $state[] = '<span class="text-danger">' . __('Got no vouchers') . '</span>';
     }
 
     return $state;
@@ -738,10 +738,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'))
         ])
     ]);
 }
@@ -755,11 +755,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'))
         ])
     ]);
 }
@@ -781,7 +781,7 @@ function User_angeltypes_render($user_angeltypes)
             . '</a>';
     }
     return div('col-md-3', [
-        heading(_('Angeltypes'), 4),
+        heading(__('Angeltypes'), 4),
         join('<br>', $output)
     ]);
 }
@@ -798,7 +798,7 @@ function User_groups_render($user_groups)
     }
 
     return div('col-md-3', [
-        '<h4>' . _('Rights') . '</h4>',
+        '<h4>' . __('Rights') . '</h4>',
         join('<br>', $output)
     ]);
 }
@@ -847,7 +847,7 @@ function render_user_departure_date_hint()
     global $user;
 
     if (!isset($user['planned_departure_date']) || empty($user['planned_departure_date'])) {
-        $text = _('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.');
+        $text = __('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.');
         return render_profile_link($text, null, 'alert-link');
     }
 
@@ -863,7 +863,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.'),
             config('max_freeloadable_shifts')
         );
     }
@@ -885,7 +885,7 @@ function render_user_arrived_hint()
         if (!empty($event_config)
             && !is_null($event_config['buildup_start_date'])
             && time() > $event_config['buildup_start_date']) {
-            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.');
         }
     }
 
@@ -900,7 +900,7 @@ function render_user_tshirt_hint()
     global $user;
 
     if (config('enable_tshirt_size') && $user['Size'] == '') {
-        $text = _('You need to specify a tshirt size in your settings!');
+        $text = __('You need to specify a tshirt size in your settings!');
         return render_profile_link($text, null, 'alert-link');
     }
 
@@ -915,7 +915,7 @@ function render_user_dect_hint()
     global $user;
 
     if ($user['Gekommen'] == 1 && $user['DECT'] == '') {
-        $text = _('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.');
+        $text = __('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.');
         return render_profile_link($text, null, 'alert-link');
     }