From 9098b8e80d4d790609f0a267b88169a129366b1b Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 18 Nov 2016 08:47:52 +0100 Subject: reduce complexity of user view --- includes/view/User_view.php | 121 ++++++++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 48 deletions(-) (limited to 'includes/view') diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 09509c3d..65cb36b3 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -223,67 +223,83 @@ function User_shift_state_render($user) { return '' . _("Shift ends %c") . ''; } -function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { +function User_view_shiftentries($needed_angel_type) { + $shift_info = '
' . $needed_angel_type['name'] . ': '; + + $shift_entries = []; + foreach ($needed_angel_type['users'] as $user_shift) { + $member = User_Nick_render($user_shift); + if ($user_shift['freeloaded']) { + $member = '' . $member . ''; + } + + $shift_entries[] = $member; + } + $shift_info .= join(", ", $shift_entries); + + return $shift_info; +} + +/** + * Helper that renders a shift line for user view + */ +function User_view_myshift($shift, $user_source, $its_me) { global $LETZTES_AUSTRAGEN, $privileges; - $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']); + $shift_info = '' . $shift['name'] . ''; + if ($shift['title']) { + $shift_info .= '
' . $shift['title'] . ''; + } + foreach ($shift['needed_angeltypes'] as $needed_angel_type) { + $shift_info .= User_view_shiftentries($needed_angel_type); + } + + $myshift = [ + 'date' => date("Y-m-d", $shift['start']), + 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']), + 'room' => $shift['Name'], + 'shift_info' => $shift_info, + 'comment' => $shift['Comment'] + ]; + + if ($shift['freeloaded']) { + if (in_array("user_shifts_admin", $privileges)) { + $myshift['comment'] .= '

' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '

'; + } else { + $myshift['comment'] .= '

' . _("Freeloaded") . '

'; + } + } + + $myshift['actions'] = [ + 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'), 'btn-xs'); + } + if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { + $myshift['actions'][] = button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], glyph('trash') . _('sign off'), 'btn-xs'); + } + $myshift['actions'] = table_buttons($myshift['actions']); + return $myshift; +} + +/** + * Helper that prepares the shift table for user view + */ +function User_view_myshifts($shifts, $user_source, $its_me) { $myshifts_table = []; $timesum = 0; foreach ($shifts as $shift) { - $shift_info = '' . $shift['name'] . ''; - if ($shift['title']) { - $shift_info .= '
' . $shift['title'] . ''; - } - foreach ($shift['needed_angeltypes'] as $needed_angel_type) { - $shift_info .= '
' . $needed_angel_type['name'] . ': '; - - $shift_entries = []; - foreach ($needed_angel_type['users'] as $user_shift) { - $member = User_Nick_render($user_shift); - if ($user_shift['freeloaded']) { - $member = '' . $member . ''; - } - - $shift_entries[] = $member; - } - $shift_info .= join(", ", $shift_entries); - } - - $myshift = [ - 'date' => date("Y-m-d", $shift['start']), - 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']), - 'room' => $shift['Name'], - 'shift_info' => $shift_info, - 'comment' => $shift['Comment'] - ]; - - if ($shift['freeloaded']) { - if (in_array("user_shifts_admin", $privileges)) { - $myshift['comment'] .= '

' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '

'; - } else { - $myshift['comment'] .= '

' . _("Freeloaded") . '

'; - } - } - - $myshift['actions'] = [ - 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'), 'btn-xs'); - } - if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { - $myshift['actions'][] = button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], glyph('trash') . _('sign off'), 'btn-xs'); - } - $myshift['actions'] = table_buttons($myshift['actions']); + $myshifts_table[] = User_view_myshift($shift, $user_source, $its_me); if ($shift['freeloaded']) { $timesum += (- 2 * ($shift['end'] - $shift['start'])); } else { $timesum += ($shift['end'] - $shift['start']); } - $myshifts_table[] = $myshift; } + if (count($myshifts_table) > 0) { $myshifts_table[] = [ 'date' => '' . _("Sum:") . '', @@ -294,6 +310,15 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel 'actions' => "" ]; } + return $myshifts_table; +} + +/** + * Renders view for a single user + */ +function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { + $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']); + $myshifts_table = User_view_myshifts($shifts, $user_source, $its_me); return page_with_title(' ' . htmlspecialchars($user_source['Nick']) . ' ' . $user_name . '', [ msg(), -- cgit v1.2.3-70-g09d2 From 409761ce4b2f919ca40aa8319a13473d9eb789ae Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 18 Nov 2016 15:36:02 +0100 Subject: rebuild login page --- includes/pages/guest_login.php | 43 +++++++++++++++++++++++-------------- includes/sys_form.php | 25 ++++++++++++++++++++++ includes/view/EventConfig_view.php | 44 ++++++++++++++++++++++++++------------ public/css/theme0.css | 3 +++ public/css/theme1.css | 3 +++ public/css/theme2.css | 3 +++ public/css/theme3.css | 3 +++ themes/base.less | 4 ++++ 8 files changed, 98 insertions(+), 30 deletions(-) (limited to 'includes/view') diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 69201161..1e6ac41a 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -212,7 +212,7 @@ function guest_register() { ]), div('col-sm-8', [ form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail), - form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo), + form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo), form_checkbox('email_by_human_allowed', _("Humans are allowed to send me an email (e.g. for ticket vouchers)"), $email_by_human_allowed) ]) ]), @@ -286,9 +286,9 @@ function guest_login() { $nick = ""; unset($_SESSION['uid']); + $valid = true; if (isset($_REQUEST['submit'])) { - $valid = true; if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 0) { $nick = User_validate_Nick($_REQUEST['nick']); @@ -326,25 +326,36 @@ function guest_login() { return page([ div('col-md-12', [ div('row', [ - div('col-md-4', [ - EventConfig_countdown_page($event_config) + EventConfig_countdown_page($event_config) + ]), + div('row', []), + div('row', [ + div('col-md-4 text-center', [ + heading(register_title(), 2), + get_register_hint() ]), div('col-md-4', [ - heading(login_title(), 2), - msg(), - form([ - form_text('nick', _("Nick"), $nick), - form_password('password', _("Password")), - form_submit('submit', _("Login")), - buttons([ - button(page_link_to('user_password_recovery'), _("I forgot my password")) + div('panel panel-primary first', [ + div('panel-heading', [ + ' ' . _("Login") ]), - info(_("Please note: You have to activate cookies!"), true) + div('panel-body', [ + msg(), + form([ + form_text_placeholder('nick', _("Nick"), $nick), + form_password_placeholder('password', _("Password")), + form_submit('submit', _("Login")), + ! $valid ? buttons([ + button(page_link_to('user_password_recovery'), _("I forgot my password")) + ]) : '' + ]) + ]), + div('panel-footer', [ + glyph('info-sign') . _("Please note: You have to activate cookies!") + ]) ]) ]), - div('col-md-4', [ - heading(register_title(), 2), - get_register_hint(), + div('col-md-4 text-center', [ heading(_("What can I do?"), 2), '

' . _("Please read about the jobs you can do to help us.") . '

', buttons([ diff --git a/includes/sys_form.php b/includes/sys_form.php index 960be401..98ef2134 100644 --- a/includes/sys_form.php +++ b/includes/sys_form.php @@ -175,6 +175,23 @@ function form_text($name, $label, $value, $disabled = false) { return form_element($label, '', 'form_' . $name); } +/** + * Renders a text input with placeholder instead of label. + * + * @param String $name + * Input name + * @param String $placeholder + * Placeholder + * @param String $value + * The value + * @param Boolean $disabled + * Is the field enabled? + */ +function form_text_placeholder($name, $placeholder, $value, $disabled = false) { + $disabled = $disabled ? ' disabled="disabled"' : ''; + return form_element('', ''); +} + /** * Rendert ein Formular-Emailfeld */ @@ -198,6 +215,14 @@ function form_password($name, $label, $disabled = false) { return form_element($label, '', 'form_' . $name); } +/** + * Renders a password input with placeholder instead of label. + */ +function form_password_placeholder($name, $placeholder, $disabled = false) { + $disabled = $disabled ? ' disabled="disabled"' : ''; + return form_element('', '', 'form_' . $name); +} + /** * Rendert ein Formular-Textfeld */ diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php index d184166f..bf3ad3a4 100644 --- a/includes/view/EventConfig_view.php +++ b/includes/view/EventConfig_view.php @@ -6,33 +6,49 @@ */ function EventConfig_countdown_page($event_config) { if ($event_config == null) { - return info(_("We got no information about the event right now."), true); + return div('col-md-12 text-center', [ + heading(sprintf(_("Welcome to the %s!"), ' ENGELSYSTEM'), 2) + ]); } $elements = []; if ($event_config['event_name'] != null) { - $elements[] = heading($event_config['event_name'], 2); + $elements[] = div('col-md-12 text-center', [ + heading(sprintf(_("Welcome to the %s!"), $event_config['event_name'] . ' ENGELSYSTEM'), 2) + ]); } - if ($event_config['event_start_date'] != null && $event_config['event_end_date'] != null) { - $elements[] = sprintf(_("from %s to %s"), date("Y-m-d", $event_config['event_start_date']), date("Y-m-d", $event_config['event_end_date'])); - } - - if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) { - $elements[] = '

' . _("Buildup starts in %c") . '

'; + if ($event_config['buildup_start_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Buildup starts"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['buildup_start_date']) . '' + ]); } - if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) { - $elements[] = '

' . _("Event starts in %c") . '

'; + if ($event_config['event_start_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Event starts"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['event_start_date']) . '' + ]); } - if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { - $elements[] = '

' . _("Event ends in %c") . '

'; + if ($event_config['event_end_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Event ends"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['event_end_date']) . '' + ]); } - if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { - $elements[] = '

' . _("Teardown ends in %c") . '

'; + if ($event_config['teardown_end_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Teardown ends"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['teardown_end_date']) . '' + ]); } return join("", $elements); diff --git a/public/css/theme0.css b/public/css/theme0.css index e6730397..f623f239 100644 --- a/public/css/theme0.css +++ b/public/css/theme0.css @@ -6730,6 +6730,9 @@ body { .footer a { color: #777777; } +.first { + margin-top: 20px; +} .panel-primary .panel-heading a { color: #ffffff; } diff --git a/public/css/theme1.css b/public/css/theme1.css index 32d31bd2..163e9b1e 100644 --- a/public/css/theme1.css +++ b/public/css/theme1.css @@ -6753,6 +6753,9 @@ body { .footer a { color: #888888; } +.first { + margin-top: 20px; +} .panel-primary .panel-heading a { color: #ffffff; } diff --git a/public/css/theme2.css b/public/css/theme2.css index 8a1c3583..0fd65393 100644 --- a/public/css/theme2.css +++ b/public/css/theme2.css @@ -6730,6 +6730,9 @@ body { .footer a { color: #777777; } +.first { + margin-top: 20px; +} .panel-primary .panel-heading a { color: #ffffff; } diff --git a/public/css/theme3.css b/public/css/theme3.css index 24aebfaf..78d58f0b 100644 --- a/public/css/theme3.css +++ b/public/css/theme3.css @@ -6739,6 +6739,9 @@ body { .footer a { color: #777777; } +.first { + margin-top: 20px; +} .panel-primary .panel-heading a { color: #ffffff; } diff --git a/themes/base.less b/themes/base.less index d1ef5b64..f105377f 100644 --- a/themes/base.less +++ b/themes/base.less @@ -10,6 +10,10 @@ body { color: @text-muted; } +.first { + margin-top: 20px; +} + .panel-primary .panel-heading a { color: @panel-primary-text; } -- cgit v1.2.3-70-g09d2 From 5ae328b2b1d46b25131e2755939bb326efcdc507 Mon Sep 17 00:00:00 2001 From: msquare Date: Sun, 20 Nov 2016 17:54:16 +0100 Subject: hide event countdown for mobile clients --- includes/pages/guest_login.php | 15 +- includes/view/EventConfig_view.php | 34 +-- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 41205 -> 40961 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 471 +++++++++++++++--------------- public/css/theme0.css | 8 +- public/css/theme1.css | 8 +- public/css/theme2.css | 8 +- public/css/theme3.css | 8 +- themes/base.less | 9 +- 9 files changed, 299 insertions(+), 262 deletions(-) (limited to 'includes/view') diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 1e6ac41a..b7f85555 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -328,13 +328,8 @@ function guest_login() { div('row', [ EventConfig_countdown_page($event_config) ]), - div('row', []), div('row', [ - div('col-md-4 text-center', [ - heading(register_title(), 2), - get_register_hint() - ]), - div('col-md-4', [ + div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [ div('panel panel-primary first', [ div('panel-heading', [ ' ' . _("Login") @@ -354,8 +349,14 @@ function guest_login() { glyph('info-sign') . _("Please note: You have to activate cookies!") ]) ]) + ]) + ]), + div('row', [ + div('col-sm-6 text-center', [ + heading(register_title(), 2), + get_register_hint() ]), - div('col-md-4 text-center', [ + div('col-sm-6 text-center', [ heading(_("What can I do?"), 2), '

' . _("Please read about the jobs you can do to help us.") . '

', buttons([ diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php index bf3ad3a4..37a19839 100644 --- a/includes/view/EventConfig_view.php +++ b/includes/view/EventConfig_view.php @@ -14,39 +14,39 @@ function EventConfig_countdown_page($event_config) { $elements = []; if ($event_config['event_name'] != null) { - $elements[] = div('col-md-12 text-center', [ + $elements[] = div('col-sm-12 text-center', [ heading(sprintf(_("Welcome to the %s!"), $event_config['event_name'] . ' ENGELSYSTEM'), 2) ]); } - if ($event_config['buildup_start_date'] != null) { - $elements[] = div('col-md-3 text-center', [ - heading(_("Buildup starts"), 3), - '

%c

', + if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) { + $elements[] = div('col-sm-3 text-center hidden-xs', [ + heading(_("Buildup starts"), 4), + '%c', '' . date(_("Y-m-d"), $event_config['buildup_start_date']) . '' ]); } - if ($event_config['event_start_date'] != null) { - $elements[] = div('col-md-3 text-center', [ - heading(_("Event starts"), 3), - '

%c

', + if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) { + $elements[] = div('col-sm-3 text-center hidden-xs', [ + heading(_("Event starts"), 4), + '%c', '' . date(_("Y-m-d"), $event_config['event_start_date']) . '' ]); } - if ($event_config['event_end_date'] != null) { - $elements[] = div('col-md-3 text-center', [ - heading(_("Event ends"), 3), - '

%c

', + if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date']) { + $elements[] = div('col-sm-3 text-center hidden-xs', [ + heading(_("Event ends"), 4), + '%c', '' . date(_("Y-m-d"), $event_config['event_end_date']) . '' ]); } - if ($event_config['teardown_end_date'] != null) { - $elements[] = div('col-md-3 text-center', [ - heading(_("Teardown ends"), 3), - '

%c

', + if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date']) { + $elements[] = div('col-sm-3 text-center hidden-xs', [ + heading(_("Teardown ends"), 4), + '%c', '' . date(_("Y-m-d"), $event_config['teardown_end_date']) . '' ]); } diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index 7e98477d..c3c35f25 100644 Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 0dbdafec..3d11f2fe 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" -"POT-Creation-Date: 2016-11-15 17:40+0100\n" -"PO-Revision-Date: 2016-11-15 17:49+0100\n" +"POT-Creation-Date: 2016-11-20 17:33+0100\n" +"PO-Revision-Date: 2016-11-20 17:34+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -18,96 +18,96 @@ msgstr "" "X-Poedit-SearchPath-1: .\n" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:171 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:356 msgid "Angeltypes" msgstr "Engeltypen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:55 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:351 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:362 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:260 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:320 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110 msgid "Teams/Job description" msgstr "Team-/Aufgabenbeschreibung" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:82 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:72 #, php-format msgid "Angeltype %s deleted." msgstr "Engeltyp %s gelöscht." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:87 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:77 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41 #, php-format msgid "Delete angeltype %s" msgstr "Lösche Engeltyp %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:116 msgid "Please check the name. Maybe it already exists." msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:170 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 #, php-format msgid "Edit %s" msgstr "%s bearbeiten" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:202 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:239 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:247 #, php-format msgid "Team %s" msgstr "Team %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:179 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274 msgid "view" msgstr "ansehen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:183 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:16 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:66 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:277 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328 msgid "edit" msgstr "bearbeiten" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:226 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:184 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:177 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:42 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:120 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:105 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:16 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:67 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:57 msgid "delete" msgstr "löschen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:231 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:90 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:274 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:189 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:282 msgid "leave" msgstr "verlassen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:233 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:276 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:191 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:284 msgid "join" msgstr "mitmachen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:258 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:216 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:29 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:35 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:65 @@ -177,7 +177,7 @@ msgid "My shifts" msgstr "Meine Schichten" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:110 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:309 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348 msgid "Freeloader" msgstr "Schwänzer" @@ -233,7 +233,7 @@ msgstr "Schichttyp" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:320 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:63 msgid "Title" msgstr "Titel" @@ -252,7 +252,7 @@ msgstr "Ende:" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:141 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:270 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:334 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:122 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89 msgid "Needed angels" msgstr "Benötigte Engel" @@ -265,8 +265,8 @@ msgstr "Benötigte Engel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:122 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:39 @@ -276,7 +276,7 @@ msgstr "Benötigte Engel" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:402 msgid "Save" msgstr "Speichern" @@ -381,7 +381,7 @@ msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:176 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:309 msgid "User doesn't exist." msgstr "Benutzer existiert nicht." @@ -428,13 +428,13 @@ msgid "Removed supporter rights for %s from %s." msgstr "%s hat jetzt nicht mehr %s als Supporter." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4 msgid "Add supporter rights" msgstr "Supporterrechte geben" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:142 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4 msgid "Remove supporter rights" msgstr "Supporterrechte entfernen" @@ -478,19 +478,19 @@ msgstr "" msgid "driving license information" msgstr "Führerschein-Infos" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:113 +msgid "Your driver license information has been saved." +msgstr "Deine Führerschein-Infos wurden gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:116 msgid "Please select at least one driving license." msgstr "Bitte wähle mindestens einen Führerschein-Typen aus." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:128 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121 msgid "Your driver license information has been removed." msgstr "Deine Führerschein-Infos wurden gelöscht." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:138 -msgid "Your driver license information has been saved." -msgstr "Deine Führerschein-Infos wurden gespeichert." - -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:127 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15 #, php-format msgid "Edit %s driving license information" @@ -538,54 +538,50 @@ msgstr "Benutzer nicht gefunden." msgid "All users" msgstr "Alle Benutzer" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:219 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:214 msgid "Token is not correct." msgstr "Der Token ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:224 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:96 msgid "Your passwords don't match." msgstr "Deine Passwörter stimmen nicht überein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:228 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:94 msgid "Your password is to short (please use at least 6 characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:239 -msgid "Password could not be updated." -msgstr "Passwort kann nicht neu gesetzt werden." - -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:242 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98 msgid "Password saved." msgstr "Passwort gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:265 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:254 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:258 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:21 msgid "E-mail address is not correct." msgstr "Die E-Mail Adresse ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:269 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:25 msgid "Please enter your e-mail." msgstr "Bitte gib Deine E-Mail-Adresse ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:295 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:292 msgid "Password recovery" msgstr "Passwort wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267 #, php-format msgid "Please visit %s to recover your password." msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:282 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:268 msgid "We sent an email containing your password recovery link." msgstr "" "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." @@ -760,8 +756,8 @@ msgstr "entferne t-shirt" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:165 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:180 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:208 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:216 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:224 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165 msgid "Sum" msgstr "Summe" @@ -807,7 +803,7 @@ msgstr "Größe" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:6 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:339 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:364 msgid "Shifts" msgstr "Schichten" @@ -938,9 +934,9 @@ msgstr "Nur bestätigte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:92 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181 @@ -949,8 +945,8 @@ msgstr "Nick" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:241 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:186 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184 msgid "DECT" @@ -965,7 +961,7 @@ msgstr "Jabber" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:96 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:214 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:361 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:386 msgid "E-Mail" msgstr "E-Mail" @@ -978,8 +974,8 @@ msgstr "Gruppenrechte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:189 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:57 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:255 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:263 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:77 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183 @@ -1100,7 +1096,7 @@ msgstr "Anzulegende Schichten" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:341 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:366 msgid "Day" msgstr "Tag" @@ -1108,7 +1104,7 @@ msgstr "Tag" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67 msgid "Start" msgstr "Beginn" @@ -1116,7 +1112,7 @@ msgstr "Beginn" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:108 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75 msgid "End" msgstr "Ende" @@ -1229,7 +1225,7 @@ msgid "Answered by" msgstr "Antwort von" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:170 msgid "Rooms" msgstr "Räume" @@ -1368,14 +1364,14 @@ msgid "This user does not exist." msgstr "Benutzer existiert nicht." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67 msgid "Yes" msgstr "Ja" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:47 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67 msgid "No" msgstr "Nein" @@ -1399,7 +1395,8 @@ msgid "Credits" msgstr "Credits" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:347 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99 msgid "Login" @@ -1478,14 +1475,14 @@ msgid "Shirt size" msgstr "T-Shirt Größe" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:346 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:98 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:400 msgid "Password" msgstr "Passwort" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:376 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:401 msgid "Confirm password" msgstr "Passwort wiederholen" @@ -1556,32 +1553,32 @@ msgstr "" msgid "Please enter a nickname." msgstr "Gib bitte einen Nick an." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101 msgid "I forgot my password" msgstr "Passwort vergessen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:354 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:103 msgid "Please note: You have to activate cookies!" msgstr "Hinweis: Cookies müssen aktiviert sein!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:348 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:359 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107 msgid "What can I do?" msgstr "Was kann ich machen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:360 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108 msgid "Please read about the jobs you can do to help us." msgstr "" "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:364 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:375 msgid "Please sign up, if you want to help us!" msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:371 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:382 msgid "Registration is disabled." msgstr "Registrierung ist abgeschaltet." @@ -1769,15 +1766,15 @@ msgstr "Konnte Passwort nicht speichern." msgid "Theme changed." msgstr "Aussehen geändert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:83 msgid "The administration has not configured any rooms yet." msgstr "Die Administratoren habe noch keine Räume eingerichtet." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:95 msgid "The administration has not configured any shifts yet." msgstr "Die Administratoren haben noch keine Schichten angelegt." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:99 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:105 msgid "" "The administration has not configured any angeltypes yet - or you are not " "subscribed to any angeltype." @@ -1785,34 +1782,34 @@ msgstr "" "Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast " "noch keine Engeltypen ausgewählt." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:154 msgid "occupied" msgstr "belegt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:152 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:158 msgid "free" msgstr "frei" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:178 msgid "Occupancy" msgstr "Belegung" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:179 msgid "" "The tasks shown here are influenced by the angeltypes you joined already!" msgstr "" "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen " "(Engeltypen/Aufgaben) abhängig!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:179 msgid "Description of the jobs." msgstr "Beschreibung der Aufgaben." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181 msgid "iCal export" msgstr "iCal Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181 #, php-format msgid "" "Export of shown shifts. iCal format or JSON Format verfügbar (Link bitte geheimhalten, sonst API-Key zurücksetzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:182 msgid "Filter" msgstr "Filter" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:198 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:204 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23 msgid "All" msgstr "Alle" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:199 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:205 msgid "None" msgstr "Keine" @@ -1849,7 +1846,7 @@ msgid "No data found." msgstr "Nichts gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:27 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:231 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:239 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -1879,16 +1876,16 @@ msgstr "Möchtest Du den Engeltypen %s löschen?" msgid "cancel" msgstr "abbrechen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:256 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:264 msgid "Restricted" msgstr "Beschränkt" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67 msgid "Requires driver license" msgstr "Benötigt Führerschein" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68 msgid "" "Restricted angel types can only be used by an angel if enabled by an " "archangel (double opt-in)." @@ -1896,23 +1893,23 @@ msgstr "" "Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator " "freigeschaltet werden (double-opt-in)." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:200 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:126 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:93 msgid "Description" msgstr "Beschreibung" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:70 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:38 msgid "Please use markdown for the description." msgstr "Bitte benutze Markdown für die Beschreibung." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85 msgid "my driving license" msgstr "Meine Führerschein-Infos" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92 msgid "" "This angeltype requires a driver license. Please enter your driver license " "information!" @@ -1920,7 +1917,7 @@ msgstr "" "Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-" "Infos ein!" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96 #, php-format msgid "" "You are unconfirmed for this angeltype. Please go to the introduction for %s " @@ -1929,78 +1926,78 @@ msgstr "" "Du bist noch nicht für diesen Engeltyp bestätigt. Bitte gehe zur Einführung " "für %s um bestätigt zu werden." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:135 msgid "confirm" msgstr "bestätigen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:128 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:136 msgid "deny" msgstr "ablehnen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152 msgid "remove" msgstr "entfernen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174 msgid "Driver" msgstr "Fahrer" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175 msgid "Has car" msgstr "Hat Auto" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:176 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27 msgid "Car" msgstr "Auto" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177 msgid "3,5t Transporter" msgstr "3,5t Transporter" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178 msgid "7,5t Truck" msgstr "7,5t LKW" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:179 msgid "12,5t Truck" msgstr "12,5t LKW" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:180 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31 msgid "Forklift" msgstr "Gabelstapler" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:210 msgid "supporters" msgstr "Supporter" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:222 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230 msgid "Members" msgstr "Mitglieder" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:72 msgid "Add" msgstr "Hinzufügen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:241 msgid "confirm all" msgstr "Alle bestätigen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:234 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:242 msgid "deny all" msgstr "Alle ablehnen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:251 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:259 msgid "New angeltype" msgstr "Neuer Engeltyp" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:257 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:265 msgid "Membership" msgstr "Mitgliedschaft" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:282 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:290 msgid "" "This angeltype is restricted by double-opt-in by a team supporter. Please " "show up at the according introduction meetings." @@ -2008,11 +2005,11 @@ msgstr "" "Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet " "werden. Bitte komme zu den entsprechenden Einführungstreffen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:303 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:311 msgid "FAQ" msgstr "FAQ" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:305 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:313 msgid "" "Here is the list of teams and their tasks. If you have questions, read the " "FAQ." @@ -2020,88 +2017,87 @@ msgstr "" "Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue " "im FAQ nach." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:9 -msgid "We got no information about the event right now." -msgstr "Wir haben aktuell keine Informationen über das Event." - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19 -#, php-format -msgid "from %s to %s" -msgstr "vom %s bis %s" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:23 -#, php-format -msgid "Buildup starts in %c" -msgstr "Aufbau startet in %c" +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:10 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:18 +#, php-format +msgid "Welcome to the %s!" +msgstr "Willkommen beim %s!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:24 +msgid "Buildup starts" +msgstr "Aufbau startet" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:26 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:42 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:50 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:69 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77 +msgid "Y-m-d" +msgstr "d.m.Y" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27 -#, php-format -msgid "Event starts in %c" -msgstr "Event startet in %c" +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:32 +msgid "Event starts" +msgstr "Event startet" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:31 -#, php-format -msgid "Event ends in %c" -msgstr "Event endet in %c" +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:40 +msgid "Event ends" +msgstr "Event endet" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:35 -#, php-format -msgid "Teardown ends in %c" -msgstr "Abbau endet in %c" +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:48 +msgid "Teardown ends" +msgstr "Abbau endet" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67 #, php-format msgid "%s, from %s to %s" msgstr "%s, vom %s bis %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61 -msgid "Y-m-d" -msgstr "d.m.Y" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72 #, php-format msgid "%s, starting %s" msgstr "%s, ab dem %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77 #, php-format msgid "Event from %s to %s" msgstr "Event von %s bis %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106 msgid "Event Name" msgstr "Event Name" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:107 msgid "Event Name is shown on the start page." msgstr "Event Name wird auf der Startseite angezeigt." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:108 msgid "Event Welcome Message" msgstr "Event Willkommens-Nachricht" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:109 msgid "" "Welcome message is shown after successful registration. You can use markdown." msgstr "" "Die Willkommens-Nachricht wird nach einer erfolgreichen Registrierung " "angezeigt. Du kannst Markdown benutzen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:112 msgid "Buildup date" msgstr "Aufbau Datum" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:113 msgid "Event start date" msgstr "Event Start Datum" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:116 msgid "Teardown end date" msgstr "Abbau Ende Datum" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:117 msgid "Event end date" msgstr "Event Ende Datum" @@ -2113,28 +2109,28 @@ msgstr "Offene Fragen" msgid "Your Question:" msgstr "Deine Frage:" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:192 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:342 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:200 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:367 msgid "Time" msgstr "Zeit" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:231 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:239 msgid "Your shift" msgstr "Meine Schicht" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:240 msgid "Help needed" msgstr "Hilfe benötigt" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:241 msgid "Other angeltype needed / collides with my shifts" msgstr "Andere Engeltypen benötigt / kollidiert mit meinen Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:234 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:242 msgid "Shift is full" msgstr "Schicht ist voll" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:235 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:243 msgid "Shift running/ended" msgstr "Schicht läuft/vorbei" @@ -2165,8 +2161,8 @@ msgid "Become %s" msgstr "Werde ein %s" #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:263 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:265 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:267 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:269 msgid "Freeloaded" msgstr "Geschwänzt" @@ -2234,16 +2230,16 @@ msgstr "erstellt am %s von %s" msgid "edited at %s by %s" msgstr "bearbeitet am %s von %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:86 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:53 msgid "This shift collides with one of your shifts." msgstr "Diese Schicht kollidiert mit deinen Schichten." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:87 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:54 msgid "You are signed up for this shift." msgstr "Du bist für diese Schicht eingetragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:116 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:343 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:368 msgid "Location" msgstr "Ort" @@ -2417,7 +2413,7 @@ msgid "Prename" msgstr "Vorname" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350 msgid "Arrived" msgstr "Angekommen" @@ -2430,12 +2426,12 @@ msgid "Freeloads" msgstr "Schwänzereien" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:313 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:352 msgid "Active" msgstr "Aktiv" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:353 msgid "T-Shirt" msgstr "T-Shirt" @@ -2463,80 +2459,80 @@ msgstr "Schicht startet %c" msgid "Shift ends %c" msgstr "Schicht endet %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:276 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:280 msgid "sign off" msgstr "abmelden" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:305 msgid "Sum:" msgstr "Summe:" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:308 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329 +msgid "driving license" +msgstr "Führerschein" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331 +msgid "Edit vouchers" +msgstr "Voucher bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333 +msgid "iCal Export" +msgstr "iCal Export" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334 +msgid "JSON Export" +msgstr "JSON Export" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:347 msgid "User state" msgstr "Engelzustand" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350 #, php-format msgid "Arrived at %s" msgstr "Angekommen am %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350 #, php-format msgid "Not arrived (Planned: %s)" msgstr "Nicht angekommen (Geplant: %s)" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350 msgid "Not arrived" msgstr "Nicht angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351 #, php-format msgid "Got %s voucher" msgid_plural "Got %s vouchers" msgstr[0] "Einen Voucher bekommen" msgstr[1] "%s Voucher bekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351 msgid "Got no vouchers" msgstr "Voucher nicht bekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:321 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:360 msgid "Rights" msgstr "Rechte" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329 -msgid "driving license" -msgstr "Führerschein" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331 -msgid "Edit vouchers" -msgstr "Voucher bearbeiten" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333 -msgid "iCal Export" -msgstr "iCal Export" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334 -msgid "JSON Export" -msgstr "JSON Export" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:344 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:369 msgid "Name & workmates" msgstr "Name & Kollegen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:345 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:370 msgid "Comment" msgstr "Kommentar" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:346 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:371 msgid "Action" msgstr "Aktion" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373 msgid "Your night shifts between 2 and 8 am count twice." msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:349 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:374 #, php-format msgid "" "Go to the shifts table to sign yourself up for some " @@ -2545,7 +2541,7 @@ msgstr "" "Gehe zur Schicht-Tabelle, um Dich für Schichten " "einzutragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:359 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:384 msgid "" "We will send you an e-mail with a password recovery link. Please use the " "email address you used for registration." @@ -2554,15 +2550,15 @@ msgstr "" "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " "verwendet hast." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:362 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:387 msgid "Recover" msgstr "Wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:398 msgid "Please enter a new password." msgstr "Gib bitte ein neues Passwort ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:422 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:447 msgid "" "Please enter your planned date of departure on your settings page to give us " "a feeling for teardown capacities." @@ -2570,7 +2566,7 @@ msgstr "" "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-" "Planung bekommen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:432 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:457 #, php-format msgid "" "You freeloaded at least %s shifts. Shift signup is locked. Please go to " @@ -2579,7 +2575,7 @@ msgstr "" "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:443 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:468 msgid "" "You are not marked as arrived. Please go to heaven's desk, get your angel " "badge and/or tell them that you arrived already." @@ -2587,11 +2583,11 @@ msgstr "" "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, " "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:453 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:478 msgid "You need to specify a tshirt size in your settings!" msgstr "Bitte eine T-Shirt-Größe auswählen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:463 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:488 msgid "" "You need to specify a DECT phone number in your settings! If you don't have " "a DECT phone, just enter \"-\"." @@ -2611,6 +2607,15 @@ msgstr "" "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "bitte ein, um Zugriff zu erhalten!" +#~ msgid "Password could not be updated." +#~ msgstr "Passwort kann nicht neu gesetzt werden." + +#~ msgid "We got no information about the event right now." +#~ msgstr "Wir haben aktuell keine Informationen über das Event." + +#~ msgid "from %s to %s" +#~ msgstr "vom %s bis %s" + #~ msgid "Please enter your planned date of departure." #~ msgstr "Bitte gib Dein geplantes Abreisedatum an." diff --git a/public/css/theme0.css b/public/css/theme0.css index f623f239..4c09a094 100644 --- a/public/css/theme0.css +++ b/public/css/theme0.css @@ -6731,7 +6731,13 @@ body { color: #777777; } .first { - margin-top: 20px; + margin-top: 30px; +} +.text-big { + display: block; + font-size: 30px; + line-height: 30px; + margin: 0px; } .panel-primary .panel-heading a { color: #ffffff; diff --git a/public/css/theme1.css b/public/css/theme1.css index 163e9b1e..3b5201b6 100644 --- a/public/css/theme1.css +++ b/public/css/theme1.css @@ -6754,7 +6754,13 @@ body { color: #888888; } .first { - margin-top: 20px; + margin-top: 30px; +} +.text-big { + display: block; + font-size: 30px; + line-height: 30px; + margin: 0px; } .panel-primary .panel-heading a { color: #ffffff; diff --git a/public/css/theme2.css b/public/css/theme2.css index 0fd65393..07f2ea10 100644 --- a/public/css/theme2.css +++ b/public/css/theme2.css @@ -6731,7 +6731,13 @@ body { color: #777777; } .first { - margin-top: 20px; + margin-top: 30px; +} +.text-big { + display: block; + font-size: 30px; + line-height: 30px; + margin: 0px; } .panel-primary .panel-heading a { color: #ffffff; diff --git a/public/css/theme3.css b/public/css/theme3.css index 78d58f0b..2b5358be 100644 --- a/public/css/theme3.css +++ b/public/css/theme3.css @@ -6740,7 +6740,13 @@ body { color: #777777; } .first { - margin-top: 20px; + margin-top: 30px; +} +.text-big { + display: block; + font-size: 30px; + line-height: 30px; + margin: 0px; } .panel-primary .panel-heading a { color: #ffffff; diff --git a/themes/base.less b/themes/base.less index f105377f..713119ff 100644 --- a/themes/base.less +++ b/themes/base.less @@ -11,7 +11,14 @@ body { } .first { - margin-top: 20px; + margin-top: 30px; +} + +.text-big { + display: block; + font-size: 30px; + line-height: 30px; + margin: 0px; } .panel-primary .panel-heading a { -- cgit v1.2.3-70-g09d2 From 4116e0114e94f7c4ee5dba686c029b7e988bd7b3 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Thu, 24 Nov 2016 00:17:01 +0100 Subject: Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated --- includes/pages/user_questions.php | 2 +- includes/view/Questions_view.php | 2 +- locale/de_DE.UTF-8/LC_MESSAGES/default.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'includes/view') diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php index 7acdee78..4abceb92 100644 --- a/includes/pages/user_questions.php +++ b/includes/pages/user_questions.php @@ -1,7 +1,7 @@ _("Answer"), 'actions' => "" ], $answered_questions), - heading(_("Ask an archangel"), 2), + heading(_("Ask the Heaven"), 2), form([ form_textarea('question', _("Your Question:"), ""), form_submit('submit', _("Save")) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 3d11f2fe..e8c64a22 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1710,8 +1710,8 @@ msgstr "News anlegen:" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29 -msgid "Ask an archangel" -msgstr "Frage einen Erzengel" +msgid "Ask the Heaven" +msgstr "Frage den Himmel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27 msgid "Unable to save question." -- cgit v1.2.3-70-g09d2 From 4f6db20ae479576b221bc5269ef6734e9c869c6a Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 25 Nov 2016 13:03:25 +0100 Subject: fix shift view bars --- includes/view/Shifts_view.php | 6 ++++-- public/css/theme4.css | 4 +++- themes/theme4.less | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'includes/view') diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 885d1ad9..fbd71d54 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -81,7 +81,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt ]), div('col-sm-3 col-xs-6', [ '

' . _('Location') . '

', - '

' . glyph('map-marker') . $room['Name'] . '

' + '

' . Room_name_render($room) . '

' ]) ]), div('row', [ @@ -113,7 +113,9 @@ function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shi $needed_angels .= '
' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '
'; $needed_angels .= '

' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '

'; - $needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); + $bar_max = max($needed_angeltype['count']*10, $needed_angeltype['taken']*10, 10); + $bar_value = max(1, $needed_angeltype['taken'] * 10); + $needed_angels .= progress_bar(0, $bar_max, $bar_value, $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); $angels = []; foreach ($shift['ShiftEntry'] as $shift_entry) { diff --git a/public/css/theme4.css b/public/css/theme4.css index f4ff0d7b..4e641efb 100644 --- a/public/css/theme4.css +++ b/public/css/theme4.css @@ -7027,6 +7027,8 @@ a.thumbnail.active { color: #fff; } .label-warning, -.label-success { +.label-success, +.progress-bar-warning, +.progress-bar-success { color: #222222; } diff --git a/themes/theme4.less b/themes/theme4.less index 6e221bc1..750a35cc 100644 --- a/themes/theme4.less +++ b/themes/theme4.less @@ -1046,6 +1046,6 @@ a.thumbnail.active { } } -.label-warning, .label-success { +.label-warning, .label-success, .progress-bar-warning, .progress-bar-success { color: @gray-darker; } -- cgit v1.2.3-70-g09d2 From bae3ede662426d362a3b9d33d9124253af7e847b Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 25 Nov 2016 13:38:16 +0100 Subject: fixes #279 fix exporting freeload comment in json export --- includes/controller/shifts_controller.php | 23 ++++++----------------- includes/model/Shifts_model.php | 4 +++- includes/model/User_model.php | 2 +- includes/pages/user_atom.php | 3 --- includes/pages/user_ical.php | 3 --- includes/view/ShiftTypes_view.php | 1 + 6 files changed, 11 insertions(+), 25 deletions(-) (limited to 'includes/view') diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index 1500b449..1e04c5a8 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -1,6 +1,6 @@ parse($shifttype['description']) ]); } -- cgit v1.2.3-70-g09d2 From 561e8ec36c50b2ace9fe7352dfb4e11f57d0e82e Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 25 Nov 2016 14:55:19 +0100 Subject: better msg placement on angeltype view --- includes/view/AngelTypes_view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/view') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index a48f8d4c..04c0e286 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -49,7 +49,7 @@ function AngelType_delete_view($angeltype) { /** * Render angeltype edit form. - * + * * @param Angeltype $angeltype * The angeltype to edit * @param boolean $supporter_mode @@ -193,8 +193,8 @@ function AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes) */ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angeltypes, $admin_angeltypes, $supporter, $user_driver_license, $user) { $page = [ - msg(), - AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user) + AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user), + msg() ]; $page[] = '

