From a7646d5a78306a624d154c35c4890afcc8ccfefc Mon Sep 17 00:00:00 2001 From: Silvan Date: Fri, 23 Sep 2022 17:24:06 +0200 Subject: [PATCH] fix(translations): language options and init user (#4449) fix(translations): add chinese to language options fix(translations): correct key for password confirm label --- internal/api/ui/login/static/i18n/de.yaml | 6 ++-- internal/api/ui/login/static/i18n/en.yaml | 6 ++-- internal/api/ui/login/static/i18n/fr.yaml | 6 ++-- internal/api/ui/login/static/i18n/it.yaml | 8 ++++-- internal/api/ui/login/static/i18n/zh.yaml | 12 ++++---- .../templates/external_not_found_option.html | 28 ++++++++++--------- .../templates/external_register_overview.html | 2 ++ .../login/static/templates/init_password.html | 6 ++-- .../ui/login/static/templates/init_user.html | 8 +++--- .../ui/login/static/templates/mfa_prompt.html | 3 +- .../ui/login/static/templates/register.html | 2 ++ 11 files changed, 50 insertions(+), 37 deletions(-) diff --git a/internal/api/ui/login/static/i18n/de.yaml b/internal/api/ui/login/static/i18n/de.yaml index 05fd853b87..a142a26371 100644 --- a/internal/api/ui/login/static/i18n/de.yaml +++ b/internal/api/ui/login/static/i18n/de.yaml @@ -67,7 +67,7 @@ InitUser: Description: Du hast einen Code erhalten, welcher im untenstehenden Formular eingegeben werden muss um deine E-Mail zu verifizieren und ein neues Passwort zu setzen. CodeLabel: Code NewPasswordLabel: Neues Passwort - NewPasswordConfirmLabel: Passwort bestätigen + NewPasswordConfirm: Passwort bestätigen NextButtonText: weiter ResendButtonText: erneut senden @@ -239,6 +239,7 @@ ExternalRegistrationUserOverview: English: English Italian: Italiano French: Français + Chinese: 简体中文 TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs @@ -282,7 +283,7 @@ LinkingUsersDone: CancelButtonText: abbrechen NextButtonText: weiter -ExternalNotFoundOption: +ExternalNotFound: Title: Externer Benutzer Description: Externer Benutzer konnte nicht gefunden werden. Willst du deinen Benutzer mit einem bestehenden verlinken oder diesen als neuen Benutzer registrieren. LinkButtonText: Verlinken @@ -296,6 +297,7 @@ ExternalNotFoundOption: English: English Italian: Italiano French: Français + Chinese: 简体中文 Footer: PoweredBy: Powered By diff --git a/internal/api/ui/login/static/i18n/en.yaml b/internal/api/ui/login/static/i18n/en.yaml index 8fad694df3..4e22036fcb 100644 --- a/internal/api/ui/login/static/i18n/en.yaml +++ b/internal/api/ui/login/static/i18n/en.yaml @@ -67,7 +67,7 @@ InitUser: Description: You have received a code, which you have to enter in the form below, to verify your email and set your new password. CodeLabel: Code NewPasswordLabel: New Password - NewPasswordConfirmLabel: Confirm Password + NewPasswordConfirm: Confirm Password NextButtonText: next ResendButtonText: resend @@ -239,6 +239,7 @@ ExternalRegistrationUserOverview: English: English Italian: Italiano French: Français + Chinese: 简体中文 TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS @@ -282,7 +283,7 @@ LinkingUsersDone: CancelButtonText: cancel NextButtonText: next -ExternalNotFoundOption: +ExternalNotFound: Title: External User Description: External user not found. Do you want to link your user or auto register a new one. LinkButtonText: Link @@ -296,6 +297,7 @@ ExternalNotFoundOption: English: English Italian: Italiano French: Français + Chinese: 简体中文 Footer: PoweredBy: Powered By diff --git a/internal/api/ui/login/static/i18n/fr.yaml b/internal/api/ui/login/static/i18n/fr.yaml index 6943ba59d9..81a0dabed6 100644 --- a/internal/api/ui/login/static/i18n/fr.yaml +++ b/internal/api/ui/login/static/i18n/fr.yaml @@ -67,7 +67,7 @@ InitUser: Description: Vous avez reçu un code, que vous devez entrer dans le formulaire ci-dessous, pour vérifier votre e-mail et définir votre nouveau mot de passe. CodeLabel: Code NewPasswordLabel: Nouveau mot de passe - NewPasswordConfirmLabel: Confirmer le mot de passe + NewPasswordConfirm: Confirmer le mot de passe NextButtonText: Suivant ResendButtonText: envoyer à nouveau @@ -239,6 +239,7 @@ ExternalRegistrationUserOverview: English: English Italian: Italiano French: Français + Chinese: 简体中文 TosAndPrivacyLabel: Termes et conditions TosConfirm: J'accepte les TosLinkText: TOS @@ -282,7 +283,7 @@ LinkingUsersDone: CancelButtonText: annuler NextButtonText: suivant -ExternalNotFoundOption: +ExternalNotFound: Title: Utilisateur externe Description: Utilisateur externe non trouvé. Voulez-vous lier votre utilisateur ou enregistrer automatiquement un nouvel utilisateur. LinkButtonText: Lier @@ -296,6 +297,7 @@ ExternalNotFoundOption: English: English Italian: Italiano French: Français + Chinese: 简体中文 Footer: PoweredBy: Promulgué par diff --git a/internal/api/ui/login/static/i18n/it.yaml b/internal/api/ui/login/static/i18n/it.yaml index b4d56f043f..52e01d972d 100644 --- a/internal/api/ui/login/static/i18n/it.yaml +++ b/internal/api/ui/login/static/i18n/it.yaml @@ -67,7 +67,7 @@ InitUser: Description: Hai ricevuto un codice, che devi inserire nel modulo sottostante, per verificare la tua email e impostare la tua nuova password. CodeLabel: Codice NewPasswordLabel: Nuova password - NewPasswordConfirmLabel: Conferma la password + NewPasswordConfirm: Conferma la password NextButtonText: Avanti ResendButtonText: rispedisci @@ -209,9 +209,9 @@ RegistrationUser: English: English Italian: Italiano French: Français + Chinese: 简体中文 GenderLabel: Genere Female: Femminile - Chinese: 简体中文 Male: Maschile Diverse: diverso / X PasswordLabel: Password @@ -239,6 +239,7 @@ ExternalRegistrationUserOverview: English: English Italian: Italiano French: Français + Chinese: 简体中文 TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio @@ -282,7 +283,7 @@ LinkingUsersDone: CancelButtonText: annulla NextButtonText: Avanti -ExternalNotFoundOption: +ExternalNotFound: Title: Utente esterno Description: Utente esterno non trovato. Vuoi collegare il tuo utente o registrarne uno nuovo automaticamente. LinkButtonText: Link @@ -296,6 +297,7 @@ ExternalNotFoundOption: English: English Italian: Italiano French: Français + Chinese: 简体中文 Footer: PoweredBy: Alimentato da diff --git a/internal/api/ui/login/static/i18n/zh.yaml b/internal/api/ui/login/static/i18n/zh.yaml index 4e626681d4..819b6f6183 100644 --- a/internal/api/ui/login/static/i18n/zh.yaml +++ b/internal/api/ui/login/static/i18n/zh.yaml @@ -67,7 +67,7 @@ InitUser: Description: 您将收到一个验证码，您必须在下面输入该验证码，以验证您的电子邮件并设置您的新密码。 CodeLabel: 验证码 NewPasswordLabel: 新密码 - NewPasswordConfirmLabel: 确认密码 + NewPasswordConfirm: 确认密码 NextButtonText: 继续 ResendButtonText: 重新发送 @@ -283,7 +283,7 @@ LinkingUsersDone: CancelButtonText: 取消 NextButtonText: 继续 -ExternalNotFoundOption: +ExternalNotFound: Title: 外部用户 Description: 未找到外部用户。你想绑定你已存在的用户还是自动注册一个新用户。 LinkButtonText: 绑定 @@ -293,10 +293,10 @@ ExternalNotFoundOption: TosLinkText: 服务条款 TosConfirmAnd: 和 PrivacyLinkText: 隐私政策 - German: 德语 - English: 英语 - Italian: 意大利语 - French: 法语 + German: Deutsch + English: English + Italian: Italiano + French: Français Chinese: 简体中文 Footer: diff --git a/internal/api/ui/login/static/templates/external_not_found_option.html b/internal/api/ui/login/static/templates/external_not_found_option.html index 3a7ef355de..38dfc6c54b 100644 --- a/internal/api/ui/login/static/templates/external_not_found_option.html +++ b/internal/api/ui/login/static/templates/external_not_found_option.html @@ -1,8 +1,8 @@ {{template "main-top" .}}
-

{{t "ExternalNotFoundOption.Title"}}

-

{{t "ExternalNotFoundOption.Description"}}

+

{{t "ExternalNotFound.Title"}}

+

{{t "ExternalNotFound.Description"}}

@@ -60,13 +60,15 @@ @@ -74,23 +76,23 @@ {{ if or .TOSLink .PrivacyLink }}
- +
@@ -108,11 +110,11 @@
diff --git a/internal/api/ui/login/static/templates/external_register_overview.html b/internal/api/ui/login/static/templates/external_register_overview.html index 1779c5adee..c5d1f2f13b 100644 --- a/internal/api/ui/login/static/templates/external_register_overview.html +++ b/internal/api/ui/login/static/templates/external_register_overview.html @@ -68,6 +68,8 @@ +
diff --git a/internal/api/ui/login/static/templates/init_password.html b/internal/api/ui/login/static/templates/init_password.html index eea512cc83..1e30875972 100644 --- a/internal/api/ui/login/static/templates/init_password.html +++ b/internal/api/ui/login/static/templates/init_password.html @@ -1,10 +1,10 @@ {{template "main-top" .}}
-

{{t "InitPassword.Title" }}

+

{{t "InitPassword.Title"}}

{{ template "user-profile" . }} -

{{t "InitPassword.Description" }}

+

{{t "InitPassword.Description"}}

@@ -48,7 +48,7 @@ - +
diff --git a/internal/api/ui/login/static/templates/init_user.html b/internal/api/ui/login/static/templates/init_user.html index d375dd6f14..5d92e4736a 100644 --- a/internal/api/ui/login/static/templates/init_user.html +++ b/internal/api/ui/login/static/templates/init_user.html @@ -1,11 +1,11 @@ {{template "main-top" .}}
-

{{t "InitUser.Title" }}

+

{{t "InitUser.Title"}}

{{ template "user-profile" . }} -

{{t "InitUser.Description" }}

+

{{t "InitUser.Description"}}

@@ -34,7 +34,7 @@ {{ template "password-complexity-policy-description" . }}
- +
@@ -54,7 +54,7 @@ - +
diff --git a/internal/api/ui/login/static/templates/mfa_prompt.html b/internal/api/ui/login/static/templates/mfa_prompt.html index ffe0dfc665..f8dcdf1f8b 100644 --- a/internal/api/ui/login/static/templates/mfa_prompt.html +++ b/internal/api/ui/login/static/templates/mfa_prompt.html @@ -13,8 +13,7 @@
- {{ range $provider := .MFAProviders}} {{ $providerName := (t (printf - "InitMFAPrompt.Provider%v" $provider)) }} + {{ range $provider := .MFAProviders}} {{ $providerName := (t (printf "InitMFAPrompt.Provider%v" $provider)) }}
+