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

clear even more translations

This commit is contained in:
Xu 2023-10-03 18:59:46 +02:00 committed by Igor Scheller
parent 6195692d3d
commit fe37258b35
13 changed files with 32 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/pages/admin_user.php
View File

@ -57,15 +57,15 @@ function admin_user()
$html .= '<input type="hidden" name="Type" value="Normal">' . "\n";
$html .= '<tr><td>' . "\n";
$html .= '<table>' . "\n";
$html .= ' <tr><td>' . __('nick.nick') . '</td><td>' . '<input size="40" name="eNick" value="' . $user_source->name . '" class="form-control" maxlength="24"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('general.nick') . '</td><td>' . '<input size="40" name="eNick" value="' . $user_source->name . '" class="form-control" maxlength="24"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('Last login') . '</td><td><p class="help-block">'
. ($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>' . __('Last name') . '</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.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>' . __('Mobile') . '</td><td>' . '<input type= "tel" size="40" name="eHandy" value="' . $user_source->contact->mobile . '" class="form-control" maxlength="40"></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";
if (config('enable_dect')) {
$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";
}

4
includes/sys_menu.php
View File

@ -63,8 +63,8 @@ function make_navigation()
$page = current_page();
$menu = [];
$pages = [
'news' => __('News'),
'meetings' => [__('Meetings'), 'user_meetings'],
'news' => __('news.title'),
'meetings' => [__('news.title.meetings'), 'user_meetings'],
'user_shifts' => __('Shifts'),
'angeltypes' => __('angeltypes.angeltypes'),
'questions' => [__('Ask the Heaven'), 'question.add'],

8
includes/view/AngelTypes_view.php
View File

@ -64,7 +64,7 @@ function AngelType_delete_view(AngelType $angeltype)
info(sprintf(__('Do you want to delete angeltype %s?'), $angeltype->name), true),
form([
buttons([
button(page_link_to('angeltypes'), icon('x-lg') . __('cancel')),
button(page_link_to('angeltypes'), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('trash') . __('delete'), 'btn-danger', false),
]),
]),
@ -362,7 +362,7 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
function AngelType_view_table_headers(AngelType $angeltype, $supporter, $admin_angeltypes)
{
$headers = [
'name' => __('nick.nick'),
'name' => __('general.nick'),
];
if (config('enable_dect')) {
@ -374,8 +374,8 @@ function AngelType_view_table_headers(AngelType $angeltype, $supporter, $admin_a
'wants_to_drive' => __('Driver'),
'has_car' => __('Has car'),
'has_license_car' => __('Car'),
'has_license_3_5t_transporter' => __('3,5t Transporter'),
'has_license_7_5t_truck' => __('7,5t Truck'),
'has_license_3_5t_transporter' => __('3.5t Transporter'),
'has_license_7_5t_truck' => __('7.5t Truck'),
'has_license_12t_truck' => __('12t Truck'),
'has_license_forklift' => __('Forklift'),
]);

4
includes/view/ShiftCalendarRenderer.php
View File

@ -244,7 +244,7 @@ class ShiftCalendarRenderer
$time_slot = [
div('header ' . $bg, [
__('Time'),
__('log.time'),
]),
];
for ($block = 0; $block < $this->getBlocksPerSlot(); $block++) {
@ -314,7 +314,7 @@ class ShiftCalendarRenderer
badge(__('Help needed'), 'danger'),
badge(__('Other angeltype needed / collides with my shifts'), 'warning'),
badge(__('Shift is full'), 'success'),
badge(__('Shift running/ended or you have not arrived'), 'secondary'),
badge(__('Shift is running/ended or you have not arrived'), 'secondary'),
]);
}
}

4
includes/view/ShiftEntry_view.php
View File