' . _("Description") . '

'; -- cgit v1.2.3-70-g09d2 From 0401e90f005bf1292aee6f61d0a7970a1dc0da2b Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:23:49 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- locale/de_DE.UTF-8/LC_MESSAGES/default.po | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'includes/view') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 04c0e286..318cd075 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? 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']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by an archangel (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index e0838ecf..34c34707 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1710,8 +1710,8 @@ msgstr "News anlegen:" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29 -msgid "Ask the Heaven" -msgstr "Frage den Himmel" +msgid "Ask Heaven" +msgstr "Frag den Himmel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27 msgid "Unable to save question." @@ -1887,10 +1887,10 @@ msgstr "Benötigt Führerschein" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68 msgid "" -"Restricted angel types can only be used by an angel if enabled by an " -"archangel (double opt-in)." +"Restricted angel types can only be used by an angel if enabled by a" +"supporter (double opt-in)." msgstr "" -"Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator " +"Beschränkte Engeltypen müssen von einem Supporter " "freigeschaltet werden (double-opt-in)." #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69 -- cgit v1.2.3-70-g09d2 From 10517213f6b6391721af36ccf99c3d0db8762966 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:33:07 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 318cd075..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? 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']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.2.3-70-g09d2 From acbaaf4364ea03620397938cd05835d694b7ff78 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:43:22 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 0c8a4068..270a423e 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? 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']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.2.3-70-g09d2 From 687c3333224c6b8db7e5868f120871d6174d39b5 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:44:28 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 270a423e..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? 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']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.2.3-70-g09d2