cleaning translations

This commit is contained in:
Xu 2023-10-01 22:33:58 +02:00 committed by Igor Scheller
parent 38838352e2
commit aeea3067b0
25 changed files with 38 additions and 74 deletions

View File

@ -17,7 +17,7 @@ use Illuminate\Support\Collection;
*/ */
function angeltypes_title() function angeltypes_title()
{ {
return __('Angeltypes'); return __('angeltypes.angeltypes');
} }
/** /**

View File

@ -117,7 +117,7 @@ function event_config_edit_controller()
$teardown_end_date ? $teardown_end_date->format('Y-m-d H:i') : '' $teardown_end_date ? $teardown_end_date->format('Y-m-d H:i') : ''
) )
); );
success(__('Settings saved.')); success(__('settings.success'));
throw_redirect(page_link_to('admin_event_config')); throw_redirect(page_link_to('admin_event_config'));
} }
} }

View File

@ -208,7 +208,7 @@ function shift_edit_controller()
. '</noscript>', . '</noscript>',
form([ form([
form_select('shifttype_id', __('Shifttype'), $shifttypes, $shifttype_id), form_select('shifttype_id', __('Shifttype'), $shifttypes, $shifttype_id),
form_text('title', __('Title'), $title), form_text('title', __('title.title'), $title),
form_select('rid', __('Location:'), $rooms, $rid), form_select('rid', __('Location:'), $rooms, $rid),
form_text('start', __('Start:'), $start->format('Y-m-d H:i')), form_text('start', __('Start:'), $start->format('Y-m-d H:i')),
form_text('end', __('End:'), $end->format('Y-m-d H:i')), form_text('end', __('End:'), $end->format('Y-m-d H:i')),
@ -216,7 +216,7 @@ function shift_edit_controller()
form_info('', __('This description is for single shifts, otherwise please use the description in shift type.')), form_info('', __('This description is for single shifts, otherwise please use the description in shift type.')),
'<h2>' . __('Needed angels') . '</h2>', '<h2>' . __('Needed angels') . '</h2>',
$angel_types_spinner, $angel_types_spinner,
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
] ]
); );

View File

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

View File

@ -79,7 +79,7 @@ function admin_groups()
); );
} }
$privileges_form[] = form_submit('submit', __('Save')); $privileges_form[] = form_submit('submit', __('form.save'));
$html .= page_with_title(__('Edit group') . ' ' . $group->name, [ $html .= page_with_title(__('Edit group') . ' ' . $group->name, [
form( form(
$privileges_form, $privileges_form,

View File

@ -382,7 +382,7 @@ function admin_shifts()
'title' => __('Type and title'), 'title' => __('Type and title'),
'needed_angels' => __('Needed angels'), 'needed_angels' => __('Needed angels'),
], $shifts_table), ], $shifts_table),
form_submit('submit', icon('save') . __('Save')), form_submit('submit', icon('save') . __('form.save')),
]), ]),
]); ]);
} }
@ -465,7 +465,7 @@ function admin_shifts()
div('row', [ div('row', [
div('col-md-6 col-xl-5', [ div('col-md-6 col-xl-5', [
form_select('shifttype_id', __('Shifttype'), $shifttypes, $shifttype_id), form_select('shifttype_id', __('Shifttype'), $shifttypes, $shifttype_id),
form_text('title', __('Title'), $title), form_text('title', __('title.title'), $title),
form_select('rid', __('Location'), $room_array, $rid), form_select('rid', __('Location'), $room_array, $rid),
]), ]),
div('col-md-6 col-xl-7', [ div('col-md-6 col-xl-7', [
@ -650,7 +650,7 @@ function admin_shifts_history(): string
msg(), msg(),
table([ table([
'transaction_id' => __('ID'), 'transaction_id' => __('ID'),
'title' => __('Title'), 'title' => __('title.title'),
'count' => __('Count'), 'count' => __('Count'),
'start' => __('Start'), 'start' => __('Start'),
'end' => __('End'), 'end' => __('End'),

View File

@ -133,7 +133,7 @@ function admin_user()
. '" method="post">' . "\n"; . '" method="post">' . "\n";
$html .= form_csrf(); $html .= form_csrf();
$html .= '<table>' . "\n"; $html .= '<table>' . "\n";
$html .= ' <tr><td>' . __('Password') . '</td><td>' . '<input type="password" size="40" name="new_pw" value="" class="form-control" autocomplete="new-password"></td></tr>' . "\n"; $html .= ' <tr><td>' . __('settings.password') . '</td><td>' . '<input type="password" size="40" name="new_pw" value="" class="form-control" autocomplete="new-password"></td></tr>' . "\n";
$html .= ' <tr><td>' . __('Confirm password') . '</td><td>' . '<input type="password" size="40" name="new_pw2" value="" class="form-control" autocomplete="new-password"></td></tr>' . "\n"; $html .= ' <tr><td>' . __('Confirm password') . '</td><td>' . '<input type="password" size="40" name="new_pw2" value="" class="form-control" autocomplete="new-password"></td></tr>' . "\n";
$html .= '</table>' . "\n" . '<br />' . "\n"; $html .= '</table>' . "\n" . '<br />' . "\n";

View File

@ -318,7 +318,7 @@ function view_user_shifts()
$types, $types,
$shiftsFilter->getTypes(), $shiftsFilter->getTypes(),
'types', 'types',
icon('person-lines-fill') . __('Angeltypes') . '<sup>1</sup>', icon('person-lines-fill') . __('angeltypes.angeltypes') . '<sup>1</sup>',
$ownAngelTypes $ownAngelTypes
), ),
'filled_select' => make_select( 'filled_select' => make_select(

View File

@ -66,7 +66,7 @@ function make_navigation()
'news' => __('News'), 'news' => __('News'),
'meetings' => [__('Meetings'), 'user_meetings'], 'meetings' => [__('Meetings'), 'user_meetings'],
'user_shifts' => __('Shifts'), 'user_shifts' => __('Shifts'),
'angeltypes' => __('Angeltypes'), 'angeltypes' => __('angeltypes.angeltypes'),
'questions' => [__('Ask the Heaven'), 'question.add'], 'questions' => [__('Ask the Heaven'), 'question.add'],
]; ];

View File

@ -82,7 +82,7 @@ function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
{ {
return page_with_title(sprintf(__('Edit %s'), $angeltype->name), [ return page_with_title(sprintf(__('Edit %s'), $angeltype->name), [
buttons([ buttons([
button(page_link_to('angeltypes'), icon('person-lines-fill') . __('Angeltypes'), 'back'), button(page_link_to('angeltypes'), icon('person-lines-fill') . __('angeltypes.angeltypes'), 'back'),
]), ]),
msg(), msg(),
form([ form([
@ -155,8 +155,8 @@ function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
), ),
form_text('contact_name', __('Name'), $angeltype->contact_name), form_text('contact_name', __('Name'), $angeltype->contact_name),
config('enable_dect') ? form_text('contact_dect', __('DECT'), $angeltype->contact_dect) : '', config('enable_dect') ? form_text('contact_dect', __('DECT'), $angeltype->contact_dect) : '',
form_text('contact_email', __('E-Mail'), $angeltype->contact_email), form_text('contact_email', __('settings.profile.email'), $angeltype->contact_email),
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
]); ]);
} }
@ -181,7 +181,7 @@ function AngelType_view_buttons(
$user $user
) { ) {
$buttons = [ $buttons = [
button(page_link_to('angeltypes'), icon('person-lines-fill') . __('Angeltypes'), 'back'), button(page_link_to('angeltypes'), icon('person-lines-fill') . __('angeltypes.angeltypes'), 'back'),
]; ];
if ($angeltype->requires_driver_license) { if ($angeltype->requires_driver_license) {
@ -558,7 +558,7 @@ function AngelTypes_render_contact_info(AngelType $angeltype)
$info = [ $info = [
__('Name') => [$angeltype->contact_name, $angeltype->contact_name], __('Name') => [$angeltype->contact_name, $angeltype->contact_name],
__('DECT') => config('enable_dect') ? [sprintf('<a href="tel:%s">%1$s</a>', $angeltype->contact_dect), $angeltype->contact_dect] : null, __('DECT') => config('enable_dect') ? [sprintf('<a href="tel:%s">%1$s</a>', $angeltype->contact_dect), $angeltype->contact_dect] : null,
__('E-Mail') => [sprintf('<a href="mailto:%s">%1$s</a>', $angeltype->contact_email), $angeltype->contact_email], __('settings.profile.email') => [sprintf('<a href="mailto:%s">%1$s</a>', $angeltype->contact_email), $angeltype->contact_email],
]; ];
$contactInfo = []; $contactInfo = [];
foreach ($info as $name => $data) { foreach ($info as $name => $data) {

View File

@ -42,7 +42,7 @@ function EventConfig_edit_view(
]), ]),
div('row', [ div('row', [
div('col-md-6', [ div('col-md-6', [
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
]), ]),
]), ]),

View File

@ -100,7 +100,7 @@ function ShiftEntry_create_view_admin(
form([ form([
form_select('angeltype_id', __('Angeltype'), $angeltypes_select, $angeltype->id), form_select('angeltype_id', __('Angeltype'), $angeltypes_select, $angeltype->id),
form_select('user_id', __('User'), $users_select, $signup_user->id), form_select('user_id', __('User'), $users_select, $signup_user->id),
form_submit('submit', icon('check-lg') . __('Save')), form_submit('submit', icon('check-lg') . __('form.save')),
]), ]),
] ]
); );
@ -130,7 +130,7 @@ function ShiftEntry_create_view_supporter(Shift $shift, Room $room, AngelType $a
), true), ), true),
form([ form([
form_select('user_id', __('User'), $users_select, $signup_user->id), form_select('user_id', __('User'), $users_select, $signup_user->id),
form_submit('submit', icon('check-lg') . __('Save')), form_submit('submit', icon('check-lg') . __('form.save')),
]), ]),
] ]
); );
@ -156,7 +156,7 @@ function ShiftEntry_create_view_user(Shift $shift, Room $room, AngelType $angelt
info(sprintf(__('Do you want to sign up for this shift as %s?'), $angeltype->name), true), info(sprintf(__('Do you want to sign up for this shift as %s?'), $angeltype->name), true),
form([ form([
form_textarea('comment', __('Comment (for your eyes only):'), $comment), form_textarea('comment', __('Comment (for your eyes only):'), $comment),
form_submit('submit', icon('check-lg') . __('Save')), form_submit('submit', icon('check-lg') . __('form.save')),
]), ]),
] ]
); );
@ -223,7 +223,7 @@ function ShiftEntry_edit_view(
form_info(__('Type:'), $type), form_info(__('Type:'), $type),
$comment, $comment,
join('', $freeload_form), join('', $freeload_form),
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
]); ]);
} }

View File

@ -54,7 +54,7 @@ function ShiftType_edit_view($name, $description, $shifttype_id)
form_text('name', __('Name'), $name), form_text('name', __('Name'), $name),
form_textarea('description', __('Description'), $description), form_textarea('description', __('Description'), $description),
form_info('', __('Please use markdown for the description.')), form_info('', __('Please use markdown for the description.')),
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
], true); ], true);
} }

View File

@ -21,7 +21,7 @@ function Shift_view_header(Shift $shift, Room $room)
{ {
return div('row', [ return div('row', [
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . __('Title') . '</h4>', '<h4>' . __('title.title') . '</h4>',
'<p class="lead">' '<p class="lead">'
. ($shift->url != '' . ($shift->url != ''
? '<a href="' . $shift->url . '">' . $shift->title . '</a>' ? '<a href="' . $shift->url . '">' . $shift->title . '</a>'

View File

@ -49,7 +49,7 @@ function UserDriverLicense_edit_view($user_source, $user_driver_license)
$user_driver_license->drive_forklift $user_driver_license->drive_forklift
), ),
], 'driving_license'), ], 'driving_license'),
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
]), ]),
], true); ], true);
} }

View File

@ -57,7 +57,7 @@ function User_edit_vouchers_view($user)
form( form(
[ [
form_spinner('vouchers', __('Number of vouchers given out'), $user->state->got_voucher), form_spinner('vouchers', __('Number of vouchers given out'), $user->state->got_voucher),
form_submit('submit', __('Save')), form_submit('submit', __('form.save')),
], ],
page_link_to('users', ['action' => 'edit_vouchers', 'user_id' => $user->id]) page_link_to('users', ['action' => 'edit_vouchers', 'user_id' => $user->id])
), ),
@ -791,7 +791,7 @@ function User_angeltypes_render($user_angeltypes)
. '</a>'; . '</a>';
} }
return div('col-md-2', [ return div('col-md-2', [
heading(__('Angeltypes'), 4), heading(__('angeltypes.angeltypes'), 4),
join('<br>', $output), join('<br>', $output),
]); ]);
} }

View File

@ -186,7 +186,7 @@ msgid "settings.profile.planned_departure_date.invalid"
msgstr "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbauplanung bekommen. " msgstr "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbauplanung bekommen. "
"Es sollte nach dem Aufbaubeginn und vor dem Abbauende liegen." "Es sollte nach dem Aufbaubeginn und vor dem Abbauende liegen."
msgid "settings.profile.success" msgid "settings.success"
msgstr "Einstellungen gespeichert." msgstr "Einstellungen gespeichert."
msgid "settings.sessions.delete_success" msgid "settings.sessions.delete_success"

View File

@ -47,7 +47,7 @@ msgid "No sleep found"
msgstr "No sleep found" msgstr "No sleep found"
msgid "405: Method not allowed" msgid "405: Method not allowed"
msgstr "" msgstr "405: Method not allowed"
msgid "Authentication expired" msgid "Authentication expired"
msgstr "Autorisierung ist abgelaufen" msgstr "Autorisierung ist abgelaufen"
@ -143,15 +143,9 @@ msgstr ""
msgid "Please note: You have to activate cookies!" msgid "Please note: You have to activate cookies!"
msgstr "Hinweis: Cookies müssen aktiviert sein!" msgstr "Hinweis: Cookies müssen aktiviert sein!"
msgid "Password"
msgstr "Passwort"
msgid "Confirm password" msgid "Confirm password"
msgstr "Passwort wiederholen" msgstr "Passwort wiederholen"
msgid "Save"
msgstr "Speichern"
msgid "We sent you an email containing your password recovery link." msgid "We sent you an email containing your password recovery link."
msgstr "" msgstr ""
"Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." "Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@ -170,15 +164,9 @@ msgstr ""
"zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
"verwendet hast." "verwendet hast."
msgid "E-Mail"
msgstr "E-Mail"
msgid "Recover" msgid "Recover"
msgstr "Wiederherstellen" msgstr "Wiederherstellen"
msgid "Angeltypes"
msgstr "Engeltypen"
msgid "Angeltype %s deleted." msgid "Angeltype %s deleted."
msgstr "Engeltyp %s gelöscht." msgstr "Engeltyp %s gelöscht."
@ -209,9 +197,6 @@ msgstr "verlassen"
msgid "join" msgid "join"
msgstr "mitmachen" msgstr "mitmachen"
msgid "Angeltype doesn't exist . "
msgstr "Engeltyp existiert nicht."
msgid "Event config" msgid "Event config"
msgstr "Event Einstellungen" msgstr "Event Einstellungen"
@ -239,9 +224,6 @@ msgstr "Das Event Ende Datum muss vor dem Abbau Ende Datum liegen."
msgid "The buildup start date has to be before the teardown end date." msgid "The buildup start date has to be before the teardown end date."
msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen." msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen."
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
msgid "Public Dashboard" msgid "Public Dashboard"
msgstr "Öffentliches Dashboard" msgstr "Öffentliches Dashboard"
@ -275,9 +257,6 @@ msgstr "Du bist für diese Schicht eingetragen."
msgid "You are subscribed. Thank you!" msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!" msgstr "Du bist eingetragen. Danke!"
msgid "Shift entry not found."
msgstr "Schichteintrag nicht gefunden."
msgid "" msgid ""
"You are not allowed to remove this shift entry. If necessary, ask your " "You are not allowed to remove this shift entry. If necessary, ask your "
"supporter or heaven to do so." "supporter or heaven to do so."
@ -320,7 +299,7 @@ msgstr "Diese Seite ist mit JavaScript viel komfortabler."
msgid "Shifttype" msgid "Shifttype"
msgstr "Schichttyp" msgstr "Schichttyp"
msgid "Title" msgid "title.title"
msgstr "Titel" msgstr "Titel"
msgid "Location:" msgid "Location:"
@ -362,9 +341,6 @@ msgstr "Schichttyp %s gelöscht."
msgid "Delete shifttype %s" msgid "Delete shifttype %s"
msgstr "Lösche Schichttyp %s" msgstr "Lösche Schichttyp %s"
msgid "Shifttype not found."
msgstr "Schichttyp nicht gefunden."
msgid "Please enter a name." msgid "Please enter a name."
msgstr "Gib bitte einen Namen an." msgstr "Gib bitte einen Namen an."
@ -385,9 +361,6 @@ msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
msgid "Angel types which need approvals:" msgid "Angel types which need approvals:"
msgstr "Engeltypen die bestätigt werden müssen:" msgstr "Engeltypen die bestätigt werden müssen:"
msgid "Angeltype doesn't exist."
msgstr "Engeltyp existiert nicht."
msgid "You are not allowed to delete all users for this angeltype." msgid "You are not allowed to delete all users for this angeltype."
msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen." msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen."
@ -406,15 +379,9 @@ msgstr "Alle Benutzer für Engeltyp %s freigeschaltet."
msgid "Confirm all users" msgid "Confirm all users"
msgstr "Alle Benutzer bestätigen" msgstr "Alle Benutzer bestätigen"
msgid "User angeltype doesn't exist."
msgstr "Benutzer-Engeltype existiert nicht."
msgid "You are not allowed to confirm this users angeltype." msgid "You are not allowed to confirm this users angeltype."
msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten." msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
msgid "User doesn't exist."
msgstr "Benutzer existiert nicht."
msgid "%s confirmed for angeltype %s." msgid "%s confirmed for angeltype %s."
msgstr "%s für Engeltyp %s freigeschaltet." msgstr "%s für Engeltyp %s freigeschaltet."
@ -1992,9 +1959,6 @@ msgstr "Zeit"
msgid "schedule.import.shift.type" msgid "schedule.import.shift.type"
msgstr "Typ" msgstr "Typ"
msgid "schedule.import.shift.title"
msgstr "Titel"
msgid "schedule.import.shift.room" msgid "schedule.import.shift.room"
msgstr "Ort" msgstr "Ort"

View File

@ -185,7 +185,7 @@ msgid "settings.profile.planned_departure_date.invalid"
msgstr "Please enter your planned date of departure. " msgstr "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." "It should be after your planned arrival date and after buildup start date and before teardown end date."
msgid "settings.profile.success" msgid "settings.success"
msgstr "Settings saved." msgstr "Settings saved."
msgid "settings.sessions.delete_success" msgid "settings.sessions.delete_success"

View File

@ -145,7 +145,7 @@ msgstr "Times"
msgid "schedule.import.shift.type" msgid "schedule.import.shift.type"
msgstr "Type" msgstr "Type"
msgid "schedule.import.shift.title" msgid "title.title"
msgstr "Title" msgstr "Title"
msgid "schedule.import.shift.room" msgid "schedule.import.shift.room"

View File

@ -55,7 +55,7 @@
<tr> <tr>
<th>{{ __('schedule.import.shift.dates') }}</th> <th>{{ __('schedule.import.shift.dates') }}</th>
<th>{{ __('schedule.import.shift.type') }}</th> <th>{{ __('schedule.import.shift.type') }}</th>
<th>{{ __('schedule.import.shift.title') }}</th> <th>{{ __('title.title') }}</th>
<th>{{ __('schedule.import.shift.room') }}</th> <th>{{ __('schedule.import.shift.room') }}</th>
</tr> </tr>
</thead> </thead>

View File

@ -63,7 +63,7 @@
</span> </span>
<input <input
class="form-control" id="form_password" type="password" class="form-control" id="form_password" type="password"
name="password" value="" placeholder="{{ __('Password') }}" autocomplete="current-password" name="password" value="" placeholder="{{ __('settings.password') }}" autocomplete="current-password"
> >
</div> </div>
</div> </div>

View File

@ -7,7 +7,7 @@
<form action="" enctype="multipart/form-data" method="post"> <form action="" enctype="multipart/form-data" method="post">
{{ csrf() }} {{ csrf() }}
{{ f.input('password', __('Password'), { {{ f.input('password', __('settings.password'), {
'type': 'password', 'type': 'password',
'min_length': min_length, 'min_length': min_length,
'required': true, 'required': true,
@ -18,7 +18,7 @@
'required': true, 'required': true,
}) }} }) }}
{{ f.submit(__('Save')) }} {{ f.submit(__('form.save')) }}
</form> </form>
</div> </div>
{% endblock %} {% endblock %}

View File

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

View File

@ -109,7 +109,7 @@ class SettingsController extends BaseController
$user->settings->save(); $user->settings->save();
$user->save(); $user->save();
$this->addNotification('settings.profile.success'); $this->addNotification('settings.success');
return $this->redirect->to('/settings/profile'); return $this->redirect->to('/settings/profile');
} }