andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-29 18:42:15 +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 <[email protected]>

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

Co-authored-by: Livio Spring <[email protected]>

* merge ifs

* use errors.internal

* check for i18ndescriptionkey

* missing i18n

Co-authored-by: Livio Spring <[email protected]>
This commit is contained in:
Max Peintner
2022-11-07 08:55:12 +00:00
committed by GitHub
co-authored by Livio Spring
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
internal/api/ui/login/init_user_handler.go
+4 -3
View File
@@ -115,8 +115,10 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
if authReq != nil {
userID = authReq.UserID
}
translator := l.getTranslator(r.Context(), authReq)
data := initUserData{
baseData: l.getBaseData(r, authReq, "Init User", errID, errMessage),
baseData: l.getBaseData(r, authReq, "InitUser.Title", "InitUser.Description", errID, errMessage),
profileData: l.getProfileData(authReq),
UserID: userID,
LoginName: loginName,
@@ -139,7 +141,6 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
data.HasNumber = NumberRegex
}
}
translator := l.getTranslator(r.Context(), authReq)
if authReq == nil {
user, err := l.query.GetUserByID(r.Context(), false, userID)
if err == nil {
@@ -150,7 +151,7 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
}
func (l *Login) renderInitUserDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, orgID string) {
data := l.getUserData(r, authReq, "User Init Done", "", "")
data := l.getUserData(r, authReq,"InitUserDone.Title" ,"InitUserDone.Description", "", "")
translator := l.getTranslator(r.Context(), authReq)
if authReq == nil {
l.customTexts(r.Context(), translator, orgID)