From 0bbc2d219d8417af420ebb566e59417d02b71b45 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sat, 17 Oct 2020 23:50:28 +0200 Subject: [PATCH] Rename "restricted angeltype" to "Requires introduction" in the frontend Closes #294 (Rename "restricted angeltype") --- includes/controller/angeltypes_controller.php | 2 +- includes/pages/guest_login.php | 5 ++-- includes/view/AngelTypes_view.php | 14 +++++----- includes/view/ShiftCalendarShiftRenderer.php | 2 +- resources/lang/de_DE/default.po | 26 +++++++++---------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php index cf70a7ef..3b4ed1be 100644 --- a/includes/controller/angeltypes_controller.php +++ b/includes/controller/angeltypes_controller.php @@ -320,7 +320,7 @@ function angeltypes_list_controller() ); } - $angeltype['restricted'] = $angeltype['restricted'] ? glyph('lock') : ''; + $angeltype['restricted'] = $angeltype['restricted'] ? glyph('book') : ''; $angeltype['no_self_signup'] = $angeltype['no_self_signup'] ? '' : glyph('share'); $angeltype['name'] = '' - . ($angeltype['restricted'] ? glyph('lock') : '') . $angeltype['name'] + . ($angeltype['restricted'] ? glyph('book') : '') . $angeltype['name'] . ''; } @@ -37,7 +37,7 @@ function AngelType_render_membership($user_angeltype) if (!empty($user_angeltype['user_angeltype_id'])) { if ($user_angeltype['restricted']) { if (empty($user_angeltype['confirm_user_id'])) { - return glyph('lock') . __('Unconfirmed'); + return glyph('book') . __('Unconfirmed'); } elseif ($user_angeltype['supporter']) { return glyph_bool(true) . __('Supporter'); } @@ -86,11 +86,11 @@ function AngelType_edit_view($angeltype, $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']), + ? form_info(__('Requires introduction'), $angeltype['restricted'] ? __('Yes') : __('No')) + : form_checkbox('restricted', __('Requires introduction'), $angeltype['restricted']), form_info( '', - __('Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).') + __('Angel types which require introduction can only be used by an angel if enabled by a supporter (double opt-in).') ), $supporter_mode ? form_info(__('No Self Sign Up'), $angeltype['no_self_signup'] ? __('Yes') : __('No')) @@ -502,7 +502,7 @@ function AngelTypes_list_view($angeltypes, $admin_angeltypes) ]), table([ 'name' => __('Name'), - 'restricted' => glyph('lock') . __('Restricted'), + 'restricted' => glyph('book') . __('Requires introduction'), 'no_self_signup' => glyph('share') . __('Self Sign Up Allowed'), 'membership' => __('Membership'), 'actions' => '' @@ -548,7 +548,7 @@ function AngelTypes_about_view_angeltype($angeltype) if ($angeltype['restricted']) { $html .= info( - __('This angeltype is restricted by double-opt-in by a team supporter. Please show up at the according introduction meetings.'), + __('This angeltype requires the attendance at an introduction meeting. You might find additional information in the description.'), true ); } diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php index 3447bfb0..5f2bb328 100644 --- a/includes/view/ShiftCalendarShiftRenderer.php +++ b/includes/view/ShiftCalendarShiftRenderer.php @@ -214,7 +214,7 @@ class ShiftCalendarShiftRenderer case ShiftSignupState::ANGELTYPE: if ($angeltype['restricted'] == 1) { // User has to be confirmed on the angeltype first - $entry_list[] = $inner_text . glyph('lock'); + $entry_list[] = $inner_text . glyph('book'); } else { // Add link to join the angeltype first $entry_list[] = $inner_text . '
' diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 7da33850..93150660 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -1633,11 +1633,11 @@ msgstr "Beschreibung der Aufgaben" #: includes/pages/guest_login.php:330 msgid "" -"Restricted angel types need will be confirmed later by a supporter. You can " -"change your selection in the options section." +"Some angel types have to be confirmed later by a supporter at an " +"introduction meeting. You can change your selection in the options section." msgstr "" -"Beschränkte Engeltypen müssen später von einem Supporter freigeschaltet " -"werden. Du kannst Deine Auswahl später in den Einstellungen ändern." +"Engeltypen welche eine Einführung benötigen werden bei einem Einführungstreffen von " +"einem Supporter freigeschaltet werden. Du kannst Deine Auswahl später in den Einstellungen ändern." #: includes/pages/guest_login.php:339 includes/view/User_view.php:61 msgid "Mobile" @@ -1949,15 +1949,15 @@ msgstr "abbrechen" #: includes/view/AngelTypes_view.php:89 includes/view/AngelTypes_view.php:90 #: includes/view/AngelTypes_view.php:505 -msgid "Restricted" -msgstr "Beschränkt" +msgid "Requires introduction" +msgstr "Benötigt Einführung" #: includes/view/AngelTypes_view.php:93 msgid "" -"Restricted angel types can only be used by an angel if enabled by a " -"supporter (double opt-in)." +"Angel types which require introduction can only be used by an angel if " +"enabled by a supporter (double opt-in)." msgstr "" -"Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden " +"Engeltypen welche eine Einführung benötigen müssen von einem Supporter freigeschaltet werden " "(double-opt-in)." #: includes/view/AngelTypes_view.php:96 includes/view/AngelTypes_view.php:97 @@ -2082,11 +2082,11 @@ msgstr "Mitgliedschaft" #: includes/view/AngelTypes_view.php:551 msgid "" -"This angeltype is restricted by double-opt-in by a team supporter. Please " -"show up at the according introduction meetings." +"This angeltype requires the attendance at an introduction meeting. " +"You might find additional information in the description." msgstr "" -"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet " -"werden. Bitte komme zu den entsprechenden Einführungstreffen." +"Dieser Engeltyp benötigt eine Einweisung bei einem Einführungstreffen." +"Weitere Informationen findest du möglicherweise in der Beschreibung." #: includes/view/AngelTypes_view.php:586 msgid "FAQ"