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

Merge pull request #321 from raboof/wantsToDrive 

Improvements around 'wants_to_drive'
This commit is contained in:
msquare 2017-05-01 10:20:58 +02:00 committed by GitHub
parent cb9a132790 b688b928db
commit ff4d176341
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/model/UserDriverLicenses_model.php
View File

@ -24,7 +24,7 @@ function UserDriverLicense_new() {
* @return boolean
*/
function UserDriverLicense_valid($user_driver_license) {
return $user_driver_license['has_car'] || $user_driver_license['has_license_car'] || $user_driver_license['has_license_3_5t_transporter'] || $user_driver_license['has_license_7_5t_truck'] || $user_driver_license['has_license_12_5t_truck'] || $user_driver_license['has_license_forklift'];
return $user_driver_license['has_license_car'] || $user_driver_license['has_license_3_5t_transporter'] || $user_driver_license['has_license_7_5t_truck'] || $user_driver_license['has_license_12_5t_truck'] || $user_driver_license['has_license_forklift'];
}
/**

4
includes/view/AngelTypes_view.php
View File

@ -124,9 +124,9 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
$members_unconfirmed = [];
foreach ($members as $member) {
$member['Nick'] = User_Nick_render($member);
if ($angeltype['requires_driver_license']) {
$member['wants_to_drive'] = glyph_bool($member['user_id']);
$member['wants_to_drive'] = glyph_bool($member['wants_to_drive']);
$member['has_car'] = glyph_bool($member['has_car']);
$member['has_license_car'] = glyph_bool($member['has_license_car']);
$member['has_license_3_5t_transporter'] = glyph_bool($member['has_license_3_5t_transporter']);

4
includes/view/UserDriverLicenses_view.php
View File

@ -19,10 +19,10 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver
msg(),
form([
form_info(_("Privacy"), _("Your driving license information is only visible for supporters and admins.")),
form_checkbox('wants_to_drive', _("I am willing to operate cars for the PL"), $wants_to_drive),
form_checkbox('wants_to_drive', _("I am willing to drive a car for the event"), $wants_to_drive),
div('panel panel-default', [
div('panel-body', [
form_checkbox('has_car', _("I have my own car with me and am willing to use it for the PL (You'll get reimbursed for fuel)"), $user_driver_license['has_car']),
form_checkbox('has_car', _("I have my own car with me and am willing to use it for the event (You'll get reimbursed for fuel)"), $user_driver_license['has_car']),
heading(_("Driver license"), 3),
form_checkbox('has_license_car', _("Car"), $user_driver_license['has_license_car']),
form_checkbox('has_license_3_5t_transporter', _("Transporter 3,5t"), $user_driver_license['has_license_3_5t_transporter']),

8
locale/de_DE.UTF-8/LC_MESSAGES/default.po
View File

@ -2308,15 +2308,15 @@ msgid ""
msgstr "Deine Führerschein-Infos sind nur für Supporter und Admins sichtbar."
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:22
msgid "I am willing to operate cars for the PL"
msgstr "Ich möchte für die PL Auto fahren"
msgid "I am willing to drive a car for the event"
msgstr "Ich möchte für das Event Auto fahren"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:25
msgid ""
"I have my own car with me and am willing to use it for the PL (You'll get "
"I have my own car with me and am willing to use it for the event (You'll get "
"reimbursed for fuel)"
msgstr ""
"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für die PL "
"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für das Event "
"verwenden (Du wirst für Spritkosten entschädigt)"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:26

4
locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po
View File

@ -2159,12 +2159,12 @@ msgstr ""
"e os admins."
#: includes/view/UserDriverLicenses_view.php:22
msgid "I am willing to operate cars for the PL"
msgid "I am willing to drive a car for the event"
msgstr "Eu desejo dirigir carros para o evento"
#: includes/view/UserDriverLicenses_view.php:25
msgid ""
"I have my own car with me and am willing to use it for the PL (You'll get "
"I have my own car with me and am willing to use it for the event (You'll get "
"reimbursed for fuel)"
msgstr ""
"Eu tenho meu próprio carro e estou disposto a usá-lo no evento\n"