feat: Custom text login (#1925)

* feat: default custom message text

* feat: org custom message text

* feat: org custom message text

* feat: custom messages query side

* feat: default messages

* feat: message text user fields

* feat: check for inactive user

* feat: fix send password reset

* feat: fix custom org text

* feat: add variables to docs

* feat: custom text tests

* feat: fix notifications

* feat: add custom text feature

* feat: add custom text feature

* feat: feature in custom message texts

* feat: add custom text feature in frontend

* feat: merge main

* feat: feature tests

* feat: change phone message in setup

* fix: remove unused code, add event translation

* fix: merge main and fix problems

* fix: english translation file

* fix: migration versions

* fix: setup

* fix: custom login text

* feat: add all possible custom texts for login

* feat: iam login texts

* feat: org login texts

* feat: protos

* fix: custom text in admin api

* fix: add success login text

* fix: docs

* fix: add custom login texts to management api

* fix: add sub messages to custom login texts

* fix: setup custom texts

* feat: get org login texts

* feat: get org login texts

* feat: handler in adminapi

* feat: handlers in auth and admin

* feat: render login texts

* feat: custom login text

* feat: add all login text keys

* feat: handle correct login texts

* feat: custom login texts in command side

* feat: custom login texts in command side

* feat: fix yaml file

* feat: merge master and add confirmation text

* feat: fix html

* feat: read default login texts

* feat: get default text files

* feat: get custom texts org

* feat: tests

* feat: change translator handling

* fix translator from authReq

* feat: change h1 on login screens

* feat: add custom login text for remove

* feat: add custom login text for remove

* feat: cache translation files

* feat: cache translation files

* feat: zitadel user in env var

* feat: add registration user description

* feat: better func naming

* feat: tests

* feat: add mutex to read file

* feat: add mutex to read file

* fix mutex for accessing translation map

* fix: translation key

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

internal/ui/login/handler/change_password_handler.go

@@ -43,7 +43,7 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
 		baseData:    l.getBaseData(r, authReq, "Change Password", errID, errMessage),
 		profileData: l.getProfileData(authReq),
 	}
-	policy, description, _ := l.getPasswordComplexityPolicy(r, authReq.UserOrgID)
+	policy, description, _ := l.getPasswordComplexityPolicy(r, authReq, authReq.UserOrgID)
 	if policy != nil {
 		data.PasswordPolicyDescription = description
 		data.MinLength = policy.MinLength
@@ -60,11 +60,12 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
 			data.HasNumber = NumberRegex
 		}
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePassword], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplChangePassword], data, nil)
 }
 
 func (l *Login) renderChangePasswordDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) {
 	var errType, errMessage string
 	data := l.getUserData(r, authReq, "Password Change Done", errType, errMessage)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePasswordDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplChangePasswordDone], data, nil)
 }

internal/ui/login/handler/external_login_handler.go

@@ -148,7 +148,8 @@ func (l *Login) renderExternalNotFoundOption(w http.ResponseWriter, r *http.Requ
 	data := externalNotFoundOptionData{
 		baseData: l.getBaseData(r, authReq, "ExternalNotFoundOption", errID, errMessage),
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplExternalNotFoundOption], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplExternalNotFoundOption], data, nil)
 }
 
 func (l *Login) handleExternalNotFoundOptionCheck(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/init_password_handler.go

@@ -103,14 +103,13 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
 	if userID == "" && authReq != nil {
 		userID = authReq.UserID
 	}
-
 	data := initPasswordData{
 		baseData:    l.getBaseData(r, authReq, "Init Password", errID, errMessage),
 		profileData: l.getProfileData(authReq),
 		UserID:      userID,
 		Code:        code,
 	}
-	policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, userID)
+	policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, authReq, userID)
 	if policy != nil {
 		data.PasswordPolicyDescription = description
 		data.MinLength = policy.MinLength
@@ -127,10 +126,11 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
 			data.HasNumber = NumberRegex
 		}
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitPassword], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplInitPassword], data, nil)
 }
 
 func (l *Login) renderInitPasswordDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) {
 	data := l.getUserData(r, authReq, "Password Init Done", "", "")
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitPasswordDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplInitPasswordDone], data, nil)
 }

internal/ui/login/handler/init_user_handler.go

@@ -104,7 +104,7 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
 		Code:        code,
 		PasswordSet: passwordSet,
 	}
-	policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, userID)
+	policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, nil, userID)
 	if policy != nil {
 		data.PasswordPolicyDescription = description
 		data.MinLength = policy.MinLength
@@ -121,10 +121,11 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
 			data.HasNumber = NumberRegex
 		}
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitUser], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplInitUser], data, nil)
 }
 
 func (l *Login) renderInitUserDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) {
 	data := l.getUserData(r, authReq, "User Init Done", "", "")
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitUserDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplInitUserDone], data, nil)
 }

internal/ui/login/handler/link_users_handler.go

@@ -19,5 +19,5 @@ func (l *Login) linkUsers(w http.ResponseWriter, r *http.Request, authReq *domai
 func (l *Login) renderLinkUsersDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, err error) {
 	var errType, errMessage string
 	data := l.getUserData(r, authReq, "Linking Users Done", errType, errMessage)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLinkUsersDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplLinkUsersDone], data, nil)
 }

internal/ui/login/handler/login_handler.go

@@ -77,5 +77,5 @@ func (l *Login) renderLogin(w http.ResponseWriter, r *http.Request, authReq *dom
 			return authReq.LoginPolicy != nil && authReq.LoginPolicy.AllowExternalIDP && authReq.AllowedExternalIDPs != nil && len(authReq.AllowedExternalIDPs) > 0
 		},
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogin], data, funcs)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplLogin], data, funcs)
 }

internal/ui/login/handler/login_success_handler.go

@@ -41,5 +41,5 @@ func (l *Login) renderSuccessAndCallback(w http.ResponseWriter, r *http.Request,
 	if authReq != nil {
 		data.RedirectURI = l.oidcAuthCallbackURL
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLoginSuccess], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplLoginSuccess], data, nil)
 }

internal/ui/login/handler/logout_handler.go

@@ -14,5 +14,5 @@ func (l *Login) handleLogoutDone(w http.ResponseWriter, r *http.Request) {
 
 func (l *Login) renderLogoutDone(w http.ResponseWriter, r *http.Request) {
 	data := l.getUserData(r, nil, "Logout Done", "", "")
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogoutDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(nil), l.renderer.Templates[tmplLogoutDone], data, nil)
 }

internal/ui/login/handler/mail_verify_handler.go

@@ -81,7 +81,8 @@ func (l *Login) renderMailVerification(w http.ResponseWriter, r *http.Request, a
 		UserID:      userID,
 		profileData: l.getProfileData(authReq),
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerification], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMailVerification], data, nil)
 }
 
 func (l *Login) renderMailVerified(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) {
@@ -89,5 +90,6 @@ func (l *Login) renderMailVerified(w http.ResponseWriter, r *http.Request, authR
 		baseData:    l.getBaseData(r, authReq, "Mail Verified", "", ""),
 		profileData: l.getProfileData(authReq),
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerified], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMailVerified], data, nil)
 }

internal/ui/login/handler/mfa_init_done_handler.go

@@ -16,5 +16,6 @@ func (l *Login) renderMFAInitDone(w http.ResponseWriter, r *http.Request, authRe
 	var errType, errMessage string
 	data.baseData = l.getBaseData(r, authReq, "MFA Init Done", errType, errMessage)
 	data.profileData = l.getProfileData(authReq)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMFAInitDone], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAInitDone], data, nil)
 }

internal/ui/login/handler/mfa_init_u2f.go

