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

clear way more translations

This commit is contained in:
Xu 2023-10-03 21:34:03 +02:00 committed by Igor Scheller
parent fe37258b35
commit 9fb6bd4d10
11 changed files with 53 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/pages/admin_free.php
View File

@ -127,7 +127,7 @@ function admin_free()
'shift_state' => __('Next shift'),
'last_shift' => __('Last shift'),
'dect' => __('general.dect'),
'email' => __('settings.profile.email'),
'email' => __('general.email'),
'actions' => '',
], $free_users_table),
]);

6
includes/pages/admin_user.php
View File

@ -62,7 +62,7 @@ function admin_user()
. ($user_source->last_login_at ? $user_source->last_login_at->format(__('Y-m-d H:i')) : '-')
. '</p></td></tr>' . "\n";
if (config('enable_user_name')) {
$html .= ' <tr><td>' . __('Prename') . '</td><td>' . '<input size="40" name="eName" value="' . $user_source->personalData->last_name . '" class="form-control" maxlength="64"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('settings.profile.firstname') . '</td><td>' . '<input size="40" name="eName" value="' . $user_source->personalData->last_name . '" class="form-control" maxlength="64"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('settings.profile.lastname') . '</td><td>' . '<input size="40" name="eVorname" value="' . $user_source->personalData->first_name . '" class="form-control" maxlength="64"></td></tr>' . "\n";
}
$html .= ' <tr><td>' . __('settings.profile.mobile') . '</td><td>' . '<input type= "tel" size="40" name="eHandy" value="' . $user_source->contact->mobile . '" class="form-control" maxlength="40"></td></tr>' . "\n";
@ -70,7 +70,7 @@ function admin_user()
$html .= ' <tr><td>' . __('general.dect') . '</td><td>' . '<input size="40" name="eDECT" value="' . $user_source->contact->dect . '" class="form-control" maxlength="40"></td></tr>' . "\n";
}
if ($user_source->settings->email_human) {
$html .= ' <tr><td>' . __('settings.profile.email') . '</td><td>' . '<input type="email" size="40" name="eemail" value="' . $user_source->email . '" class="form-control" maxlength="254"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('general.email') . '</td><td>' . '<input type="email" size="40" name="eemail" value="' . $user_source->email . '" class="form-control" maxlength="254"></td></tr>' . "\n";
}
if ($goodie_tshirt) {
$html .= ' <tr><td>' . __('user.shirt_size') . '</td><td>'
@ -90,7 +90,7 @@ function admin_user()
];
// Gekommen?
$html .= ' <tr><td>' . __('Arrived') . '</td><td>' . "\n";
$html .= ' <tr><td>' . __('user.arrived') . '</td><td>' . "\n";
if ($user_source->state->arrived) {
$html .= __('Yes');
} else {

4
includes/view/AngelTypes_view.php
View File

@ -155,7 +155,7 @@ function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
),
form_text('contact_name', __('general.name'), $angeltype->contact_name),
config('enable_dect') ? form_text('contact_dect', __('general.dect'), $angeltype->contact_dect) : '',
form_text('contact_email', __('settings.profile.email'), $angeltype->contact_email),
form_text('contact_email', __('general.email'), $angeltype->contact_email),
form_submit('submit', __('form.save')),
]),
]);
@ -558,7 +558,7 @@ function AngelTypes_render_contact_info(AngelType $angeltype)
$info = [
__('general.name') => [$angeltype->contact_name, $angeltype->contact_name],
__('general.dect') => config('enable_dect') ? [sprintf('<a href="tel:%s">%1$s</a>', $angeltype->contact_dect), $angeltype->contact_dect] : null,
__('settings.profile.email') => [sprintf('<a href="mailto:%s">%1$s</a>', $angeltype->contact_email), $angeltype->contact_email],
__('general.email') => [sprintf('<a href="mailto:%s">%1$s</a>', $angeltype->contact_email), $angeltype->contact_email],
];
$contactInfo = [];
foreach ($info as $name => $data) {

12
includes/view/UserAngelTypes_view.php
View File

@ -28,7 +28,7 @@ function UserAngelType_update_view(UserAngelType $user_angeltype, User $user, An
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
icon('x-lg') . __('form.cancel')
),
form_submit('submit', icon('check-lg') . __('yes'), 'btn-primary', false),
form_submit('submit', icon('check-lg') . __('Yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', [
'action' => 'update',
@ -56,7 +56,7 @@ function UserAngelTypes_delete_all_view(AngelType $angeltype)
),
icon('x-lg') . __('form.cancel')
),
form_submit('deny_all', icon('check-lg') . __('yes'), 'btn-primary', false),
form_submit('deny_all', icon('check-lg') . __('Yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype->id])),
]);
@ -74,7 +74,7 @@ function UserAngelTypes_confirm_all_view(AngelType $angeltype)
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_all', icon('check-lg') . __('yes'), 'btn-primary', false),
form_submit('confirm_all', icon('check-lg') . __('Yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id])),
]);
@ -98,7 +98,7 @@ function UserAngelType_confirm_view(UserAngelType $user_angeltype, User $user, A
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_user', icon('check-lg') . __('yes'), 'btn-primary', false),
form_submit('confirm_user', icon('check-lg') . __('Yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'confirm', 'user_angeltype_id' => $user_angeltype->id])),
]);
@ -122,7 +122,7 @@ function UserAngelType_delete_view(UserAngelType $user_angeltype, User $user, An
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('check-lg') . __('yes'), 'btn-primary', false),
form_submit('delete', icon('check-lg') . __('Yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id])),
], true);
@ -177,7 +177,7 @@ function UserAngelType_join_view($user, AngelType $angeltype)
auth()->can('admin_user_angeltypes') ? form_checkbox('auto_confirm_user', __('Confirm user'), true) : '',
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('submit', icon('check-lg') . __('save'), 'btn-primary', false),
form_submit('submit', icon('check-lg') . __('form.save'), 'btn-primary', false),
]),
], page_link_to(
'user_angeltypes',

6
includes/view/UserDriverLicenses_view.php
View File

@ -26,7 +26,7 @@ function UserDriverLicense_edit_view($user_source, $user_driver_license)
__('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),
heading(__('driving license'), 3),
form_checkbox('has_license_car', __('Car'), $user_driver_license->drive_car),
form_checkbox(
'has_license_3_5t_transporter',
@ -35,12 +35,12 @@ function UserDriverLicense_edit_view($user_source, $user_driver_license)
),
form_checkbox(
'has_license_7_5t_truck',
__('Truck 7,5t'),
__('7.5t Truck'),
$user_driver_license->drive_7_5t
),
form_checkbox(
'has_license_12t_truck',
__('Truck 12t'),
__('12t Truck'),
$user_driver_license->drive_12t
),
form_checkbox(

20
includes/view/User_view.php
View File

@ -135,8 +135,8 @@ function Users_view(
$user_table_headers['name'] = Users_table_header_link('name', __('general.nick'), $order_by);
}
if (config('enable_user_name')) {
$user_table_headers['first_name'] = Users_table_header_link('first_name', __('Prename'), $order_by);
$user_table_headers['last_name'] = Users_table_header_link('last_name', __('general.name'), $order_by);
$user_table_headers['first_name'] = Users_table_header_link('first_name', __('settings.profile.firstname'), $order_by);
$user_table_headers['last_name'] = Users_table_header_link('last_name', __('settings.profile.lastname'), $order_by);
}
if (config('enable_dect')) {
$user_table_headers['dect'] = Users_table_header_link('dect', __('general.dect'), $order_by);
@ -146,7 +146,7 @@ function Users_view(
$user_table_headers['got_voucher'] = Users_table_header_link('got_voucher', __('Voucher'), $order_by);
}
$user_table_headers['freeloads'] = Users_table_header_link('freeloads', __('Freeloads'), $order_by);
$user_table_headers['active'] = Users_table_header_link('active', __('Active'), $order_by);
$user_table_headers['active'] = Users_table_header_link('active', __('user.active'), $order_by);
$user_table_headers['force_active'] = Users_table_header_link('force_active', __('Forced'), $order_by);
if ($goodie_enabled) {
if ($goodie_tshirt) {
@ -209,7 +209,7 @@ function User_shift_state_render($user)
$upcoming_shifts = ShiftEntries_upcoming_for_user($user);
if ($upcoming_shifts->isEmpty()) {
return '<span class="text-success">' . __('Free') . '</span>';
return '<span class="text-success">' . __('free') . '</span>';
}
/** @var ShiftEntry $nextShiftEntry */
@ -514,11 +514,11 @@ function User_view(
);
if (count($my_shifts) > 0) {
$myshifts_table = div('table-responsive', table([
'date' => __('Day &amp; time'),
'date' => __('Day & Time'),
'duration' => __('Duration'),
'room' => __('Location'),
'shift_info' => __('Name &amp; workmates'),
'comment' => __('Comment'),
'shift_info' => __('Name & Workmates'),
'comment' => __('worklog.comment'),
'actions' => __('Action'),
], $my_shifts));
} elseif ($user_source->state->force_active) {
@ -699,7 +699,7 @@ function User_view_state_user($user_source)
];
if ($user_source->state->arrived) {
$state[] = '<span class="text-success">' . icon('house') . __('Arrived') . '</span>';
$state[] = '<span class="text-success">' . icon('house') . __('user.arrived') . '</span>';
} else {
$state[] = '<span class="text-danger">' . __('Not arrived') . '</span>';
}
@ -737,9 +737,9 @@ function User_view_state_admin($freeloader, $user_source)
. '</span>';
if ($user_source->state->force_active) {
$state[] = '<span class="text-success">' . __('Active (forced)') . '</span>';
$state[] = '<span class="text-success">' . __('user.force_active') . '</span>';
} elseif ($user_source->state->active) {
$state[] = '<span class="text-success">' . __('Active') . '</span>';
$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>';

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

@ -908,6 +908,15 @@ msgstr "nächste 8h"
msgid "iCal export and API"
msgstr "iCal Export und API"
msgid ""
"Export your own shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
"\">JSON format</a> available (please keep secret, otherwise <a href=\"%s"
"\">reset the api key</a>)."
msgstr ""
"Exportiere Deine Schichten. <a href=\"%s\">iCal Format</a> oder <a href=\"%s"
"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
"\">API-Key zurücksetzen</a>)."
msgid "Show API Key"
msgstr "API Key anzeigen"
@ -1194,9 +1203,6 @@ msgstr "Schichttyp bearbeiten"
msgid "Create shifttype"
msgstr "Schichttyp erstellen"
msgid "for team %s"
msgstr "für Team %s"
msgid "New shifttype"
msgstr "Neuer Schichttyp"
@ -1219,9 +1225,6 @@ msgstr "Sollen %s %s als neuen Supporter bekommen?"
msgid "Do you really want to remove supporter rights for %s from %s?"
msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?"
msgid "yes"
msgstr "Ja"
msgid "Do you really want to deny all users for %s?"
msgstr "Möchtest Du wirklich alle Benutzer als %s ablehnen?"
@ -1243,9 +1246,6 @@ msgstr "Benutzer bestätigen"
msgid "Hide at Registration"
msgstr "Ausblenden bei Registrierung"
msgid "save"
msgstr "Speichern"
msgid "Back to profile"
msgstr "Zurück zum Profil"
@ -1266,36 +1266,6 @@ msgstr ""
"Ich habe mein eigenes Auto dabei und möchte es zum Fahren für das Event "
"verwenden (Du wirst für Spritkosten entschädigt)"
msgid "Driver license"
msgstr "Führerschein"
msgid "Truck 7,5t"
msgstr "7,5t LKW"
msgid "Truck 12t"
msgstr "12t LKW"
msgid "Do you want to delete the worklog entry for %s?"
msgstr "Möchtest du den Arbeitseinsatz von %s wirklich löschen?"
msgid "Comment"
msgstr "Kommentar"
msgid "Pronoun"
msgstr "Pronomen"
msgid "Will be shown on your profile page and in angel lists."
msgstr "Wird auf deiner Profilseite und in Engellisten angezeigt."
msgid "Here you can change your user details."
msgstr "Hier kannst Du Deine Details ändern."
msgid "Planned date of departure"
msgstr "Geplanter Abreisetag"
msgid "You can manage your Angeltypes <a href=\"%s\">on the Angeltypes page</a>."
msgstr "Du kannst deine Engeltypen <a href=\"%s\">auf der Engeltypen-Seite</a> verwalten."
msgid ""
"Do you really want to delete the user including all his shifts and every "
"other piece of his data?"
@ -1315,21 +1285,12 @@ msgstr "Engel kann noch %d Gutscheine bekommen und ist FA."
msgid "Number of vouchers given out"
msgstr "Anzahl Gutscheine bekommen"
msgid "Prename"
msgstr "Vorname"
msgid "Arrived"
msgstr "Angekommen"
msgid "Voucher"
msgstr "Gutschein"
msgid "Freeloads"
msgstr "Schwänzereien"
msgid "Active"
msgstr "Aktiv"
msgid "T-Shirt"
msgstr "T-Shirt"
@ -1339,9 +1300,6 @@ msgstr "Letzter Login"
msgid "New user"
msgstr "Neuer User"
msgid "Free"
msgstr "Frei"
msgid "Next shift %c"
msgstr "Nächste Schicht %c"
@ -1369,14 +1327,14 @@ msgstr "Arbeitseinsatz"
msgid "Added by %s at %s"
msgstr "Erstellt von %s am %s"
msgid "Day &amp; time"
msgstr "Tag &amp; Zeit"
msgid "Day & Time"
msgstr "Tag & Zeit"
msgid "Duration"
msgstr "Dauer"
msgid "Name &amp; workmates"
msgstr "Name &amp; Kollegen"
msgid "Name & Workmates"
msgstr "Name & Kollegen"
msgid "Action"
msgstr "Aktion"
@ -1418,9 +1376,6 @@ msgstr "Schwänzer"
msgid "Arrived at %s"
msgstr "Angekommen am %s"
msgid "Active (forced)"
msgstr "Aktiv (erzwungen)"
msgid "Not arrived (Planned: %s)"
msgstr "Nicht angekommen (Geplant: %s)"
@ -1433,12 +1388,16 @@ msgstr "Keine Gutscheine bekommen"
msgid "out of %s"
msgstr "von %s"
msgid "Show mobile number to other users to contact me"
msgstr "Mache meine Handynummer für andere Benutzer sichtbar"
msgid "Rights"
msgstr "Rechte"
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."
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."
msgid ""
"Please enter your planned date of departure on your settings page to give us "
"a feeling for teardown capacities."
@ -1453,13 +1412,6 @@ msgstr ""
"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
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."
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."
msgid "You need to specify a tshirt size in your settings!"
msgstr "Bitte eine T-Shirt-Größe auswählen"
@ -1483,13 +1435,6 @@ msgstr ""
"Ist der Engel Aktiv, hat er damit Anspruch auf ein T-Shirt. Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, "
"dass der Engel bereits sein T-Shirt erhalten hat."
msgid ""
"If the angel was Active, this entitles him to a T-shirt. If T-shirt contains a 'Ja', "
"it means that the angel has already received his T-shirt."
msgstr ""
"War der Engel Aktiv, hat er damit Anspruch auf ein T-Shirt. Wenn T-Shirt ein 'Ja' enthält, "
"bedeutet dies, dass der Engel bereits sein T-Shirt erhalten hat."
msgid "Please visit the angeltypes page or the users profile to manage the users angeltypes."
msgstr "Bitte besuche die Seite Engeltypen oder das Benutzerprofil, um die Engeltypen des Benutzers zu verwalten."
@ -1556,13 +1501,6 @@ msgstr ""
"Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um "
"Zugriff zu erhalten!"
msgid "form.select_placeholder"
msgstr "Bitte auswählen..."
@ -1765,7 +1703,7 @@ msgstr "Mache meine Handynummer für andere Benutzer sichtbar."
msgid "settings.profile.email-preferences"
msgstr "E-Mail Einstellungen"
msgid "settings.profile.email"
msgid "general.email"
msgstr "E-Mail"
msgid "settings.profile.email.already-taken"

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

@ -265,7 +265,7 @@ msgstr "Show mobile number to other users to contact me."
msgid "settings.profile.email-preferences"
msgstr "E-Mail preferences"
msgid "settings.profile.email"
msgid "general.email"
msgstr "E-Mail"
msgid "settings.profile.email.already-taken"

2
resources/views/pages/password/reset.twig
View File

@ -17,7 +17,7 @@
{{ csrf() }}
{{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }}
{{ f.input('email', __('settings.profile.email'), {
{{ f.input('email', __('general.email'), {
'type': 'email',
'required': true,
}) }}

4
resources/views/pages/settings/profile.twig
View File

@ -18,7 +18,7 @@
<div class="row g-4">
<div class="col-lg-6">
{{ f.input('nick', __('settings.profile.nick'), {
{{ f.input('nick', __('general.nick'), {
'value': user.name,
'disabled': true,
}) }}
@ -100,7 +100,7 @@
<div class="row g-4">
<div class="col-md-6">
{{ f.input('email', __('settings.profile.email'), {
{{ f.input('email', __('general.email'), {
'type': 'email',
'value': user.email,
'max_length': 254,

6
resources/views/pages/sign-up.twig
View File

@ -34,7 +34,7 @@
<div class="col-md-6">
{{ f.input(
'username',
__('settings.profile.nick'),
__('general.nick'),
{
'autocomplete': 'nickname',
'max_length': 24,
@ -80,7 +80,7 @@
<div class="col-md-6">
{{ f.input(
'email',
__('settings.profile.email'),
__('general.email'),
{
'type': 'email',
'max_length': 254,
@ -255,7 +255,7 @@
<div class="col-md-6">
{{ f.input(
"dect",
__("settings.profile.dect"),
__('general.dect'),
{
'type': 'tel-local',
'max_length': 40,