TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-13 11:42:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/api/ui/login/init_password_handler.go
View File

@@ -123,8 +123,11 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
if userID == "" && authReq != nil {
userID = authReq.UserID
}
translator := l.getTranslator(r.Context(), authReq)
data := initPasswordData{
baseData: l.getBaseData(r, authReq, "Init Password", errID, errMessage),
baseData: l.getBaseData(r, authReq, "InitPassword.Title","InitPassword.Description", errID, errMessage),
profileData: l.getProfileData(authReq),
UserID: userID,
Code: code,
@@ -145,7 +148,6 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
data.HasNumber = NumberRegex
}
}
translator := l.getTranslator(r.Context(), authReq)
if authReq == nil {
user, err := l.query.GetUserByID(r.Context(), false, userID)
if err == nil {
@@ -156,7 +158,7 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
}
func (l *Login) renderInitPasswordDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, orgID string) {
data := l.getUserData(r, authReq, "Password Init Done", "", "")
data := l.getUserData(r, authReq, "InitPasswordDone.Title", "InitPasswordDone.Description", "", "")
translator := l.getTranslator(r.Context(), authReq)
if authReq == nil {
l.customTexts(r.Context(), translator, orgID)