@@ -37,7 +37,7 @@ func (l *Login) renderRegisterU2F(w http.ResponseWriter, r *http.Request, authRe
 		},
 		MFAType: model.MFATypeU2F,
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMFAU2FInit], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAU2FInit], data, nil)
 }
 
 func (l *Login) handleRegisterU2F(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/mfa_init_verify_handler.go

@@ -78,7 +78,8 @@ func (l *Login) renderMFAInitVerify(w http.ResponseWriter, r *http.Request, auth
 		}
 	}
 
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMFAInitVerify], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAInitVerify], data, nil)
 }
 
 func generateQrCode(url string) (string, error) {

internal/ui/login/handler/mfa_prompt_handler.go

@@ -73,7 +73,8 @@ func (l *Login) renderMFAPrompt(w http.ResponseWriter, r *http.Request, authReq
 		l.handleMFACreation(w, r, authReq, data)
 		return
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMFAPrompt], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAPrompt], data, nil)
 }
 
 func (l *Login) handleMFACreation(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaVerifyData) {

internal/ui/login/handler/mfa_verify_handler.go

@@ -73,7 +73,7 @@ func (l *Login) renderMFAVerifySelected(w http.ResponseWriter, r *http.Request,
 		l.renderError(w, r, authReq, err)
 		return
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMFAVerify], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAVerify], data, nil)
 }
 
 func removeSelectedProviderFromList(providers []domain.MFAType, selected domain.MFAType) []domain.MFAType {

internal/ui/login/handler/mfa_verify_u2f_handler.go

@@ -44,7 +44,7 @@ func (l *Login) renderU2FVerification(w http.ResponseWriter, r *http.Request, au
 		MFAProviders:     providers,
 		SelectedProvider: -1,
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplU2FVerification], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplU2FVerification], data, nil)
 }
 
 func (l *Login) handleU2FVerification(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/password_complexity_policy_handler.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/caos/zitadel/internal/auth_request/model"
+	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/errors"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
@@ -24,16 +25,16 @@ var (
 	hasSymbol          = regexp.MustCompile(SymbolRegex).MatchString
 )
 
-func (l *Login) getPasswordComplexityPolicy(r *http.Request, orgID string) (*iam_model.PasswordComplexityPolicyView, string, error) {
+func (l *Login) getPasswordComplexityPolicy(r *http.Request, authReq *domain.AuthRequest, orgID string) (*iam_model.PasswordComplexityPolicyView, string, error) {
 	policy, err := l.authRepo.GetMyPasswordComplexityPolicy(setContext(r.Context(), orgID))
 	if err != nil {
 		return nil, err.Error(), err
 	}
-	description, err := l.generatePolicyDescription(r, policy)
+	description, err := l.generatePolicyDescription(r, authReq, policy)
 	return policy, description, nil
 }
 
-func (l *Login) getPasswordComplexityPolicyByUserID(r *http.Request, userID string) (*iam_model.PasswordComplexityPolicyView, string, error) {
+func (l *Login) getPasswordComplexityPolicyByUserID(r *http.Request, authReq *domain.AuthRequest, userID string) (*iam_model.PasswordComplexityPolicyView, string, error) {
 	user, err := l.authRepo.UserByID(r.Context(), userID)
 	if err != nil {
 		return nil, "", nil
@@ -42,31 +43,32 @@ func (l *Login) getPasswordComplexityPolicyByUserID(r *http.Request, userID stri
 	if err != nil {
 		return nil, err.Error(), err
 	}
-	description, err := l.generatePolicyDescription(r, policy)
+	description, err := l.generatePolicyDescription(r, authReq, policy)
 	return policy, description, nil
 }
 
-func (l *Login) generatePolicyDescription(r *http.Request, policy *iam_model.PasswordComplexityPolicyView) (string, error) {
+func (l *Login) generatePolicyDescription(r *http.Request, authReq *domain.AuthRequest, policy *iam_model.PasswordComplexityPolicyView) (string, error) {
 	description := "<ul class=\"lgn-no-dots lgn-policy\" id=\"passwordcomplexity\">"
-	minLength := l.renderer.LocalizeFromRequest(r, "Password.MinLength", nil)
+	translator := l.getTranslator(authReq)
+	minLength := l.renderer.LocalizeFromRequest(translator, r, "Password.MinLength", nil)
 	description += "<li id=\"minlength\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + minLength + " " + strconv.Itoa(int(policy.MinLength)) + "</span></li>"
 	if policy.HasUppercase {
-		uppercase := l.renderer.LocalizeFromRequest(r, "Password.HasUppercase", nil)
+		uppercase := l.renderer.LocalizeFromRequest(translator, r, "Password.HasUppercase", nil)
 		description += "<li id=\"uppercase\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + uppercase + "</span></li>"
 	}
 	if policy.HasLowercase {
-		lowercase := l.renderer.LocalizeFromRequest(r, "Password.HasLowercase", nil)
+		lowercase := l.renderer.LocalizeFromRequest(translator, r, "Password.HasLowercase", nil)
 		description += "<li id=\"lowercase\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + lowercase + "</span></li>"
 	}
 	if policy.HasNumber {
-		hasnumber := l.renderer.LocalizeFromRequest(r, "Password.HasNumber", nil)
+		hasnumber := l.renderer.LocalizeFromRequest(translator, r, "Password.HasNumber", nil)
 		description += "<li id=\"number\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + hasnumber + "</span></li>"
 	}
 	if policy.HasSymbol {
-		hassymbol := l.renderer.LocalizeFromRequest(r, "Password.HasSymbol", nil)
+		hassymbol := l.renderer.LocalizeFromRequest(translator, r, "Password.HasSymbol", nil)
 		description += "<li id=\"symbol\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + hassymbol + "</span></li>"
 	}
-	confirmation := l.renderer.LocalizeFromRequest(r, "Password.Confirmation", nil)
+	confirmation := l.renderer.LocalizeFromRequest(translator, r, "Password.Confirmation", nil)
 	description += "<li id=\"confirmation\" class=\"invalid\"><i class=\"lgn-icon-times-solid lgn-warn\"></i><span>" + confirmation + "</span></li>"
 
 	description += "</ul>"

internal/ui/login/handler/password_handler.go

@@ -29,7 +29,7 @@ func (l *Login) renderPassword(w http.ResponseWriter, r *http.Request, authReq *
 			return true
 		},
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPassword], data, funcs)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplPassword], data, funcs)
 }
 
 func (l *Login) handlePasswordCheck(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/password_reset_handler.go

@@ -30,5 +30,5 @@ func (l *Login) renderPasswordResetDone(w http.ResponseWriter, r *http.Request,
 		errID, errMessage = l.getErrorMessage(r, err)
 	}
 	data := l.getUserData(r, authReq, "Password Reset Done", errID, errMessage)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPasswordResetDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplPasswordResetDone], data, nil)
 }

internal/ui/login/handler/passwordless_login_handler.go

@@ -46,7 +46,7 @@ func (l *Login) renderPasswordlessVerification(w http.ResponseWriter, r *http.Re
 		},
 		passwordLogin,
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPasswordlessVerification], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplPasswordlessVerification], data, nil)
 }
 
 func (l *Login) handlePasswordlessVerification(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/register_handler.go

@@ -36,6 +36,7 @@ type registerData struct {
 	HasNumber                 string
 	HasSymbol                 string
 	ShowUsername              bool
+	OrgRegister               bool
 }
 
 func (l *Login) handleRegister(w http.ResponseWriter, r *http.Request) {
@@ -96,11 +97,12 @@ func (l *Login) renderRegister(w http.ResponseWriter, r *http.Request, authReque
 	if err != nil {
 		errID, errMessage = l.getErrorMessage(r, err)
 	}
+	translator := l.getTranslator(authRequest)
 	if formData == nil {
 		formData = new(registerFormData)
 	}
 	if formData.Language == "" {
-		formData.Language = l.renderer.Lang(r).String()
+		formData.Language = l.renderer.ReqLang(translator, r).String()
 	}
 	data := registerData{
 		baseData:         l.getBaseData(r, authRequest, "Register", errID, errMessage),
@@ -118,7 +120,7 @@ func (l *Login) renderRegister(w http.ResponseWriter, r *http.Request, authReque
 		resourceOwner = iam.GlobalOrgID
 	}
 
-	pwPolicy, description, _ := l.getPasswordComplexityPolicy(r, resourceOwner)
+	pwPolicy, description, _ := l.getPasswordComplexityPolicy(r, authRequest, resourceOwner)
 	if pwPolicy != nil {
 		data.PasswordPolicyDescription = description
 		data.MinLength = pwPolicy.MinLength
@@ -142,6 +144,7 @@ func (l *Login) renderRegister(w http.ResponseWriter, r *http.Request, authReque
 		return
 	}
 	data.ShowUsername = orgIAMPolicy.UserLoginMustBeDomain
+	data.OrgRegister = orgIAMPolicy.UserLoginMustBeDomain
 
 	funcs := map[string]interface{}{
 		"selectedLanguage": func(l string) bool {
@@ -157,7 +160,7 @@ func (l *Login) renderRegister(w http.ResponseWriter, r *http.Request, authReque
 			return formData.Gender == g
 		},
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplRegister], data, funcs)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplRegister], data, funcs)
 }
 
 func (d registerFormData) toHumanDomain() *domain.Human {

internal/ui/login/handler/register_option_handler.go

@@ -40,7 +40,8 @@ func (l *Login) renderRegisterOption(w http.ResponseWriter, r *http.Request, aut
 			return authReq.LoginPolicy.AllowExternalIDP && authReq.AllowedExternalIDPs != nil && len(authReq.AllowedExternalIDPs) > 0
 		},
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplRegisterOption], data, funcs)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplRegisterOption], data, funcs)
 }
 
 func (l *Login) handleRegisterOptionCheck(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/register_org_handler.go

@@ -85,12 +85,11 @@ func (l *Login) renderRegisterOrg(w http.ResponseWriter, r *http.Request, authRe
 	if formData == nil {
 		formData = new(registerOrgFormData)
 	}
-
 	data := registerOrgData{
 		baseData:            l.getBaseData(r, authRequest, "Register", errID, errMessage),
 		registerOrgFormData: *formData,
 	}
-	pwPolicy, description, _ := l.getPasswordComplexityPolicy(r, "0")
+	pwPolicy, description, _ := l.getPasswordComplexityPolicy(r, authRequest, "0")
 	if pwPolicy != nil {
 		data.PasswordPolicyDescription = description
 		data.MinLength = pwPolicy.MinLength
@@ -113,7 +112,8 @@ func (l *Login) renderRegisterOrg(w http.ResponseWriter, r *http.Request, authRe
 		data.IamDomain = orgPolicy.IAMDomain
 	}
 
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplRegisterOrg], data, nil)
+	translator := l.getTranslator(authRequest)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplRegisterOrg], data, nil)
 }
 
 func (d registerOrgFormData) toUserDomain() *domain.Human {

internal/ui/login/handler/renderer.go

@@ -284,7 +284,7 @@ func (l *Login) renderInternalError(w http.ResponseWriter, r *http.Request, auth
 		msg = err.Error()
 	}
 	data := l.getBaseData(r, authReq, "Error", "Internal", msg)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplError], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplError], data, nil)
 }
 
 func (l *Login) getUserData(r *http.Request, authReq *domain.AuthRequest, title string, errType, errMessage string) userData {
@@ -304,7 +304,7 @@ func (l *Login) getBaseData(r *http.Request, authReq *domain.AuthRequest, title
 			ErrID:      errType,
 			ErrMessage: errMessage,
 		},
-		Lang:                   l.renderer.Lang(r).String(),
+		Lang:                   l.renderer.ReqLang(l.getTranslator(authReq), r).String(),
 		Title:                  title,
 		Theme:                  l.getTheme(r),
 		ThemeMode:              l.getThemeMode(r),
@@ -338,6 +338,15 @@ func (l *Login) getBaseData(r *http.Request, authReq *domain.AuthRequest, title
 	return baseData
 }
 
+func (l *Login) getTranslator(authReq *domain.AuthRequest) *i18n.Translator {
+	translator, _ := l.renderer.NewTranslator()
+	if authReq != nil {
+		l.addLoginTranslations(translator, authReq.DefaultTranslations)
+		l.addLoginTranslations(translator, authReq.OrgTranslations)
+	}
+	return translator
+}
+
 func (l *Login) getProfileData(authReq *domain.AuthRequest) profileData {
 	var userName, loginName, displayName, avatar string
 	if authReq != nil {
@@ -357,7 +366,7 @@ func (l *Login) getProfileData(authReq *domain.AuthRequest) profileData {
 func (l *Login) getErrorMessage(r *http.Request, err error) (errID, errMsg string) {
 	caosErr := new(caos_errs.CaosError)
 	if errors.As(err, &caosErr) {
-		localized := l.renderer.LocalizeFromRequest(r, caosErr.Message, nil)
+		localized := l.renderer.LocalizeFromRequest(l.getTranslator(nil), r, caosErr.Message, nil)
 		return caosErr.ID, localized
 
 	}
@@ -416,6 +425,18 @@ func (l *Login) isDisplayLoginNameSuffix(authReq *domain.AuthRequest) bool {
 	}
 	return authReq.LabelPolicy != nil && !authReq.LabelPolicy.HideLoginNameSuffix
 }
+
+func (l *Login) addLoginTranslations(translator *i18n.Translator, customTexts []*domain.CustomText) {
+	for _, text := range customTexts {
+		msg := i18n.Message{
+			ID:   text.Key,
+			Text: text.Text,
+		}
+		err := l.renderer.AddMessages(translator, text.Language, msg)
+		logging.Log("HANDLE-GD3g2").OnError(err).Warn("could no add message to translator")
+	}
+}
+
 func getRequestID(authReq *domain.AuthRequest, r *http.Request) string {
 	if authReq != nil {
 		return authReq.ID
@@ -455,6 +476,7 @@ type baseData struct {
 	LoginPolicy            *domain.LoginPolicy
 	IDPProviders           []*domain.IDPProvider
 	LabelPolicy            *domain.LabelPolicy
+	LoginTexts             []*domain.CustomLoginText
 }
 
 type errorData struct {

internal/ui/login/handler/select_user_handler.go

@@ -21,7 +21,8 @@ func (l *Login) renderUserSelection(w http.ResponseWriter, r *http.Request, auth
 		Users:    selectionData.Users,
 		Linking:  len(authReq.LinkingUsers) > 0,
 	}
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplUserSelection], data, nil)
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplUserSelection], data, nil)
 }
 
 func (l *Login) handleSelectUser(w http.ResponseWriter, r *http.Request) {

internal/ui/login/handler/username_change_handler.go

@@ -20,7 +20,7 @@ func (l *Login) renderChangeUsername(w http.ResponseWriter, r *http.Request, aut
 		errID, errMessage = l.getErrorMessage(r, err)
 	}
 	data := l.getUserData(r, authReq, "Change Username", errID, errMessage)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangeUsername], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplChangeUsername], data, nil)
 }
 
 func (l *Login) handleChangeUsername(w http.ResponseWriter, r *http.Request) {
@@ -41,5 +41,5 @@ func (l *Login) handleChangeUsername(w http.ResponseWriter, r *http.Request) {
 func (l *Login) renderChangeUsernameDone(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) {
 	var errType, errMessage string
 	data := l.getUserData(r, authReq, "Username Change Done", errType, errMessage)
-	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangeUsernameDone], data, nil)
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplChangeUsernameDone], data, nil)
 }

