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

unify T-shirt wording

This commit is contained in:
Xu 2023-11-16 16:11:45 +01:00 committed by Igor Scheller
parent 66738298a9
commit 7fda1fc14b
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/pages/admin_active.php
View File

@ -133,7 +133,7 @@ function admin_active()
$user_source->state->got_shirt = true;
$user_source->state->save();
engelsystem_log('User ' . User_Nick_render($user_source, true) . ' has tshirt now.');
$msg = success(($goodie_tshirt ? __('Angel has got a t-shirt.') : __('Angel has got a goodie.')), true);
$msg = success(($goodie_tshirt ? __('Angel has got a T-shirt.') : __('Angel has got a goodie.')), true);
} else {
$msg = error('Angel not found.', true);
}
@ -144,7 +144,7 @@ function admin_active()
$user_source->state->got_shirt = false;
$user_source->state->save();
engelsystem_log('User ' . User_Nick_render($user_source, true) . ' has NO tshirt.');
$msg = success(($goodie_tshirt ? __('Angel has got no t-shirt.') : __('Angel has got no goodie.')), true);
$msg = success(($goodie_tshirt ? __('Angel has got no T-shirt.') : __('Angel has got no goodie.')), true);
} else {
$msg = error(__('Angel not found.'), true);
}
@ -268,7 +268,7 @@ function admin_active()
if ($goodie_enabled) {
$actions[] = form(
[form_submit('submit', ($goodie_tshirt ? __('got t-shirt') : __('got goodie')), 'btn-sm', false, 'secondary')],
[form_submit('submit', ($goodie_tshirt ? __('got T-shirt') : __('got goodie')), 'btn-sm', false, 'secondary')],
url('/admin-active', $parametersShirt),
false,
true
@ -286,7 +286,7 @@ function admin_active()
if ($goodie_enabled) {
$actions[] = form(
[form_submit('submit', ($goodie_tshirt ? __('remove t-shirt') : __('remove goodie')), 'btn-sm', false, 'secondary')],
[form_submit('submit', ($goodie_tshirt ? __('remove T-shirt') : __('remove goodie')), 'btn-sm', false, 'secondary')],
url('/admin-active', $parameters),
false,
true
@ -355,10 +355,10 @@ function admin_active()
),
$matched_users
),
$goodie_enabled ? '<h2>' . ($goodie_tshirt ? __('Shirt statistic') : __('Goodie statistic')) . '</h2>' : '',
$goodie_enabled ? '<h2>' . ($goodie_tshirt ? __('T-shirt statistic') : __('Goodie statistic')) . '</h2>' : '',
$goodie_enabled ? table(array_merge(
($goodie_tshirt ? ['size' => __('Size')] : []),
['given' => $goodie_tshirt ? __('Given shirts') : __('Given goodies') ]
['given' => $goodie_tshirt ? __('Given T-shirts') : __('Given goodies') ]
), $goodie_statistics) : '',
]);
}

2
includes/pages/admin_user.php
View File

