iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename "restricted angeltype" to "Requires introduction" in the frontend 

Closes #294 (Rename "restricted angeltype")
This commit is contained in:
Igor Scheller 2020-10-17 23:50:28 +02:00 committed by msquare
parent a443373a50
commit 0bbc2d219d
5 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/angeltypes_controller.php
View File

@ -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['no_self_signup'] = $angeltype['no_self_signup'] ? '' : glyph('share');
$angeltype['name'] = '<a href="' $angeltype['name'] = '<a href="'

5
includes/pages/guest_login.php
View File

@ -51,7 +51,8 @@ function guest_register()
$angel_types_source = AngelTypes(); $angel_types_source = AngelTypes();
$angel_types = []; $angel_types = [];
foreach ($angel_types_source as $angel_type) { foreach ($angel_types_source as $angel_type) {
$angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? ' (restricted)' : ''); $angel_types[$angel_type['id']] = $angel_type['name']
. ($angel_type['restricted'] ? ' (' . __('Requires introduction') . ')' : '');
if (!$angel_type['restricted']) { if (!$angel_type['restricted']) {
$selected_angel_types[] = $angel_type['id']; $selected_angel_types[] = $angel_type['id'];
} }
@ -327,7 +328,7 @@ function guest_register()
), ),
form_info( form_info(
'', '',
__('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.')
) )
]), ]),
div('col-md-6', [ div('col-md-6', [

14
includes/view/AngelTypes_view.php
View File

@ -22,7 +22,7 @@ function AngelType_name_render($angeltype, $plain = false)
} }
return '<a href="' . angeltype_link($angeltype['id']) . '">' return '<a href="' . angeltype_link($angeltype['id']) . '">'
. ($angeltype['restricted'] ? glyph('lock') : '') . $angeltype['name'] . ($angeltype['restricted'] ? glyph('book') : '') . $angeltype['name']
. '</a>'; . '</a>';
} }
@ -37,7 +37,7 @@ function AngelType_render_membership($user_angeltype)
if (!empty($user_angeltype['user_angeltype_id'])) { if (!empty($user_angeltype['user_angeltype_id'])) {
if ($user_angeltype['restricted']) { if ($user_angeltype['restricted']) {
if (empty($user_angeltype['confirm_user_id'])) { if (empty($user_angeltype['confirm_user_id'])) {
return glyph('lock') . __('Unconfirmed'); return glyph('book') . __('Unconfirmed');
} elseif ($user_angeltype['supporter']) { } elseif ($user_angeltype['supporter']) {
return glyph_bool(true) . __('Supporter'); return glyph_bool(true) . __('Supporter');
} }
@ -86,11 +86,11 @@ function AngelType_edit_view($angeltype, $supporter_mode)
? form_info(__('Name'), $angeltype['name']) ? form_info(__('Name'), $angeltype['name'])
: form_text('name', __('Name'), $angeltype['name']), : form_text('name', __('Name'), $angeltype['name']),
$supporter_mode $supporter_mode
? form_info(__('Restricted'), $angeltype['restricted'] ? __('Yes') : __('No')) ? form_info(__('Requires introduction'), $angeltype['restricted'] ? __('Yes') : __('No'))
: form_checkbox('restricted', __('Restricted'), $angeltype['restricted']), : form_checkbox('restricted', __('Requires introduction'), $angeltype['restricted']),
form_info( 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 $supporter_mode
? form_info(__('No Self Sign Up'), $angeltype['no_self_signup'] ? __('Yes') : __('No')) ? form_info(__('No Self Sign Up'), $angeltype['no_self_signup'] ? __('Yes') : __('No'))
@ -502,7 +502,7 @@ function AngelTypes_list_view($angeltypes, $admin_angeltypes)
]), ]),
table([ table([
'name' => __('Name'), 'name' => __('Name'),
'restricted' => glyph('lock') . __('Restricted'), 'restricted' => glyph('book') . __('Requires introduction'),
'no_self_signup' => glyph('share') . __('Self Sign Up Allowed'), 'no_self_signup' => glyph('share') . __('Self Sign Up Allowed'),
'membership' => __('Membership'), 'membership' => __('Membership'),
'actions' => '' 'actions' => ''
@ -548,7 +548,7 @@ function AngelTypes_about_view_angeltype($angeltype)
if ($angeltype['restricted']) { if ($angeltype['restricted']) {
$html .= info( $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 true
); );
} }

2
includes/view/ShiftCalendarShiftRenderer.php
View File

@ -214,7 +214,7 @@ class ShiftCalendarShiftRenderer
case ShiftSignupState::ANGELTYPE: case ShiftSignupState::ANGELTYPE:
if ($angeltype['restricted'] == 1) { if ($angeltype['restricted'] == 1) {
// User has to be confirmed on the angeltype first // User has to be confirmed on the angeltype first
$entry_list[] = $inner_text . glyph('lock'); $entry_list[] = $inner_text . glyph('book');
} else { } else {
// Add link to join the angeltype first // Add link to join the angeltype first
$entry_list[] = $inner_text . '<br />' $entry_list[] = $inner_text . '<br />'

26
resources/lang/de_DE/default.po
View File

@ -1633,11 +1633,11 @@ msgstr "Beschreibung der Aufgaben"
#: includes/pages/guest_login.php:330 #: includes/pages/guest_login.php:330
msgid "" msgid ""
"Restricted angel types need will be confirmed later by a supporter. You can " "Some angel types have to be confirmed later by a supporter at an "
"change your selection in the options section." "introduction meeting. You can change your selection in the options section."
msgstr "" msgstr ""
"Beschränkte Engeltypen müssen später von einem Supporter freigeschaltet " "Engeltypen welche eine Einführung benötigen werden bei einem Einführungstreffen von "
"werden. Du kannst Deine Auswahl später in den Einstellungen ändern." "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 #: includes/pages/guest_login.php:339 includes/view/User_view.php:61
msgid "Mobile" 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:89 includes/view/AngelTypes_view.php:90
#: includes/view/AngelTypes_view.php:505 #: includes/view/AngelTypes_view.php:505
msgid "Restricted" msgid "Requires introduction"
msgstr "Beschränkt" msgstr "Benötigt Einführung"
#: includes/view/AngelTypes_view.php:93 #: includes/view/AngelTypes_view.php:93
msgid "" msgid ""
"Restricted angel types can only be used by an angel if enabled by a " "Angel types which require introduction can only be used by an angel if "
"supporter (double opt-in)." "enabled by a supporter (double opt-in)."
msgstr "" 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)." "(double-opt-in)."
#: includes/view/AngelTypes_view.php:96 includes/view/AngelTypes_view.php:97 #: includes/view/AngelTypes_view.php:96 includes/view/AngelTypes_view.php:97
@ -2082,11 +2082,11 @@ msgstr "Mitgliedschaft"
#: includes/view/AngelTypes_view.php:551 #: includes/view/AngelTypes_view.php:551
msgid "" msgid ""
"This angeltype is restricted by double-opt-in by a team supporter. Please " "This angeltype requires the attendance at an introduction meeting. "
"show up at the according introduction meetings." "You might find additional information in the description."
msgstr "" msgstr ""
"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet " "Dieser Engeltyp benötigt eine Einweisung bei einem Einführungstreffen."
"werden. Bitte komme zu den entsprechenden Einführungstreffen." "Weitere Informationen findest du möglicherweise in der Beschreibung."
#: includes/view/AngelTypes_view.php:586 #: includes/view/AngelTypes_view.php:586
msgid "FAQ" msgid "FAQ"