internal/ui/login/static/i18n/de.yaml

@@ -3,13 +3,15 @@ Login:
   Description: Mit ZITADEL-Konto anmelden.
   TitleLinking: Anmeldung für Benutzer Linking
   DescriptionLinking: Gib deine Benutzerdaten ein um den externen Benutzer mit einem ZITADEL Benutzer zu linken.
-  Loginname: Loginname
+  LoginNameLabel: Loginname
   UsernamePlaceHolder: username
   LoginnamePlaceHolder: username@domain
-  ExternalLogin: Melde dich mit einem externen Benutzer an
+  ExternalUserDescription: Melde dich mit einem externen Benutzer an
   MustBeMemberOfOrg: Der Benutzer muss der Organisation {{.OrgName}} angehören.
+  RegisterButtonText: registrieren
+  NextButtonText: weiter
 
-UserSelection:
+SelectAccount:
   Title: Account auswählen
   Description: Wähle deinen Account aus.
   TitleLinking: Account auswählen um zu verlinken
@@ -22,210 +24,228 @@ UserSelection:
 Password:
   Title: Willkommen zurück!
   Description: Gib deine Benutzerdaten ein.
-  Password: Passwort
+  PasswordLabel: Passwort
   MinLength: Mindestlänge
   HasUppercase: Grossbuchstaben
   HasLowercase: Kleinbuchstaben
   HasNumber: Nummer
   HasSymbol: Symbol
   Confirmation: Bestätigung stimmt überein
+  ResetLinkText: Password zurücksetzen
+  BackButtonText: zurück
+  NextButtonText: weiter
 
 UsernameChange:
   Title: Usernamen ändern
   Description: Wähle deinen neuen Benutzernamen
-  Username: Benutzernamen
+  UsernameLabel: Benutzernamen
+  CancelButtonText: abbrechen
+  NextButtonText: weiter
 
 UsernameChangeDone:
   Title: Username geändert
   Description: Der Username wurde erfolgreich geändert.
+  NextButtonText: next
 
-MFAVerify:
-  Title: Multifaktor verifizieren
-  Description: Verifiziere deinen Multifaktor
-  OTP: OTP (One Time Password)
-  Code: Code
-  
-InitPassword: 
+
+InitPassword:
   Title: Passwort setzen
   Description: Du hast einen Code erhalten, welcher im untenstehenden Formular eingegeben werden muss um ein neues Passwort zu setzen.
-  Code: Code
-  NewPassword: Neues Passwort
-  NewPasswordConfirm: Passwort bestätigen
+  CodeLabel: Code
+  NewPasswordLabel: Neues Passwort
+  NewPasswordConfirmLabel: Passwort bestätigen
+  ResendButtonText: erneut senden
+  NextButtonText: weiter
 
 InitPasswordDone:
   Title: Passwort gesetzt
   Description: Passwort erfolgreich gesetzt
+  NextButtonText: weiter
+  CancelButtonText: abbrechen
 
 InitUser:
   Title: User aktivieren
   Description: Du hast einen Code erhalten, welcher im untenstehenden Formular eingegeben werden muss um deine EMail zu verifizieren und ein neues Passwort zu setzen.
-  Code: Code
-  NewPassword: Neues Passwort
-  NewPasswordConfirm: Passwort bestätigen
+  CodeLabel: Code
+  NewPasswordLabel: Neues Passwort
+  NewPasswordConfirmLabel: Passwort bestätigen
+  NextButtonText: weiter
+  ResendButtonText: erneut senden
 
 InitUserDone:
   Title: User aktiviert
   Description: EMail verifiziert und Passwort erfolgreich gesetzt
+  NextButtonText: weiter
+  CancelButtonText: abbrechen
 
-MFA:
-  Provider0: OTP (One Time Password)
-  Provider1: U2F (Universal 2nd Factor)
-  ChooseOther: oder wähle eine andere Option aus
-
-MFAPrompt:
+InitMFAPrompt:
   Title: Multifaktor hinzufügen
   Description: Möchtest du einen Mulitfaktor hinzufügen?
   Provider0: OTP (One Time Password)
   Provider1: U2F (Universal 2nd Factor)
+  NextButtonText: weiter
+  SkipButtonText: überspringen
 
-MFAInitVerify:
+InitMFAOTP:
   Title: Multifaktor Verifizierung
   Description: Verifiziere deinen Multifaktor
   OTPDescription: Scanne den Code mit einem Authentifizierungs-App (z.B Google Authenticator) oder kopiere das Secret und gib anschliessend den Code ein.
-  Secret: Secret
-  Code: Code
+  SecretLabel: Secret
+  CodeLabel: Code
+  NextButtonText: weiter
+  CancelButtonText: abbrechen
 
-MFAInitDone:
-  Title: Multifaktor Verifizierung erstellt
-  Description: Multifikator Verifizierung erfolgreich abgeschlossen. Der Multifaktor muss bei jeder Anmeldung eingegeben werden.
-
-MFAInitU2F:
+InitMFAU2F:
   Title: Multifaktor U2F / WebAuthN hinzufügen
   Description: Füge dein Token hinzu, indem du einen Namen eingibst und den 'Token registrieren' Button drückst.
+  TokenNameLabel: Name des Tokens / Geräts
+  NotSupported: WebAuthN wird durch deinen Browser nicht unterstützt. Stelle sicher, dass du die aktuelle Version installiert hast oder nutze einen anderen (z.B. Chrome, Safari, Firefox)
+  RegisterTokenButtonText: Token registrieren
+  ErrorRetry: Versuche es erneut, erstelle eine neue Abfrage oder wähle einen andere Methode.
 
-MFAVerifyU2F:
+InitMFADone:
+  Title: Multifaktor Verifizierung erstellt
+  Description: Multifikator Verifizierung erfolgreich abgeschlossen. Der Multifaktor muss bei jeder Anmeldung eingegeben werden.
+  NextButtonText: weiter
+  CancelButtonText: abbrechen
+
+MFAProvider:
+  Provider0: OTP (One Time Password)
+  Provider1: U2F (Universal 2nd Factor)
+  ChooseOther: oder wähle eine andere Option aus
+
+VerifyMFAOTP:
+  Title: Multifaktor verifizieren
+  Description: Verifiziere deinen Multifaktor
+  CodeLabel: Code
+  NextButtonText: next
+
+VerifyMFAU2F:
   Title: Multifaktor Verifizierung
   Description: Verifiziere deinen Multifaktor U2F / WebAuthN Token
-
-WebAuthN:
-  Name: Name des Tokens / Geräts
   NotSupported: WebAuthN wird durch deinen Browser nicht unterstützt. Stelle sicher, dass du die aktuelle Version installiert hast oder nutze einen anderen (z.B. Chrome, Safari, Firefox)
-  Error:
-    Retry: Versuche es erneut, erstelle eine neue Abfrage oder wähle einen andere Methode.
+  ErrorRetry: Versuche es erneut, erstelle eine neue Abfrage oder wähle einen andere Methode.
+  ValidateTokenButtonText: Token validieren
 
 Passwordless:
   Title: Passwortlos einloggen
   Description: Verifiziere dein Token
+  NotSupported: WebAuthN wird durch deinen Browser nicht unterstützt. Stelle sicher, dass du die aktuelle Version installiert hast oder nutze einen anderen (z.B. Chrome, Safari, Firefox)
+  ErrorRetry: Versuche es erneut, erstelle eine neue Abfrage oder wähle einen andere Methode.
+  LoginWithPwButtonText: Mit Passwort anmelden
+  ValidateTokenButtonText: Token validieren
 
 PasswordChange:
   Title: Passwort ändern
   Description: Ändere dein Password in dem du dein altes und dann dein neuen Passwort eingibst.
-  OldPassword: Altes Passwort
-  NewPassword: Neues Passwort
-  NewPasswordConfirmation: Passwort Bestätigung
+  OldPasswordLabel: Altes Passwort
+  NewPasswordLabel: Neues Passwort
+  NewPasswordConfirmationLabel: Passwort Bestätigung
+  CancelButtonText: abbrechen
+  NextButtonText: weiter
 
 PasswordChangeDone:
   Title: Passwort ändern
   Description: Das Passwort wurde erfolgreich geändert.
+  NextButtonText: weiter
 
 PasswordResetDone:
   Title: Resetlink versendet
   Description: Prüfe dein E-Mail Postfach, um ein neues Passwort zu setzen.
-
-PasswordSetDone:
-  Title: Passwort gesetzt
-  Description: Das Passwort wurde erfolgreich gesetzt.
+  NextButtonText: weiter
 
 EmailVerification:
   Title: E-Mail Verifizierung
   Description: Du hast ein E-Mail zur Verifizierung deiner E-Mail Adresse bekommen. Gib den Code im untenstehenden Formular ein. Mit erneut versenden, wird dir ein neues E-Mail zugestellt.
-  Code: Code
+  CodeLabel: Code
+  NextButtonText: weiter
+  ResendButtonText: erneut sende
 
 EmailVerificationDone:
   Title: E-Mail Verifizierung
   Description: Deine E-Mail Adresse wurde erfolgreich verifiziert.
+  NextButtonText: weiter
+  CancelButtonText: abbrechen
+  LoginButtonText: anmelden
 
 RegisterOption:
   Title: Registrations Möglichkeiten
   Description: Wähle aus wie du dich registrieren möchtest.