@ -27,7 +27,7 @@ function ShiftEntry_delete_view_admin(Shift $shift, AngelType $angeltype, User $
), true),
form([
buttons([
button(user_link($signoff_user->id), icon('x-lg') . __('cancel')),
button(user_link($signoff_user->id), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('trash') . __('sign off'), 'btn-danger', false),
]),
]),
@ -56,7 +56,7 @@ function ShiftEntry_delete_view(Shift $shift, AngelType $angeltype, User $signof
form([
buttons([
button(user_link($signoff_user->id), icon('x-lg') . __('cancel')),
button(user_link($signoff_user->id), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('trash') . __('delete'), 'btn-danger', false),
]),
]),

2
includes/view/ShiftTypes_view.php
View File

@ -25,7 +25,7 @@ function ShiftType_delete_view(ShiftType $shifttype)
info(sprintf(__('Do you want to delete shifttype %s?'), $shifttype->name), true),
form([
buttons([
button(page_link_to('shifttypes'), icon('x-lg') . __('cancel')),
button(page_link_to('shifttypes'), icon('x-lg') . __('form.cancel')),
form_submit(
'delete',
icon('trash') . __('delete'),

12
includes/view/UserAngelTypes_view.php
View File

@ -26,7 +26,7 @@ function UserAngelType_update_view(UserAngelType $user_angeltype, User $user, An
buttons([
button(
page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype->id]),
icon('x-lg') . __('cancel')
icon('x-lg') . __('form.cancel')
),
form_submit('submit', icon('check-lg') . __('yes'), 'btn-primary', false),
]),
@ -54,7 +54,7 @@ function UserAngelTypes_delete_all_view(AngelType $angeltype)
'angeltypes',
['action' => 'view', 'angeltype_id' => $angeltype->id]
),
icon('x-lg') . __('cancel')
icon('x-lg') . __('form.cancel')
),
form_submit('deny_all', icon('check-lg') . __('yes'), 'btn-primary', false),
]),
@ -73,7 +73,7 @@ function UserAngelTypes_confirm_all_view(AngelType $angeltype)
info(sprintf(__('Do you really want to confirm all users for %s?'), $angeltype->name), true),
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('cancel')),
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_all', icon('check-lg') . __('yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype->id])),
@ -97,7 +97,7 @@ function UserAngelType_confirm_view(UserAngelType $user_angeltype, User $user, A
), true),
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('cancel')),
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('confirm_user', icon('check-lg') . __('yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'confirm', 'user_angeltype_id' => $user_angeltype->id])),
@ -121,7 +121,7 @@ function UserAngelType_delete_view(UserAngelType $user_angeltype, User $user, An
), true),
form([
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('cancel')),
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('delete', icon('check-lg') . __('yes'), 'btn-primary', false),
]),
], page_link_to('user_angeltypes', ['action' => 'delete', 'user_angeltype_id' => $user_angeltype->id])),
@ -176,7 +176,7 @@ function UserAngelType_join_view($user, AngelType $angeltype)
form([
auth()->can('admin_user_angeltypes') ? form_checkbox('auto_confirm_user', __('Confirm user'), true) : '',
buttons([
button(angeltype_link($angeltype->id), icon('x-lg') . __('cancel')),
button(angeltype_link($angeltype->id), icon('x-lg') . __('form.cancel')),
form_submit('submit', icon('check-lg') . __('save'), 'btn-primary', false),
]),
], page_link_to(

2
includes/view/UserDriverLicenses_view.php
View File

@ -30,7 +30,7 @@ function UserDriverLicense_edit_view($user_source, $user_driver_license)
form_checkbox('has_license_car', __('Car'), $user_driver_license->drive_car),
form_checkbox(
'has_license_3_5t_transporter',
__('Transporter 3,5t'),
__('3.5t Transporter'),
$user_driver_license->drive_3_5t
),
form_checkbox(

4
includes/view/User_view.php
View File

@ -132,7 +132,7 @@ function Users_view(
$user_table_headers = [];
if (!config('display_full_name')) {
$user_table_headers['name'] = Users_table_header_link('name', __('nick.nick'), $order_by);
$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);
@ -589,7 +589,7 @@ function User_view(
$its_me ? table_buttons([
button(
page_link_to('settings/profile'),
icon('person-fill-gear') . __('Settings')
icon('person-fill-gear') . __('settings.settings')
),
$auth->can('ical') ? button(
page_link_to('ical', ['key' => $user_source->api_key]),

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

@ -812,113 +812,15 @@ msgstr "Nein"
msgid "Force active"
msgstr "Aktiv erzwingen"
msgid ""
"Please visit the angeltypes page or the users profile to manage users "
"angeltypes."
msgstr ""
"Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
msgid "Edit user"
msgstr "User bearbeiten"
msgid "Please enter a nickname."
msgstr "Gib bitte einen Nick an."
msgid "E-mail address is not correct."
msgstr "Die E-Mail Adresse ist nicht in Ordnung."
msgid "E-mail address is already used by another user."
msgstr "Die E-Mail Adresse wurde bereits von einem anderen User benutzt."
msgid "Please enter your e-mail."
msgstr "Bitte gib Deine E-Mail-Adresse ein."
msgid "Please select your shirt size."
msgstr "Bitte wähle Deine T-Shirt Größe."
msgid "Your password is too short (please use at least %s characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
msgid ""
"Please enter your planned date of arrival. It should be after the buildup "
"start date and before teardown end date."
msgstr ""
"Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn "
"und vor dem Abbauende liegen."
msgid "For dect numbers are only 40 digits allowed."
msgstr "Die DECT Nummer darf nur 40 Zeichen lang sein."
msgid "Angel registration successful!"
msgstr "Engel-Registrierung erfolgreich!"
msgid ""
"By completing this form you're registering as a Chaos-Angel. This script "
"will create you an account in the angel task scheduler."
msgstr ""
"Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
"der Engel-Aufgabenverwaltung."
msgid "Allow heaven angels to contact you by e-mail."
msgstr "Erlaube Himmel-Engeln dich per Mail zu kontaktieren."
msgid "To withdraw your approval, send an email to <a href=\"mailto:%s\">%1$s</a>."
msgstr "Dies kann jederzeit durch eine E-Mail an <a href=\"mailto:%s\">%1$s</a> widerrufen werden."
msgid "Mobile"
msgstr "Handy"
msgid "First name"
msgstr "Vorname"
msgid "Last name"
msgstr "Nachname"
msgid "Entry required!"
msgstr "Pflichtfeld!"
msgid "Select recipient..."
msgstr "Empfänger auswählen..."
msgid "Send"
msgstr "Senden"
msgid "Y-m-d H:i"
msgstr "d.m.Y H:i"
msgid "Y-m-d H:i:s"
msgstr "d.m.Y H:i:s"
msgid "mark as read"
msgstr "als gelesen markieren"
msgid "delete message"
msgstr "Nachricht löschen"
msgid "Hello %s, here can you leave messages for other angels"
msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben."
msgid "New"
msgstr "Neu"
msgid "Transmitted"
msgstr "Gesendet"
msgid "Recipient"
msgstr "Empfänger"
msgid "Incomplete call, missing Message ID."
msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
msgid "No Message found."
msgstr "Keine Nachricht gefunden."
msgid "Transmitting was terminated with an Error."
msgstr "Übertragung wurde mit einem Fehler abgebrochen."
msgid "Wrong action."
msgstr "Falsche Aktion."
msgid "Key changed."
msgstr "Key geändert."
@ -942,43 +844,9 @@ msgstr "Gib bitte einen Schwänz-Kommentar ein!"
msgid "Shift saved."
msgstr "Schicht gespeichert."
msgid "News"
msgstr "News"
msgid "Meetings"
msgstr "Treffen"
msgid "Ask the Heaven"
msgstr "Frag den Himmel"
msgid "You question was saved."
msgstr "Frage gespeichert."
msgid "Please enter a question!"
msgstr "Gib eine Frage ein!"
msgid "Incomplete call, missing Question ID."
msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
msgid "No question found."
msgstr "Keine Frage gefunden."
msgid "Settings"
msgstr "Einstellungen"
msgid ""
"Please enter your planned date of departure. It should be after your planned "
"arrival date and after buildup start date and before teardown end date."
msgstr ""
"Bitte gibt dein geplantes Abreisedatum an. Es sollte nach Deinem "
"Anreisedatum, nach dem Aufbaubeginn und vor dem Abbauende liegen."
msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen."
msgid "Your password is to short (please use at least 6 characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
msgid "The administration has not configured any locations yet."
msgstr "Die Administratoren habe noch keine Orte eingerichtet."
@ -1040,15 +908,6 @@ 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"
@ -1059,7 +918,7 @@ msgid "None"
msgstr "Keine"
msgid "Logout"
msgstr "Logout"
msgstr "Abmelden"
msgid "Admin"
msgstr "Admin"
@ -1082,9 +941,6 @@ msgstr "Mitglied"
msgid "Do you want to delete angeltype %s?"
msgstr "Möchtest Du den Engeltypen %s löschen?"
msgid "cancel"
msgstr "abbrechen"
msgid "angeltypes.restricted"
msgstr "Benötigt Einführung"
@ -1153,10 +1009,10 @@ msgstr "Hat Auto"
msgid "Car"
msgstr "Auto"
msgid "3,5t Transporter"
msgid "3.5t Transporter"
msgstr "3,5t Transporter"
msgid "7,5t Truck"
msgid "7.5t Truck"
msgstr "7,5t LKW"
msgid "12t Truck"
@ -1186,15 +1042,9 @@ msgstr "Alle ablehnen"
msgid "New angeltype"
msgstr "Neuer Engeltyp"
msgid "Self Sign Up Allowed"
msgstr "Selbst-Eintragen erlaubt"
msgid "Membership"
msgstr "Mitgliedschaft"
msgid "FAQ"
msgstr "FAQ"
msgid "Event Name"
msgstr "Event Name"
@ -1240,18 +1090,9 @@ msgstr "Vollbild"
msgid "Filtered"
msgstr "Filtern"
msgid "Open questions"
msgstr "Offene Fragen"
msgid "Your Question:"
msgstr "Deine Frage:"
msgid "No shifts found."
msgstr "Keine Schichten gefunden."
msgid "Time"
msgstr "Zeit"
msgid "Your shift"
msgstr "Meine Schicht"
@ -1264,11 +1105,11 @@ msgstr "Andere Engeltypen benötigt / kollidiert mit meinen Schichten"
msgid "Shift is full"
msgstr "Schicht ist voll"
msgid "Shift running/ended or you have not arrived"
msgid "Shift is running/ended or you have not arrived"
msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
msgid "Add more angels"
msgstr "Neue Engel hinzufügen"
msgstr "Mehr Engel hinzufügen"
msgid "%d helper needed"
msgid_plural "%d helpers needed"
@ -1428,9 +1269,6 @@ msgstr ""
msgid "Driver license"
msgstr "Führerschein"
msgid "Transporter 3,5t"
msgstr "3,5t Transporter"
msgid "Truck 7,5t"
msgstr "7,5t LKW"
@ -1894,7 +1732,7 @@ msgstr "Einstellungen"
msgid "settings.profile.entry_required"
msgstr "Pflichtfeld"
msgid "nick.nick"
msgid "general.nick"
msgstr "Nick"
msgid "settings.profile.nick.already-taken"

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

@ -232,7 +232,7 @@ msgstr "Settings"
msgid "settings.profile.entry_required"
msgstr "Entry required"
msgid "nick.nick"
msgid "general.nick"
msgstr "Nick"
msgid "settings.profile.nick.already-taken"

2
resources/views/layouts/parts/navbar.twig
View File

@ -92,7 +92,7 @@
{% endif %}
{% if has_permission_to('user_settings') %}
{{ _self.dropdown_item(__('Settings'), url('settings/profile'), 'settings/profile', m.icon('person-fill-gear')) }}
{{ _self.dropdown_item(__('settings.settings'), url('settings/profile'), 'settings/profile', m.icon('person-fill-gear')) }}
{% endif %}
{% if has_permission_to('logout') %}

2
resources/views/pages/login.twig
View File

@ -51,7 +51,7 @@
type="text"
name="login"
value=""
placeholder="{{ __('nick.nick') }}"
placeholder="{{ __('general.nick') }}"
autofocus>
</div>
</div>