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

clarify hint for nightshifts, simplify username regex, add missing translation 

fix untranslated string
This commit is contained in:
Xu 2023-11-16 15:58:58 +01:00 committed by Igor Scheller
parent 5d14109dbd
commit 66738298a9
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.default.php
View File

@ -287,7 +287,7 @@ return [
// Regular expression describing a FALSE username. // Regular expression describing a FALSE username.
// Per default usernames must only contain alphanumeric chars, "-", "_" or ".". // Per default usernames must only contain alphanumeric chars, "-", "_" or ".".
'username_regex' => (string) env('USERNAME_REGEX', '/([^\p{L}\p{N}\-_.]+)/ui'), 'username_regex' => (string) env('USERNAME_REGEX', '/([^\p{L}\p{N}_.-]+)/ui'),
// Enables first name and last name // Enables first name and last name
'enable_user_name' => (bool) env('ENABLE_USER_NAME', false), 'enable_user_name' => (bool) env('ENABLE_USER_NAME', false),

5
includes/view/User_view.php
View File

@ -638,9 +638,10 @@ function User_view(
$myshifts_table, $myshifts_table,
($its_me && $nightShiftsConfig['enabled'] && $goodie_enabled) ? info( ($its_me && $nightShiftsConfig['enabled'] && $goodie_enabled) ? info(
icon('info-circle') . sprintf( icon('info-circle') . sprintf(
__('Your night shifts between %d and %d am count twice.'), __('Your night shifts between %d and %d am count twice for the %s score.'),
$nightShiftsConfig['start'], $nightShiftsConfig['start'],
$nightShiftsConfig['end'] $nightShiftsConfig['end'],
($goodie_tshirt ? __('T-shirt') : __('goodie'))
), ),
true true
) : '', ) : '',

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

@ -1285,8 +1285,8 @@ msgstr "iCal Export"
msgid "JSON Export" msgid "JSON Export"
msgstr "JSON Export" msgstr "JSON Export"
msgid "Your night shifts between %d and %d am count twice." msgid "Your night shifts between %d and %d am count twice for the %s score."
msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen doppelt." msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen für den %s Score doppelt."
msgid "" msgid ""
"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some " "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@ -1406,6 +1406,9 @@ msgstr "Die Einträge müssen übereinstimmen und dürfen nicht leer sein!"
msgid "Number of shifts: %s" msgid "Number of shifts: %s"
msgstr "Anzahl an Schichten: %s" msgstr "Anzahl an Schichten: %s"
msgid "Shifts created."
msgstr "Schichten erstellt."
msgid "If the angel is active, it can claim a goodie. If goodie is set to 'Yes', the angel already got their goodie." msgid "If the angel is active, it can claim a goodie. If goodie is set to 'Yes', the angel already got their goodie."
msgstr "Ist der Engel Aktiv, hat er damit Anspruch auf ein Goodie. Wenn Goodie ein 'Ja' enthält, bedeutet dies, " msgstr "Ist der Engel Aktiv, hat er damit Anspruch auf ein Goodie. Wenn Goodie ein 'Ja' enthält, bedeutet dies, "
"dass der Engel bereits sein Goodie erhalten hat." "dass der Engel bereits sein Goodie erhalten hat."
@ -1413,6 +1416,9 @@ msgstr "Ist der Engel Aktiv, hat er damit Anspruch auf ein Goodie. Wenn Goodie e
msgid "Goodie" msgid "Goodie"
msgstr "Goodie" msgstr "Goodie"
msgid "goodie"
msgstr "Goodie"
msgid "Your goodie score" msgid "Your goodie score"
msgstr "Dein Goodie Score" msgstr "Dein Goodie Score"