-  RegisterUsernamePassword: Mit Benutzername Passwort
+  RegisterUsernamePasswordButtonText: Mit Benutzername Passwort
+  ExternalLoginDescription: oder registriere dich mit einem externen Benutzer
 
-Registration:
+RegistrationUser:
   Title: Registration
   Description: Gib deine Benutzerangaben an. Die E-Mail Adresse wird als Benutzernamen verwendet.
-  Email: E-Mail
-  Username: Benutzername
-  Firstname: Vorname
-  Lastname: Nachname
-  Language: Sprache
+  DescriptionOrgRegister: Gib deine Benutzerangaben an.
+  EmailLabel: E-Mail
+  UsernameLabel: Benutzername
+  FirstnameLabel: Vorname
+  LastnameLabel: Nachname
+  LanguageLabel: Sprache
   German: Deutsch
   English: English
-  Gender: Geschlecht
+  GenderLabel: Geschlecht
   Female: weiblich
   Male: männlich
   Diverse: diverse
-  Password: Passwort
-  Password2: Passwort wiederholen
-  TosAndPrivacy: Allgemeine Geschäftsbedingungen und Datenschutz
+  PasswordLabel: Passwort
+  PasswordConfirmLabel: Passwort wiederholen
+  TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz
   TosConfirm: Ich akzeptiere die
   TosLinkText: AGBs
   TosConfirmAnd: und die
   PrivacyLinkText: Datenschutzerklärung
   ExternalLogin: oder registriere dich mit einem externen Benutzer
+  BackButtonText: zurück
+  NextButtonText: weiter
 
 RegistrationOrg:
   Title: Organisations Registration
   Description: Gib deinen Organisationsnamen und deine Benutzerangaben an.
-  OrgName: Organisationsname
-  OrgDomain: Domäne
-  Email: E-Mail
-  Username: Benutzername
-  Firstname: Vorname
-  Lastname: Nachname
-  Language: Sprache
-  German: Deutsch
-  English: English
-  Gender: Geschlecht
-  Female: weiblich
-  Male: männlich
-  Diverse: diverse
-  Password: Passwort
-  Password2: Passwort wiederholen
-  TosAndPrivacy: Allgemeine Geschäftsbedingungen und Datenschutz
+  OrgNameLabel: Organisationsname
+  EmailLabel: E-Mail
+  UsernameLabel: Benutzername
+  FirstnameLabel: Vorname
+  LastnameLabel: Nachname
+  PasswordLabel: Passwort
+  PasswordConfirmLabel: Passwort wiederholen
+  TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz
   TosConfirm: Ich akzeptiere die
   TosLinkText: AGBs
   TosConfirmAnd: und die
   PrivacyLinkText: Datenschutzerklärung
+  SaveButtonText: speichern
 
 LinkingUsersDone:
   Title: Benutzerlinking
   Description: Benuzterlinking erledigt.
+  CancelButtonText: abbrechen
+  NextButtonText: weiter
 
 ExternalNotFoundOption:
   Title: Externer Benutzer
   Description: Externer Benutzer konnte nicht gefunden werden. Willst du deinen Benutzer mit einem bestehenden verlinken oder diesen als neuen Benutzer registrieren.
-  Link: Verlinken
-  AutoRegister: Automatisches registrieren
+  LinkButtonText: Verlinken
+  AutoRegisterButtonText: Automatisches registrieren
 
 LoginSuccess:
   Title: Erfolgreich eingeloggt
-  AutoRedirect: Du wirst automatisch zurück in die Applikation geleitet. Danach kannst du diese Fenster schliessen.
-  Redirected: Du kannst diese Fenster nun schliessen.
+  AutoRedirectDescription: Du wirst automatisch zurück in die Applikation geleitet. Danach kannst du diese Fenster schliessen.
+  RedirectedDescription: Du kannst diese Fenster nun schliessen.
+  NextButtonText: weiter
 
 LogoutDone:
   Title: Ausgeloggt
   Description: Du wurdest erfolgreich ausgeloggt.
-
-Actions:
-  Login: anmelden
-  Next: weiter
-  Back: zurück
-  Resend: erneut senden
-  Skip: überspringen
-  Register: registrieren
-  ForgotPassword: Password zurücksetzen
-  Cancel: Abbrechen
-  Save: speichern
-  RegisterToken: Token registrieren
-  ValidateToken: Token validieren
-  Recreate: erneut erstellen
-  PasswordLogin: Mit Passwort anmelden
+  LoginButtonText: anmelden
 
 Footer:
   PoweredBy: Powered By
   Tos: AGB
   Privacy: Datenschutzerklärung
   Help: Hilfe
+  HelpLink: https://docs.zitadel.ch/docs/manuals/user-login
 
 Errors:
   Internal: Es ist ein interner Fehler aufgetreten

internal/ui/login/static/i18n/en.yaml

@@ -3,13 +3,15 @@ Login:
   Description: Enter your logindata.
   TitleLinking: Login for userlinking
   DescriptionLinking: Enter your login data to link your external user with a ZITADEL user.
-  Loginname: Loginname
+  LoginNameLabel: Loginname
   UsernamePlaceHolder: username
   LoginnamePlaceHolder: username@domain
-  ExternalLogin: Login with an external user.
+  ExternalUserDescription: Login with an external user.
   MustBeMemberOfOrg: The user must be member of the {{.OrgName}} organisation.
+  RegisterButtonText: register
+  NextButtonText: next
 
-UserSelection:
+SelectAccount:
   Title: Select account
   Description: Use your ZITADEL-Account
   TitleLinking: Select account for userlinking
@@ -22,210 +24,227 @@ UserSelection:
 Password:
   Title: Password
   Description: Enter your logindata.
-  Password: Password
+  PasswordLabel: Password
   MinLength: Minimumlength
   HasUppercase: Uppercase letter
   HasLowercase: Lowercase letter
   HasNumber: Number
   HasSymbol: Symbol
   Confirmation: Confirmation match
+  ResetLinkText: reset password
+  BackButtonText: back
+  NextButtonText: next
 
 UsernameChange:
   Title: Change Username
   Description: Set your new username
-  Username: Username
+  UsernameLabel: Username
+  CancelButtonText: cancel
+  NextButtonText: next
 
 UsernameChangeDone:
   Title: Username changed
   Description: Your username was changed successfully.
-
-MFAVerify:
-  Title: Verify Multificator
-  Description: Verify your multifactor
-  OTP: OTP (One Time Password)
-  Code: Code
+  NextButtonText: next
 
 InitPassword: 
   Title: Set Password
   Description: You have received a code, which you have to enter in the form below, to set your new password.
-  Code: Code
-  NewPassword: New Password
-  NewPasswordConfirm: Confirm Password
+  CodeLabel: Code
+  NewPasswordLabel: New Password
+  NewPasswordConfirmLabel: Confirm Password
+  ResendButtonText: resend
+  NextButtonText: next
 
 InitPasswordDone:
   Title: Password set
   Description: Password successfully set
+  NextButtonText: next
+  CancelButtonText: cancel
 
 InitUser:
   Title: Activate User
   Description: You have received a code, which you have to enter in the form below, to verify your email and set your new password.
-  Code: Code
-  NewPassword: New Password
-  NewPasswordConfirm: Confirm Password
+  CodeLabel: Code
+  NewPasswordLabel: New Password
+  NewPasswordConfirmLabel: Confirm Password
+  NextButtonText: next
+  ResendButtonText: resend
 
 InitUserDone:
   Title: User activated
   Description: Email verified and Password successfully set
+  NextButtonText: next
+  CancelButtonText: cancel
 
-MFA:
-  Provider0: OTP (One Time Password)
-  Provider1: U2F (Universal 2nd Factor)
-  ChooseOther: or choose an other option
-
-MFAPrompt:
+InitMFAPrompt:
   Title: Multifactor Setup
   Description: Would you like to setup multifactor authentication?
   Provider0: OTP (One Time Password)
   Provider1: U2F (Universal 2nd Factor)
+  NextButtonText: weiter
+  SkipButtonText: überspringen
 
-MFAInitVerify:
+InitMFAOTP:
   Title: Multifactor Verification
   Description: Verify your multifactor.
   OTPDescription: Scan the code with your authenticator app (e.g Google Authenticator) or copy the secret and insert the generated code below.
-  Secret: Secret
-  Code: Code
+  SecretLabel: Secret
+  CodeLabel: Code
+  NextButtonText: next
+  CancelButtonText: cancel
 
-MFAInitDone:
-  Title: Multifcator Verification done
-  Description: Multifactor verification successfully done. The multifactor has to be entered on each login.
-
-MFAInitU2F:
+InitMFAU2F:
   Title: Multifactor Setup U2F / WebAuthN
   Description: Add your Token by providing a name and then clicking on the 'Register Token' button below.
+  TokenNameLabel: Name of the tokens / machine
+  NotSupported: WebAuthN is not supported by your browser. Please ensure it is up to date or use a different one (e.g. Chrome, Safari, Firefox)
+  RegisterTokenButtonText: Register Token
+  ErrorRetry: Retry, create a new challenge or choose a different method.
 
-MFAVerifyU2F:
+InitMFADone:
+  Title: Multifcator Verification done
+  Description: Multifactor verification successfully done. The multifactor has to be entered on each login.
+  NextButtonText: next
+  CancelButtonText: cancel
+
+MFAProvider:
+  Provider0: OTP (One Time Password)
+  Provider1: U2F (Universal 2nd Factor)
+  ChooseOther: or choose an other option
+
+VerifyMFAOTP:
+  Title: Verify Multificator
+  Description: Verify your multifactor
+  CodeLabel: Code
+  NextButtonText: next
+
+VerifyMFAU2F:
   Title: Multifactor Verification
   Description: Verify your multifactor U2F / WebAuthN token
-
-WebAuthN:
-  Name: Name of the tokens / machine
-  NotSupported: WebAuthN is not supported by your browser. Please ensure it is up to date or use a different one (e.g. Chrome, Safari, Firefox)
-  Error:
-    Retry: Retry, create a new challenge or choose a different method.
+  NotSupported: WebAuthN wird durch deinen Browser nicht unterstützt. Stelle sicher, dass du die aktuelle Version installiert hast oder nutze einen anderen (z.B. Chrome, Safari, Firefox)
+  ErrorRetry: Versuche es erneut, erstelle eine neue Abfrage oder wähle einen andere Methode.
+  ValidateTokenButtonText: Validate Token
 
 Passwordless:
   Title: Login passwordless
   Description: Verify your token
