fix(login): use label policy settings for favicon, translate titles (#4641)

* fix: render favicon from label policy

* translate main title

* translation

* i18n

* i18n

* i18nkey

* rm attr

* select user title

* Add description meta

* Update internal/api/ui/login/mfa_init_verify_handler.go

Co-authored-by: Livio Spring <livio.a@gmail.com>

* Update internal/api/ui/login/renderer.go

Co-authored-by: Livio Spring <livio.a@gmail.com>

* merge ifs

* use errors.internal

* check for i18ndescriptionkey

* missing i18n

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Max Peintner
2022-11-07 09:55:12 +01:00
committed by GitHub
parent 5c807a0660
commit b432cf4963
34 changed files with 127 additions and 67 deletions

View File

@@ -284,7 +284,7 @@ LinkingUsersDone:
NextButtonText: weiter
ExternalNotFound:
Title: Externer Benutzer
Title: Externer Benutzer nicht gefunden
Description: Externer Benutzer konnte nicht gefunden werden. Willst du deinen Benutzer mit einem bestehenden verlinken oder diesen als neuen Benutzer registrieren.
LinkButtonText: Verlinken
AutoRegisterButtonText: registrieren

View File

@@ -284,7 +284,7 @@ LinkingUsersDone:
NextButtonText: next
ExternalNotFound:
Title: External User
Title: External User not found
Description: External user not found. Do you want to link your user or auto register a new one.
LinkButtonText: Link
AutoRegisterButtonText: register

View File

@@ -284,7 +284,7 @@ LinkingUsersDone:
NextButtonText: suivant
ExternalNotFound:
Title: Utilisateur externe
Title: Utilisateur externe introuvable
Description: Utilisateur externe non trouvé. Voulez-vous lier votre utilisateur ou enregistrer automatiquement un nouvel utilisateur.
LinkButtonText: Lier
AutoRegisterButtonText: enregistrer

View File

@@ -284,7 +284,7 @@ LinkingUsersDone:
NextButtonText: Avanti
ExternalNotFound:
Title: Utente esterno
Title: Utente esterno non trovato
Description: Utente esterno non trovato. Vuoi collegare il tuo utente o registrarne uno nuovo automaticamente.
LinkButtonText: Link
AutoRegisterButtonText: Registra

View File

@@ -284,7 +284,7 @@ LinkingUsersDone:
NextButtonText: 继续
ExternalNotFound:
Title: 外部用户
Title: 未找到外部用户
Description: 未找到外部用户。你想绑定你已存在的用户还是自动注册一个新用户。
LinkButtonText: 绑定
AutoRegisterButtonText: 注册

View File

@@ -8,13 +8,21 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="{{ resourceThemeUrl "css/zitadel.css" .Theme }}" type="text/css">
<link rel="icon" type="image/x-icon" href="{{ resourceThemeUrl "favicon.ico" .Theme }}">
{{ if hasCustomPolicy .LabelPolicy }}
<link rel="stylesheet" href="{{ variablesCssFileUrl .PrivateLabelingOrgID .LabelPolicy}}" type="text/css">
{{ end}}
<link rel="stylesheet" href="{{ variablesCssFileUrl .PrivateLabelingOrgID .LabelPolicy}}" type="text/css">
{{ $icon := customIconResource .PrivateLabelingOrgID .LabelPolicy .DarkMode }}
{{if $icon}}
<link rel="icon" type="image" href="{{$icon}}">
{{end}}
{{ else }}
<link rel="icon" type="image/x-icon" href="{{ resourceThemeUrl "favicon.ico" .Theme }}">
{{ end }}
<link rel="stylesheet" href="{{ resourceThemeUrl "../../fonts/lgn-icons/css/lgn-icon-font.css" .Theme }}">
<title>{{ .Title }}</title>
<meta name="description" content="{{ .Description }}"/>
<script src="{{ resourceUrl "scripts/theme.js" }}"></script>
</head>