@ -111,7 +111,7 @@ function admin_user()
if ($goodie_enabled) {
// T-Shirt bekommen?
if ($goodie_tshirt) {
$html .= ' <tr><td>' . __('T-Shirt') . '</td><td>' . "\n";
$html .= ' <tr><td>' . __('T-shirt') . '</td><td>' . "\n";
} else {
$html .= ' <tr><td>' . __('Goodie') . '</td><td>' . "\n";
}

4
includes/view/User_view.php
View File

@ -411,7 +411,7 @@ function User_view_myshifts(
];
if ($goodie_enabled && ($its_me || $tshirt_admin)) {
$myshifts_table[] = [
'date' => '<b>' . ($goodie_tshirt ? __('Your t-shirt score') : __('Your goodie score')) . '&trade;:</b>',
'date' => '<b>' . ($goodie_tshirt ? __('Your T-shirt score') : __('Your goodie score')) . '&trade;:</b>',
'duration' => '<b>' . $tshirt_score . '</b>',
'location' => '',
'shift_info' => '',
@ -734,7 +734,7 @@ function User_view_state_admin($freeloader, $user_source)
$state[] = '<span class="text-success">' . __('user.active') . '</span>';
}
if ($user_source->state->got_shirt && $goodie_enabled) {
$state[] = '<span class="text-success">' . ($goodie_tshirt ? __('T-Shirt') : __('Goodie')) . '</span>';
$state[] = '<span class="text-success">' . ($goodie_tshirt ? __('T-shirt') : __('Goodie')) . '</span>';
}
} else {
$arrivalDate = $user_source->personalData->planned_arrival_date;

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

@ -544,10 +544,10 @@ msgstr "Engel nicht gefunden."
msgid "Angel has been marked as not active."
msgstr "Engel wurde als nicht aktiv markiert."
msgid "Angel has got a t-shirt."
msgid "Angel has got a T-shirt."
msgstr "Engel hat ein T-Shirt bekommen."
msgid "Angel has got no t-shirt."
msgid "Angel has got no T-shirt."
msgstr "Engel hat kein T-Shirt bekommen."
msgid "set active"
@ -556,10 +556,10 @@ msgstr "setze aktiv"
msgid "remove active"
msgstr "entferne aktiv"
msgid "got t-shirt"
msgid "got T-shirt"
msgstr "T-Shirt bekommen"
msgid "remove t-shirt"
msgid "remove T-shirt"
msgstr "entferne T-Shirt"
msgid "Sum"
@ -595,10 +595,10 @@ msgstr "Erzwungen"
msgid "T-shirt?"
msgstr "T-Shirt?"
msgid "Shirt statistic"
msgid "T-shirt statistic"
msgstr "T-Shirt Statistik"
msgid "Given shirts"
msgid "Given T-shirts"
msgstr "Ausgegebene T-Shirts"
msgid "Arrive angels"
@ -1228,7 +1228,7 @@ msgstr "Gutschein"
msgid "Freeloads"
msgstr "Schwänzereien"
msgid "T-Shirt"
msgid "T-shirt"
msgstr "T-Shirt"
msgid "Last login"
@ -1252,7 +1252,7 @@ msgstr "austragen"
msgid "Sum:"
msgstr "Summe:"
msgid "Your t-shirt score"
msgid "Your T-shirt score"
msgstr "Dein T-Shirt Score"
msgid "Work log entry"
@ -1676,7 +1676,7 @@ msgstr "Erlaube Himmel-Engeln mich per E-Mail zu kontaktieren."
msgid "settings.profile.email_goody"
msgstr "Um gegebenenfalls Voucher für das nächste gleichartige Event zu erhalten stimme ich zu, "
"dass mein Nick, E-Mail-Adresse, geleistete Arbeit und Shirt-Größe solange gespeichert werden."
"dass mein Nick, E-Mail-Adresse, geleistete Arbeit und T-Shirt-Größe solange gespeichert werden."
msgid "settings.profile.privacy"
msgstr "Dies kann jederzeit durch eine E-Mail an <a href=\"mailto:%s\">%1$s</a> widerrufen werden."
@ -1875,16 +1875,16 @@ msgid "question.delete.title"
msgstr "Frage \"%s\" löschen"
msgid "user.edit.shirt"
msgstr "Shirt bearbeiten"
msgstr "T-Shirt bearbeiten"
msgid "user.edit.goodie"
msgstr "Goodie bearbeiten"
msgid "form.shirt"
msgstr "Shirt"
msgstr "T-Shirt"
msgid "user.shirt_size"
msgstr "Shirt größe"
msgstr "T-Shirt größe"
msgid "user.active"
msgstr "Aktiv"
@ -1896,7 +1896,7 @@ msgid "user.arrived"
msgstr "Angekommen"
msgid "user.got_shirt"
msgstr "Shirt bekommen"
msgstr "T-Shirt bekommen"
msgid "user.got_goodie"
msgstr "Goodie bekommen"

4
resources/lang/en_US/additional.po
View File

@ -63,10 +63,10 @@ msgid "validation.password_confirmation.required"
msgstr "You have to confirm your password."
msgid "validation.tshirt_size.required"
msgstr "Please choose your t-shirt size."
msgstr "Please choose your T-shirt size."
msgid "validation.tshirt_size.shirtSize"
msgstr "Please choose a valid t-shirt size."
msgstr "Please choose a valid T-shirt size."
msgid "validation.planned_arrival_date.required"
msgstr "Please enter your planned date of arrival."

14
resources/lang/en_US/default.po
View File

@ -291,13 +291,13 @@ msgstr "Allow heaven angels to contact me by e-mail."
msgid "settings.profile.email_goody"
msgstr "To possibly receive vouchers for the next similar event, I consent "
"that my nick, e-mail address, worked hours and shirt size will be stored until then."
"that my nick, e-mail address, worked hours and T-shirt size will be stored until then."
msgid "settings.profile.privacy"
msgstr "To withdraw your approval, send an e-mail to <a href=\"mailto:%s\">%1$s</a>."
msgid "settings.profile.shirt_size"
msgstr "Shirt size"
msgstr "T-shirt size"
msgid "settings.profile.angeltypes.info"
msgstr "You can manage your Angeltypes <a href=\"%s\">on the Angeltypes page</a>."
@ -490,16 +490,16 @@ msgid "question.delete.title"
msgstr "Delete question \"%s\""
msgid "user.edit.shirt"
msgstr "Edit shirt"
msgstr "Edit T-shirt"
msgid "user.edit.goodie"
msgstr "Edit goodie"
msgid "form.shirt"
msgstr "Shirt"
msgstr "T-shirt"
msgid "user.shirt_size"
msgstr "Shirt size"
msgstr "T-shirt size"
msgid "user.active"
msgstr "Active"
@ -511,7 +511,7 @@ msgid "user.arrived"
msgstr "Arrived"
msgid "user.got_shirt"
msgstr "Got shirt"
msgstr "Got T-shirt"
msgid "user.got_goodie"
msgstr "Got goodie"
@ -641,7 +641,7 @@ msgid "registration.register"
msgstr "Register"
msgid "tshirt.required.hint"
msgstr "Please specify a tshirt size in your settings!"
msgstr "Please specify a T-shirt size in your settings!"
msgid "dect.required.hint"
msgstr ""

0
resources/lang/pt_BR/default.po
View File