+  NotSupported: WebAuthN is not supported by your browser. Please ensure it is up to date or use a different one (e.g. Chrome, Safari, Firefox)
+  ErrorRetry: Retry, create a new challenge or choose a different method.
+  LoginWithPwButtonText: Login with password
+  ValidateTokenButtonText: Token validieren
 
 PasswordChange:
   Title: Change Password
   Description: Change your password. Enter your old and new password.
-  OldPassword: Old Password
-  NewPassword: New Password
-  NewPasswordConfirmation: Password confirmation
+  OldPasswordLabel: Old Password
+  NewPasswordLabel: New Password
+  NewPasswordConfirmationLabel: Password confirmation
+  CancelButtonText: cancel
+  NextButtonText: next
 
 PasswordChangeDone:
   Title: Change Password
   Description: Your password was changed successfully.
+  NextButtonText: next
 
 PasswordResetDone:
   Title: Reset link set
   Description: Check your email to to reset your password.
-
-PasswordSetDone:
-  Title: Password set
-  Description: Your password was set successfully.
+  NextButtonText: next
 
 EmailVerification:
   Title: E-Mail Verification
   Description: We have sent you an email to verify your address. Please enter the code in the form below.
-  Code: Code
+  CodeLabel: Code
+  NextButtonText: next
+  ResendButtonText: resend
 
 EmailVerificationDone:
   Title: E-Mail Verification
   Description: Your email address has been successfully verified.
+  NextButtonText: next
+  CancelButtonText: cancel
+  LoginButtonText: login
 
 RegisterOption:
   Title: Registration Options
   Description: Choose how you'd like to register
-  RegisterUsernamePassword: With username password
+  RegisterUsernamePasswordButtonText: With username password
+  ExternalLoginDescription: or register with an external user
 
-Registration:
+RegistrationUser:
   Title: Registration
   Description: Enter your Userdata. Your email address will be used as loginname.
-  Email: E-Mail
-  Username: Username
-  Firstname: Firstname
-  Lastname: Lastname
-  Language: Language
+  DescriptionOrgRegister: Enter your Userdata.
+  EmailLabel: E-Mail
+  UsernameLabel: Username
+  FirstnameLabel: Firstname
+  LastnameLabel: Lastname
+  LanguageLabel: Language
   German: Deutsch
   English: English
-  Gender: Gender
+  GenderLabel: Gender
   Female: Female
   Male: Male
   Diverse: diverse / X
-  Password: Password
-  Password2: Password confirmation
-  TosAndPrivacy: Terms and conditions
+  PasswordLabel: Password
+  PasswordConfirmLabel: Password confirmation
+  TosAndPrivacyLabel: Terms and conditions
   TosConfirm: I accept the
   TosLinkText: TOS
   TosConfirmAnd: and the
   PrivacyLinkText: privacy policy
   ExternalLogin: or register with an external user
+  BackButtonText: back
+  NextButtonText: next
 
 RegistrationOrg:
   Title: Organisation Registration
   Description: Enter your organisationname and userdata.
-  OrgName: Organisationname
-  OrgDomain: Domäne
-  Email: E-Mail
-  Username: Username
-  Firstname: Firstname
-  Lastname: Lastname
-  Language: Language
-  German: Deutsch
-  English: English
-  Gender: Gender
-  Female: Female
-  Male: Male
-  Diverse: diverse / X
-  Password: Password
-  Password2: Password confirmation
-  TosAndPrivacy: Terms and conditions
+  OrgNameLabel: Organisationname
+  EmailLabel: E-Mail
+  UsernameLabel: Username
+  FirstnameLabel: Firstname
+  LastnameLabel: Lastname
+  PasswordLabel: Password
+  PasswordConfirmLabel: Password confirmation
+  TosAndPrivacyLabel: Terms and conditions
   TosConfirm: I accept the
   TosLinkText: TOS
   TosConfirmAnd: and the
   PrivacyLinkText: privacy policy
+  SaveButtonText: save
 
 LoginSuccess:
   Title: Login successful
-  AutoRedirect: You will be directed back to your application automatically. If not, click on the button below. You can close the window afterwards.
-  Redirected: You can now close this window.
+  AutoRedirectDescription: You will be directed back to your application automatically. If not, click on the button below. You can close the window afterwards.
+  RedirectedDescription: You can now close this window.
+  NextButtonText: next
 
 LogoutDone:
   Title: Logged out
   Description: You have logged out successfully.
+  LoginButtonText: login
 
 LinkingUsersDone:
   Title: Userlinking
   Description: Userlinking done.
+  CancelButtonText: cancel
+  NextButtonText: next
 
 ExternalNotFoundOption:
   Title: External User
   Description: External user not found. Do you want to link your user or auto register a new one.
-  Link: Link
-  AutoRegister: Auto register
-
-Actions:
-  Login: login
-  Next: next
-  Back: back
-  Resend: resend
-  Skip: skip
-  Register: register
-  ForgotPassword: reset password
-  Cancel: cancel
-  Save: save
-  RegisterToken: Register Token
-  ValidateToken: Validate Token
-  Recreate: recreate
-  PasswordLogin: Login with password
+  LinkButtonText: Link
+  AutoRegisterButtonText: Auto register
 
 Footer:
   PoweredBy: Powered By
   Tos: TOS
   Privacy: Privacy policy
   Help: Help
+  HelpLink: https://docs.zitadel.ch/docs/manuals/user-login
 
 Errors:
   Internal: An internal error occured

internal/ui/login/static/templates/change_password.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "PasswordChange.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "PasswordChange.Description"}}</p>
@@ -14,13 +15,13 @@
 
     <div class="fields">
         <div class="field">
-            <label class="lgn-label" for="change-old-password">{{t "PasswordChange.OldPassword"}}</label>
+            <label class="lgn-label" for="change-old-password">{{t "PasswordChange.OldPasswordLabel"}}</label>
             <input class="lgn-input" type="password" id="change-old-password" name="change-old-password"
                 autocomplete="current-password" autofocus required>
         </div>
 
         <div class="field">
-            <label class="lgn-label" for="change-new-password">{{t "PasswordChange.NewPassword"}}</label>
+            <label class="lgn-label" for="change-new-password">{{t "PasswordChange.NewPasswordLabel"}}</label>
             <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
                 data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
                 data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="change-new-password"
@@ -30,7 +31,7 @@
 
         <div class="field">
             <label class="lgn-label"
-                for="change-password-confirmation">{{t "PasswordChange.NewPasswordConfirmation"}}</label>
+                for="change-password-confirmation">{{t "PasswordChange.NewPasswordConfirmationLabel"}}</label>
             <input class="lgn-input" type="password" id="change-password-confirmation"
                 name="change-password-confirmation" autocomplete="new-password" required>
         </div>
@@ -40,11 +41,11 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "PasswordChange.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
         <button type="submit" id="change-password-button" name="resend" value="false"
-            class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
+            class="lgn-raised-button lgn-primary">{{t "PasswordChange.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/change_password_done.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "PasswordChangeDone.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "PasswordChangeDone.Description"}}</p>
@@ -13,11 +14,8 @@
     <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
 
     <div class="lgn-actions">
-        <!-- <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
-        </a> -->
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "PasswordChangeDone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/change_username.html

@@ -1,6 +1,8 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "UsernameChange.Title"}}</h1>
+
     {{ template "user-profile" . }}
 
     <p>{{t "UsernameChange.Description"}}</p>
@@ -13,7 +15,7 @@
     <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
 
     <div class="field">
-        <label class="lgn-label" for="username">{{t "UsernameChange.Username"}}</label>
+        <label class="lgn-label" for="username">{{t "UsernameChange.UsernameLabel"}}</label>
         <input class="lgn-input" type="text" id="username" name="username" autocomplete="username" autofocus required>
     </div>
 
@@ -21,11 +23,11 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "UsernameChange.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
         <button type="submit" id="submit-button" value="false"
-            class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
+            class="lgn-raised-button lgn-primary">{{t "UsernameChange.NextButtonText"}}</button>
 
     </div>
 </form>

internal/ui/login/static/templates/change_username_done.html

@@ -1,6 +1,8 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "UsernameChangeDone.Title"}}</h1>
+
     {{ template "user-profile" . }}
 
     <p>{{t "UsernameChangeDone.Description"}}</p>
@@ -15,7 +17,7 @@
 
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "UsernameChangeDone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/external_not_found_option.html

@@ -18,10 +18,10 @@
         </button>
         
         <button class="lgn-raised-button lgn-primary" name="link" value="true"
-            formnovalidate>{{t "ExternalNotFoundOption.Link"}}</button>
+            formnovalidate>{{t "ExternalNotFoundOption.LinkButtonText"}}</button>
         <span class="fill-space"></span>
         <button class="lgn-raised-button lgn-primary" name="autoregister" value="true"
-            formnovalidate>{{t "ExternalNotFoundOption.AutoRegister"}}</button>
+            formnovalidate>{{t "ExternalNotFoundOption.AutoRegisterButtonText"}}</button>
     </div>
 
     {{template "error-message" .}}

internal/ui/login/static/templates/footer.html

@@ -1,4 +1,3 @@
-
 {{define "footer"}}
 <footer>
     {{ if hasWatermark .LabelPolicy }}
@@ -14,6 +13,6 @@
     {{ if .PrivacyLink }}
         <a href="{{.PrivacyLink}}" rel="noopener noreferrer" target="_blank" alt="Privacy Policy">{{t "Footer.Privacy"}}</a>
     {{end}}
-    <a href="https://docs.zitadel.ch/docs/manuals/user-login" target="_black" alt="Help">{{t "Footer.Help"}}</a>
+    <a href="{{t "Footer.HelpLink"}}" target="_black" alt="Help">{{t "Footer.Help"}}</a>
 </footer>
 {{end}}

internal/ui/login/static/templates/init_password.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "InitPassword.Title" }}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "InitPassword.Description" }}</p>
@@ -15,12 +16,12 @@
 
     <div class="fields">
         <div class="field">
-            <label class="lgn-label" for="code">{{t "InitPassword.Code"}}</label>
+            <label class="lgn-label" for="code">{{t "InitPassword.CodeLabel"}}</label>
             <input class="lgn-input" type="text" id="code" name="code" value="{{.Code}}" autocomplete="off" autofocus
                 required>
         </div>
         <div class="field">
-            <label class="lgn-label" for="password">{{t "InitPassword.NewPassword"}}</label>
+            <label class="lgn-label" for="password">{{t "InitPassword.NewPasswordLabel"}}</label>
             <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
                 data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
                 data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="password" name="password"
@@ -28,7 +29,7 @@
             {{ .PasswordPolicyDescription }}
         </div>
         <div class="field">
-            <label class="lgn-label" for="passwordconfirm">{{t "InitPassword.NewPasswordConfirm"}}</label>
+            <label class="lgn-label" for="passwordconfirm">{{t "InitPassword.NewPasswordConfirmLabel"}}</label>
             <input class="lgn-input" type="password" id="passwordconfirm" name="passwordconfirm"
                 autocomplete="new-password" autofocus required>
         </div>
@@ -42,11 +43,11 @@
             <i class="lgn-icon-arrow-left-solid"></i>
         </a>
         <button type="submit" id="init-button" name="resend" value="false"
-            class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
+            class="lgn-raised-button lgn-primary">{{t "InitPassword.NextButtonText"}}</button>
 
         <span class="fill-space"></span>
 
-        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
+        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitPassword.ResendButtonText" }}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/init_password_done.html

@@ -1,9 +1,10 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "InitPasswordDone.Title"}}</h1>
     {{ template "user-profile" . }}
 
-    <p>{{t "PasswordSetDone.Description"}}</p>
+    <p>{{t "InitPasswordDone.Description"}}</p>
 </div>
 
 <form action="{{ loginUrl }}" method="POST">
@@ -14,10 +15,10 @@
 
     <div class="lgnactions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "InitPasswordDone.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "InitPasswordDone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/init_user.html

@@ -1,6 +1,8 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "InitUser.Title" }}</h1>
+
     {{ template "user-profile" . }}
 
     <p>{{t "InitUser.Description" }}</p>
@@ -16,14 +18,14 @@
 
     <div class="fields">
         <div class="field">
-            <label class="lgn-label" for="code">{{t "InitUser.Code"}}</label>
+            <label class="lgn-label" for="code">{{t "InitUser.CodeLabel"}}</label>
             <input class="lgn-input" {{if .ErrMessage}}shake {{end}} type="text" id="code" name="code" value="{{.Code}}" autocomplete="off" autofocus
                 required>
         </div>
 
         {{ if not .PasswordSet }}
         <div class="field">
-            <label class="lgn-label" for="password">{{t "InitUser.NewPassword"}}</label>
+            <label class="lgn-label" for="password">{{t "InitUser.NewPasswordLabel"}}</label>
             <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
                 data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
                 data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="password" name="password"
@@ -31,7 +33,7 @@
             {{ .PasswordPolicyDescription }}
         </div>
         <div class="field">
-            <label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirm"}}</label>
+            <label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirmLabel"}}</label>
             <input class="lgn-input" type="password" id="passwordconfirm" name="passwordconfirm"
                 autocomplete="new-password" autofocus required>
         </div>
@@ -47,11 +49,11 @@
         </a>
 
         <button type="submit" id="init-button" name="resend" value="false"
-            class="lgn-primary lgn-raised-button">{{t "Actions.Next"}}</button>
+            class="lgn-primary lgn-raised-button">{{t "InitUser.NextButtonText"}}</button>
 
         <span class="fill-space"></span>
 
-        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
+        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitUser.ResendButtonText" }}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/init_user_done.html

@@ -1,7 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <p>{{t "InitUserDone.Title"}}</p>
+    <h1>{{t "InitUserDone.Title"}}</h1>
 
     {{ template "user-profile" . }}
 
@@ -15,10 +15,10 @@
     <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
 
     <div class="lgn-actions lgn-reverse-order">
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "InitUserDone.NextButtonText"}}</button>
         <span class="fill-space"></span>
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "InitUserDone.CancelButtonText"}}
         </a>
     </div>
 </form>

internal/ui/login/static/templates/link_users_done.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "LinkingUsersDone.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "LinkingUsersDone.Description"}}</p>
@@ -14,10 +15,10 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "LinkingUsersDone.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "LinkingUsersDone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/login.html

@@ -19,7 +19,7 @@
 
     {{if hasUsernamePasswordLogin }}
     <div class="fields">
-        <label class="lgn-label" for="loginName">{{t "Login.Loginname"}}</label>
+        <label class="lgn-label" for="loginName">{{t "Login.LoginNameLabel"}}</label>
         <div class="lgn-suffix-wrapper">
             <input class="lgn-input lgn-suffix-input" type="text" id="loginName" name="loginName" placeholder="{{if .OrgID }}{{t "Login.UsernamePlaceHolder"}}{{else}}{{t "Login.LoginnamePlaceHolder"}}{{end}}"
             value="{{ .UserName }}" {{if .ErrMessage}}shake {{end}} autocomplete="username" autofocus required>
@@ -33,16 +33,16 @@
     {{template "error-message" .}}
 
     <div class="lgn-actions lgn-reverse-order">
-        <button class="lgn-raised-button lgn-primary lgn-initial-focus" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary lgn-initial-focus" id="submit-button" type="submit">{{t "Login.NextButtonText"}}</button>
         <span class="fill-space"></span>
         {{if .LoginPolicy.AllowRegister}}
-        <button class="lgn-stroked-button lgn-primary" name="register" value="true" formnovalidate>{{t "Actions.Register"}}</button>
+        <button class="lgn-stroked-button lgn-primary" name="register" value="true" formnovalidate>{{t "Login.RegisterButtonText"}}</button>
         {{end}}
     </div>
 
     {{if hasExternalLogin }}
     <div class="lgn-idp-providers">
-        <p>{{t "Login.ExternalLogin"}}</p>
+        <p>{{t "Login.ExternalUserDescription"}}</p>
 
         {{ $reqid := .AuthReqID}}
         {{range $provider := .IDPProviders}}

internal/ui/login/static/templates/login_success.html

@@ -7,7 +7,7 @@
     {{ template "user-profile" . }}
 
     {{if .RedirectURI}}
-    <p>{{t "LoginSuccess.AutoRedirect"}}</p>
+    <p>{{t "LoginSuccess.AutoRedirectDescription"}}</p>
 </div>
 
 <form action="{{ .RedirectURI }}" method="GET">
@@ -18,14 +18,14 @@
 
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button id="redirect-button" class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
+        <button id="redirect-button" class="lgn-raised-button lgn-primary">{{t "LoginSuccess.NextButtonText"}}</button>
     </div>
 
 </form>
 
 <script src="{{ resourceUrl "scripts/login_success.js" }}"></script>
 {{else}}
-    <p>{{t "LoginSuccess.Redirected"}}</p>
+    <p>{{t "LoginSuccess.RedirectedDescription"}}</p>
 </div>
 {{end}}
 

internal/ui/login/static/templates/logout_done.html

@@ -10,7 +10,7 @@
 
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button class="primary right" type="submit">{{t "Actions.Login"}}</button>
+        <button class="primary right" type="submit">{{t "LogoutDone.LoginButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/mail_verification.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "EmailVerification.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "EmailVerification.Description"}}</p>
@@ -14,7 +15,7 @@
     <input type="hidden" name="userID" value="{{ .UserID }}" />
 
     <div class="fields">
-        <label class="lgn-label" for="code">{{t "EmailVerification.Code"}}</label>
+        <label class="lgn-label" for="code">{{t "EmailVerification.CodeLabel"}}</label>
         <input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
     </div>
 
@@ -22,13 +23,13 @@
 
     <div class="lgn-actions lgn-reverse-order">
         <button type="submit" id="submit-button" name="resend" value="false"
-        class="lgn-primary lgn-raised-button">{{t "Actions.Next"}}
+        class="lgn-primary lgn-raised-button">{{t "EmailVerification.NextButtonText"}}
         </button>
 
         <span class="fill-space"></span>
 
         {{ if .UserID }}
-        <button type="submit" name="resend" value="true" class="lgn-stroked-button lgn-primary" formnovalidate>{{t "Actions.Resend"}}</button>
+        <button type="submit" name="resend" value="true" class="lgn-stroked-button lgn-primary" formnovalidate>{{t "EmailVerification.ResendButtonText"}}</button>
         {{ end }}
 
         <a class="lgn-icon-button lgn-left-action" name="resetlinking" value="true" href="{{ loginUrl }}"

internal/ui/login/static/templates/mail_verified.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "EmailVerificationDone.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "EmailVerificationDone.Description"}}</p>
@@ -14,11 +15,16 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "EmailVerificationDone.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary"
-            type="submit">{{if .AuthReqID }}{{t "Actions.Next"}}{{else}}{{t "Actions.Login"}}{{end}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">
+            {{if .AuthReqID }}
+                {{t "EmailVerificationDone.NextButtonText"}}
+            {{else}}
+                {{t "EmailVerificationDone.LoginButtonText"}}
+            {{end}}
+        </button>
     </div>
 </form>
 

internal/ui/login/static/templates/mfa_init_done.html

@@ -1,11 +1,11 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "MFAInitDone.Title"}}</h1>
+    <h1>{{t "InitMFADone.Title"}}</h1>
 
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAInitDone.Description"}}</p>
+    <p>{{t "InitMFADone.Description"}}</p>
 </div>
 
 <form action="{{ loginUrl }}" method="POST">
@@ -17,10 +17,10 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "InitMFADone.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "InitMFADone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/mfa_init_otp.html

@@ -1,9 +1,11 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "InitMFAOTP.Title"}}</h1>
+
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAInitVerify.Description"}}</p>
+    <p>{{t "InitMFAOTP.Description"}}</p>
 </div>
 
 <form action="{{ mfaInitVerifyUrl }}" method="POST">
@@ -16,13 +18,13 @@
     <input type="hidden" name="secret" value="{{ .Secret }}" />
 
     {{if (eq .MFAType 0) }}
-    <p>{{t "MFAInitVerify.OTPDescription"}}</p>
+    <p>{{t "InitMFAOTP.OTPDescription"}}</p>
     <div class="lgn-qrcode" id="qrcode">
         {{.QrCode}}
     </div>
     <div class="fields">
         <div class="field">
-            <span class="lgn-label" for="secret">{{t "MFAInitVerify.Secret"}}</span>
+            <span class="lgn-label" for="secret">{{t "InitMFAOTP.SecretLabel"}}</span>
             <div class="lgn-row">
                 <span id="secret"> {{.Secret}} </span>
                 <span class="fill-space"></span>
@@ -32,7 +34,7 @@
             </div>
         </div>
         <div class="field">
-            <label class="lgn-label" for="code">{{t "MFAInitVerify.Code"}}</label>
+            <label class="lgn-label" for="code">{{t "InitMFAOTP.CodeLabel"}}</label>
             <input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
         </div>
     </div>
@@ -45,10 +47,10 @@
         </a>
         
         <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
-            {{t "Actions.Cancel"}}
+            {{t "InitMFAOTP.CancelButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-primary lgn-raised-button" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-primary lgn-raised-button" id="submit-button" type="submit">{{t "InitMFAOTP.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/mfa_init_u2f.html

@@ -1,9 +1,11 @@
 {{template "main-top" .}}
 
 <div class="head">
+    <h1>{{t "InitMFAU2F.Title"}}</h1>
+
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAInitU2F.Description"}}</p>
+    <p>{{t "InitMFAU2F.Description"}}</p>
 </div>
 
 <form action="{{ mfaInitU2FVerifyUrl }}" method="POST">
@@ -15,14 +17,14 @@
     <input type="hidden" name="credentialData" />
 
     <div class="fields">
-        <p class="wa-no-support lgn-error hidden">{{t "WebAuthN.NotSupported"}}</p>
+        <p class="wa-no-support lgn-error hidden">{{t "InitMFAU2F.NotSupported"}}</p>
         <div class="field">
-            <label class="lgn-label" for="name">{{t "WebAuthN.Name"}}</label>
+            <label class="lgn-label" for="name">{{t "InitMFAU2F.NameLabel"}}</label>
             <input class="lgn-input" type="text" id="name" name="name" autocomplete="off" autofocus>
         </div>
         <div id="wa-error" class="lgn-error hidden">
             <span class="cause"></span>
-            <span>{{t "WebAuthN.Error.Retry"}}</span>
+            <span>{{t "InitMFAU2F.ErrorRetry"}}</span>
         </div>
     </div>
 
@@ -35,7 +37,7 @@
         </a>
 
         <span class="fill-space"></span>
-        <a id="btn-register" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.RegisterToken"}}</a>
+        <a id="btn-register" class="lgn-raised-button lgn-primary wa-support">{{t "InitMFAU2F.RegisterTokenButtonText"}}</a>
     </div>
 </form>
 

internal/ui/login/static/templates/mfa_prompt.html

@@ -1,9 +1,10 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "InitMFAPrompt.Title"}}</h1>
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAPrompt.Description"}}</p>
+    <p>{{t "InitMFAPrompt.Description"}}</p>
 </div>
 
 <form action="{{ mfaPromptUrl }}" method="POST">
@@ -14,7 +15,7 @@
 
     <div class="fields">
         {{ range $provider := .MFAProviders}}
-        {{ $providerName := (t (printf "MFAPrompt.Provider%v" $provider)) }}
+        {{ $providerName := (t (printf "InitMFAPrompt.Provider%v" $provider)) }}
             <div class="lgn-radio block">
                 <input id="{{ $provider }}" type="radio" name="provider" value="{{ $provider }}">
                 <label for="{{ $provider }}">{{ $providerName }}</label>
@@ -29,10 +30,10 @@
         </a>
 
         {{if not .MFARequired}}
-        <button class="lgn-stroked-button lgn-primary" name="skip" value="true" type="submit" formnovalidate>{{t "Actions.Skip"}}</button>
+        <button class="lgn-stroked-button lgn-primary" name="skip" value="true" type="submit" formnovalidate>{{t "InitMFAPrompt.SkipButtonText"}}</button>
         {{end}}
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "InitMFAPrompt.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/mfa_verification_u2f.html

@@ -1,9 +1,11 @@
 {{template "main-top" .}}
 
 <div class="head">
+    <h1>{{t "VerifyMFAU2F.Title"}}</h1>
+
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAVerifyU2F.Description"}}</p>
+    <p>{{t "VerifyMFAU2F.Description"}}</p>
 </div>
 
 <form action="{{ mfaInitU2FLoginUrl }}" method="POST">
@@ -14,25 +16,25 @@
     <input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
     <input type="hidden" name="credentialData"/>
 
-    <p class="wa-no-support error hidden">{{t "WebAuthN.NotSupported"}}</p>
+    <p class="wa-no-support error hidden">{{t "VerifyMFAU2F.NotSupported"}}</p>
 
     <div id="wa-error" class="error hidden">
         <span class="cause"></span>
-        <span>{{t "WebAuthN.Error.Retry"}}</span>
+        <span>{{t "VerifyMFAU2F.ErrorRetry"}}</span>
     </div>
 
     {{ template "error-message" .}}
 
     <div class="lgn-actions" id="webauthn">
         <span class="fill-space"></span>
-        <a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.ValidateToken"}}</a>
+        <a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "VerifyMFAU2F.ValidateTokenButtonText"}}</a>
     </div>
 
     {{ if .MFAProviders }}
         <div class="lgn-mfa-other">
-            <p>{{t "MFA.ChooseOther"}}</p>
+            <p>{{t "MFAProvider.ChooseOther"}}</p>
             {{ range $provider := .MFAProviders}}
-                {{ $providerName := (t (printf "MFA.Provider%v" $provider)) }}
+                {{ $providerName := (t (printf "MFAProvider.Provider%v" $provider)) }}
                 <button class="lgn-stroked-button lgn-primary" type="submit" name="provider" value="{{$provider}}">{{$providerName}}</button>
             {{ end }}
         </div>

internal/ui/login/static/templates/mfa_verify_otp.html

@@ -1,11 +1,11 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "MFAVerify.Title"}}</h1>
+    <h1>{{t "VerifyMFAOTP.Title"}}</h1>
 
     {{ template "user-profile" . }}
 
-    <p>{{t "MFAVerify.Description"}}</p>
+    <p>{{t "VerifyMFAOTP.Description"}}</p>
 </div>
 
 <form action="{{ mfaVerifyUrl }}" method="POST">
@@ -16,7 +16,7 @@
     <input type="hidden" name="mfaType" value="{{ .SelectedMFAProvider }}" />
 
     <div class="fields">
-        <label class="lgn-label" for="code">{{t "MFAVerify.Code"}}</label>
+        <label class="lgn-label" for="code">{{t "VerifyMFAOTP.CodeLabel"}}</label>
         <input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
     </div>
 
@@ -28,14 +28,14 @@
             <i class="lgn-icon-arrow-left-solid"></i>
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" id="submit-button" type="submit">{{t "VerifyMFAOTP.NextButtonText"}}</button>
     </div>
 
     {{ if .MFAProviders }}
         <div class="lgn-mfa-other">
-            <p>{{t "MFA.ChooseOther"}}</p>
+            <p>{{t "MFAProvider.ChooseOther"}}</p>
             {{ range $provider := .MFAProviders}}
-            {{ $providerName := (t (printf "MFA.Provider%v" $provider)) }}
+            {{ $providerName := (t (printf "MFAProvider.Provider%v" $provider)) }}
             <button class="lgn-stroked-button lgn-primary" type="submit" name="provider" value="{{$provider}}"
                 formnovalidate>{{$providerName}}</button>
             {{ end }}

internal/ui/login/static/templates/password.html

@@ -14,7 +14,7 @@
     <input type="hidden" name="loginName" value="{{ .LoginName }}" />
 
     <div class="fields">
-        <label class="lgn-label" for="password">{{t "Password.Password"}}</label>
+        <label class="lgn-label" for="password">{{t "Password.PasswordLabel"}}</label>
         <input class="lgn-input" type="password" id="password" name="password" autocomplete="current-password" autofocus
             required {{if .ErrMessage}}shake {{end}}>
     </div>
@@ -23,16 +23,16 @@
 
     {{ if showPasswordReset }}
     <a class="block" href="{{ passwordResetUrl .AuthReqID }}">
-        {{t "Actions.ForgotPassword"}}
+        {{t "Password.ResetLinkText"}}
     </a>
     {{ end }}
 
     <div class="lgn-actions">
         <a href="{{ loginNameChangeUrl .AuthReqID }}">
-            <button class="lgn-stroked-button lgn-primary" type="button">{{t "Actions.Back"}}</button>
+            <button class="lgn-stroked-button lgn-primary" type="button">{{t "Password.BackButtonText"}}</button>
         </a>
         <span class="fill-space"></span>
-        <button id="submit-button" class="lgn-raised-button lgn-primary right" type="submit">{{t "Actions.Next"}}</button>
+        <button id="submit-button" class="lgn-raised-button lgn-primary right" type="submit">{{t "Password.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/password_reset_done.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
+    <h1>{{t "PasswordResetDone.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "PasswordResetDone.Description"}}</p>
@@ -15,7 +16,7 @@
     {{template "error-message" .}}
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" type="submit">{{t "PasswordResetDone.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/passwordless.html

@@ -1,6 +1,7 @@
 {{template "main-top" .}}
 
 <div class="head">
+    <h1>{{t "Passwordless.Title"}}</h1>
     {{ template "user-profile" . }}
 
     <p>{{t "Passwordless.Description"}}</p>
@@ -14,10 +15,10 @@
     <input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
     <input type="hidden" name="credentialData"/>
 
-    <p class="wa-no-support error hidden">{{t "WebAuthN.NotSupported"}}</p>
+    <p class="wa-no-support error hidden">{{t "Passwordless.NotSupported"}}</p>
     <div id="wa-error" class="error hidden">
         <span class="cause"></span>
-        <span>{{t "WebAuthN.Error.Retry"}}</span>
+        <span>{{t "Passwordless.ErrorRetry"}}</span>
     </div>
 
     {{ template "error-message" .}}
@@ -29,10 +30,10 @@
         </a>
 
         {{if .PasswordLogin}}
-            <button class="lgn-stroked-button lgn-primary" name="passwordlogin" value="true" type="submit">{{t "Actions.PasswordLogin"}}</button>
+            <button class="lgn-stroked-button lgn-primary" name="passwordlogin" value="true" type="submit">{{t "Passwordless.LoginWithPwButtonText"}}</button>
         {{end}}
         <span class="fill-space"></span>
-        <a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.ValidateToken"}}</a>
+        <a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Passwordless.ValidateTokenButtonText"}}</a>
     </div>
 </form>
 

internal/ui/login/static/templates/register.html

@@ -1,8 +1,13 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "Registration.Title"}}</h1>
-    <p>{{t "Registration.Description"}}</p>
+    <h1>{{t "RegistrationUser.Title"}}</h1>
+
+    {{if .OrgRegister}}
+    <p>{{t "RegistrationUser.DescriptionOrgRegister"}}</p>
+    {{ else}}
+    <p>{{t "RegistrationUser.Description"}}</p>
+    {{end}}
 </div>
 
 
@@ -16,25 +21,25 @@
 
         <div class="double-col">
             <div class="lgn-field">
-                <label class="lgn-label" for="firstname">{{t "Registration.Firstname"}}</label>
+                <label class="lgn-label" for="firstname">{{t "RegistrationUser.FirstnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
                     value="{{ .Firstname }}" autofocus required>
             </div>
             <div class="lgn-field">
-                <label class="lgn-label" for="lastname">{{t "Registration.Lastname"}}</label>
+                <label class="lgn-label" for="lastname">{{t "RegistrationUser.LastnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="lastname" name="lastname" autocomplete="family-name"
                     value="{{ .Lastname }}" required>
             </div>
         </div>
 
         <div class="lgn-field double">
-            <label class="lgn-label" for="email">{{t "Registration.Email"}}</label>
+            <label class="lgn-label" for="email">{{t "RegistrationUser.EmailLabel"}}</label>
             <input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}" required>
         </div>
 
         {{if .ShowUsername}}
         <div class="lgn-field double">
-            <label class="lgn-label" for="email">{{t "Registration.Username"}}</label>
+            <label class="lgn-label" for="email">{{t "RegistrationUser.UsernameLabel"}}</label>
             <div class="lgn-suffix-wrapper">
                 <input class="lgn-input lgn-suffix-input" type="text" id="username" name="username" autocomplete="email" value="{{ .Email }}" required>
                 {{if .DisplayLoginNameSuffix}}
@@ -46,27 +51,27 @@
 
         <div class="double-col">
             <div class="lgn-field">
-                <label class="lgn-label" for="languages">{{t "Registration.Language"}}</label>
+                <label class="lgn-label" for="languages">{{t "RegistrationUser.LanguageLabel"}}</label>
                 <select id="languages" name="language">
                     <option value=""></option>
-                    <option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "Registration.German"}}
+                    <option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "RegistrationUser.German"}}
                     </option>
-                    <option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "Registration.English"}}
+                    <option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "RegistrationUser.English"}}
                     </option>
                 </select>
             </div>
             <div class="lgn-field" >
                 <label class="lgn-label" for="genders">
-                    {{t "Registration.Gender"}}
+                    {{t "RegistrationUser.GenderLabel"}}
                     <span class="optional">{{t "optional"}}</span>
                 </label>
                 <select id="genders" name="gender">
                     <option value=""></option>
-                    <option value="1" id="female" {{if (selectedGender 1)}} selected {{end}}>{{t "Registration.Female"}}
+                    <option value="1" id="female" {{if (selectedGender 1)}} selected {{end}}>{{t "RegistrationUser.Female"}}
                     </option>
-                    <option value="2" id="male" {{if (selectedGender 2)}} selected {{end}}>{{t "Registration.Male"}}
+                    <option value="2" id="male" {{if (selectedGender 2)}} selected {{end}}>{{t "RegistrationUser.Male"}}
                     </option>
-                    <option value="3" id="diverse" {{if (selectedGender 3)}} selected {{end}}>{{t "Registration.Diverse"}}
+                    <option value="3" id="diverse" {{if (selectedGender 3)}} selected {{end}}>{{t "RegistrationUser.Diverse"}}
                     </option>
                 </select>
             </div>
@@ -74,14 +79,14 @@
 
         <div class="double-col">
             <div class="lgn-field">
-                <label class="lgn-label" for="register-password">{{t "Registration.Password"}}</label>
+                <label class="lgn-label" for="register-password">{{t "RegistrationUser.PasswordLabel"}}</label>
                 <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
                     data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
                     data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="register-password"
                     name="register-password" autocomplete="new-password" required>
             </div>
             <div class="lgn-field">
-                <label class="lgn-label" for="register-password-confirmation">{{t "Registration.Password2"}}</label>
+                <label class="lgn-label" for="register-password-confirmation">{{t "RegistrationUser.PasswordConfirmLabel"}}</label>
                 <input class="lgn-input" type="password" id="register-password-confirmation"
                     name="register-password-confirmation" autocomplete="new-password" required>
             </div>
@@ -93,23 +98,23 @@
 
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
-            <label class="lgn-label">{{t "Registration.TosAndPrivacy"}}</label>
+            <label class="lgn-label">{{t "RegistrationUser.TosAndPrivacy"}}</label>
             <div class="lgn-checkbox">
                 <input type="checkbox" id="register-term-confirmation"
                     name="register-term-confirmation" required>
                 <label for="register-term-confirmation">
-                   {{t "Registration.TosConfirm"}}
+                   {{t "RegistrationUser.TosConfirm"}}
                     {{ if .TOSLink }}
                         <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
-                            {{t "Registration.TosLinkText"}}
+                            {{t "RegistrationUser.TosLinkText"}}
                         </a>
                     {{end}}
                     {{ if and .TOSLink .PrivacyLink }}
-                        {{t "Registration.TosConfirmAnd"}}
+                        {{t "RegistrationUser.TosConfirmAnd"}}
                     {{ end }}
                     {{ if .PrivacyLink }}
                         <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
-                        {{t "Registration.PrivacyLinkText"}}
+                        {{t "RegistrationUser.PrivacyLinkText"}}
                         </a>
                     {{end}}
                 </label>
@@ -122,10 +127,10 @@
 
     <div class="lgn-actions">
         <a class="lgn-stroked-button lgn-primary" href="{{ loginNameChangeUrl .AuthReqID }}">
-            {{t "Actions.Back"}}
+            {{t "RegistrationUser.BackButtonText"}}
         </a>
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "Actions.Next"}}</button>
+        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationUser.NextButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/register_option.html

@@ -19,11 +19,11 @@
     <div class="lgn-register-options">
         {{if .LoginPolicy.AllowUsernamePassword }}
         <button class="lgn-raised-button lgn-primary" name="usernamepassword" value="true"
-            formnovalidate>{{t "RegisterOption.RegisterUsernamePassword"}}</button>
+            formnovalidate>{{t "RegisterOption.RegisterUsernamePasswordButtonText"}}</button>
         {{end}}
 
         {{if hasExternalLogin}}
-            <p>{{t "Registration.ExternalLogin"}}</p>
+            <p>{{t "RegisterOption.ExternalLoginDescription"}}</p>
             {{ $reqid := .AuthReqID}}
             {{range $provider := .IDPProviders}}
                 <a href="{{ externalIDPRegisterURL $reqid $provider.IDPConfigID}}"

internal/ui/login/static/templates/register_org.html

@@ -13,19 +13,19 @@
 
     <div class="lgn-register">
         <div class="lgn-field">
-            <label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgName"}}</label>
+            <label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgNameLabel"}}</label>
             <input class="lgn-input" type="text" id="orgname" name="orgname" value="{{ .RegisterOrgName }}" autofocus
                 required>
         </div>
         
         <div class="double-col">
             <div class="lgn-field">
-                <label class="lgn-label" for="firstname">{{t "RegistrationOrg.Firstname"}}</label>
+                <label class="lgn-label" for="firstname">{{t "RegistrationOrg.FirstnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
                     value="{{ .Firstname }}" required>
             </div>
             <div class="lgn-field">
-                <label class="lgn-label" for="lastname">{{t "RegistrationOrg.Lastname"}}</label>
+                <label class="lgn-label" for="lastname">{{t "RegistrationOrg.LastnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="lastname" name="lastname" autocomplete="family-name"
                     value="{{ .Lastname }}" required>
             </div>
@@ -33,7 +33,7 @@
 
         {{if .UserLoginMustBeDomain}}
         <div class="lgn-field">
-            <label class="lgn-label" for="username">{{t "RegistrationOrg.Username"}}</label>
+            <label class="lgn-label" for="username">{{t "RegistrationOrg.UsernameLabel"}}</label>
             <span id="loginname">
                 <div class="lgn-suffix-wrapper">
                     <input data-iam-domain="{{ .IamDomain }}" class="lgn-input lgn-suffix-input" type="text" id="username" name="username"
@@ -45,20 +45,20 @@
         </div>
         {{end}}
         <div class="lgn-field">
-            <label class="lgn-label" for="email">{{t "RegistrationOrg.Email"}}</label>
+            <label class="lgn-label" for="email">{{t "RegistrationOrg.EmailLabel"}}</label>
             <input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}"
                 autofocus required>
         </div>
        <div class="double-col">
             <div class="lgn-field">
-                <label class="lgn-label" for="register-password">{{t "RegistrationOrg.Password"}}</label>
+                <label class="lgn-label" for="register-password">{{t "RegistrationOrg.PasswordLabel"}}</label>
                 <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
                     data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
                     data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="register-password"
                     name="register-password" autocomplete="new-password" required>
             </div>
             <div class="lgn-field">
-                <label class="lgn-label" for="register-password-confirmation">{{t "RegistrationOrg.Password2"}}</label>
+                <label class="lgn-label" for="register-password-confirmation">{{t "RegistrationOrg.PasswordConfirmLabel"}}</label>
                 <input class="lgn-input" type="password" id="register-password-confirmation"
                     name="register-password-confirmation" autocomplete="new-password" required>
             </div>
@@ -69,7 +69,7 @@
 
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
-            <label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacy"}}</label>
+            <label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacyLabel"}}</label>
             <div class="lgn-checkbox">
                 <input class="lgn-input" type="checkbox" id="register-term-confirmation"
                     name="register-term-confirmation" required>
@@ -81,12 +81,12 @@
                     {{end}}
 
                     {{ if and .TOSLink .PrivacyLink }}
-                        {{t "Registration.TosConfirmAnd"}}
+                        {{t "RegistrationOrg.TosConfirmAnd"}}
                     {{end}}
 
                     {{ if .PrivacyLink }}
                         <a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
-                        {{t "Registration.PrivacyLinkText"}}
+                        {{t "RegistrationOrg.PrivacyLinkText"}}
                         </a>
                     {{end}}
                 </label>
@@ -99,7 +99,7 @@
 
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "Actions.Save"}}</button>
+        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationOrg.SaveButtonText"}}</button>
     </div>
 </form>
 

internal/ui/login/static/templates/select_user.html

@@ -2,13 +2,13 @@
 
 <div class="lgn-head">
     {{if .Linking}}
-    <h1>{{t "UserSelection.TitleLinking"}}</h1>
-    <p>{{t "UserSelection.DescriptionLinking"}}{{if .OrgName}} 
-        {{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
+    <h1>{{t "SelectAccount.TitleLinking"}}</h1>
+    <p>{{t "SelectAccount.DescriptionLinking"}}{{if .OrgName}}
+        {{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
     {{else}}
-    <h1>{{t "UserSelection.Title"}}</h1>
-    <p>{{t "UserSelection.Description"}}{{if .OrgName}} 
-        {{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}
+    <h1>{{t "SelectAccount.Title"}}</h1>
+    <p>{{t "SelectAccount.Description"}}{{if .OrgName}}
+        {{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}
         {{end}}
     </p>
     {{end}}
@@ -25,7 +25,7 @@
         {{ if .Users }}
         {{ $displayLoginNameSuffix := and .OrgID (not .DisplayLoginNameSuffix)}}
         {{ range $user := .Users }}
-        {{ $sessionState := (printf "UserSelection.SessionState%v" $user.UserSessionState) }}
+        {{ $sessionState := (printf "SelectAccount.SessionState%v" $user.UserSessionState) }}
         <button type="submit" name="userID" value="{{$user.UserID}}" class="lgn-account" 
         {{if not $user.SelectionPossible}}disabled title="{{t "Errors.User.NotAllowedOrg"}}"{{end}}>
             <div class="left">
@@ -54,7 +54,7 @@
                 </div>
             </div>
             <div class="lgn-names">
-                <p>{{t "UserSelection.OtherUser"}}</p>
+                <p>{{t "SelectAccount.OtherUser"}}</p>
             </div>
             <span class="fill-space"></span>
             <i class="lgn-icon-angle-right-solid"></i>