fix(login): custom texts for pages called directly form mail link (#4415)

* fix(login): translate init password correctly

* refactor: no error return params

* fix(login): custom texts for pages called directly form mail link

* fix custom text on registration pages

Co-authored-by: adlerhurst <silvan.reusser@gmail.com>
This commit is contained in:
Livio Spring
2022-09-20 09:22:47 +02:00
committed by GitHub
parent fc4f4096e0
commit 05cb672cff
15 changed files with 100 additions and 111 deletions

View File

@@ -26,7 +26,7 @@
data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="change-new-password"
name="change-new-password" autocomplete="new-password" required>
{{ .PasswordPolicyDescription }}
{{ template "password-complexity-policy-description" . }}
</div>
<div class="field">
@@ -54,4 +54,4 @@
<script src="{{ resourceUrl "scripts/change_password_check.js" }}"></script>
{{template "main-bottom" .}}
{{template "main-bottom" .}}

View File

@@ -27,7 +27,7 @@
data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="password" name="password"
autocomplete="new-password" autofocus required>
{{ .PasswordPolicyDescription }}
{{ template "password-complexity-policy-description" . }}
</div>
<div class="field">
<label class="lgn-label" for="passwordconfirm">{{t "InitPassword.NewPasswordConfirmLabel"}}</label>

View File

@@ -31,7 +31,7 @@
data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="password" name="password"
autocomplete="new-password" autofocus required>
{{ .PasswordPolicyDescription }}
{{ template "password-complexity-policy-description" . }}
</div>
<div class="field">
<label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirmLabel"}}</label>

View File

@@ -0,0 +1,18 @@
{{define "password-complexity-policy-description"}}
<ul class="lgn-no-dots lgn-policy" id="passwordcomplexity">
<li id="minlength" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.MinLength"}} {{.MinLength}}</span></li>
{{if .HasUppercase }}
<li id="uppercase" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.HasUppercase"}}</span></li>
{{end}}
{{if .HasLowercase}}
<li id="lowercase" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.HasLowercase"}}</span></li>
{{end}}
{{if .HasNumber}}
<li id="number" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.HasNumber"}}</span></li>
{{end}}
{{if .HasSymbol}}
<li id="symbol" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.HasSymbol"}}</span></li>
{{end}}
<li id="confirmation" class="invalid"><i class="lgn-icon-times-solid lgn-warn"></i><span>{{t "Password.Confirmation"}}</span></li>
</ul>
{{end}}

View File

@@ -97,7 +97,7 @@
</div>
<div class="lgn-field">
{{ .PasswordPolicyDescription }}
{{ template "password-complexity-policy-description" . }}
</div>
{{ if or .TOSLink .PrivacyLink }}

View File

@@ -64,7 +64,7 @@
</div>
</div>
<div class="lgn-field">
{{ .PasswordPolicyDescription }}
{{ template "password-complexity-policy-description" . }}
</div>
{{ if or .TOSLink .PrivacyLink }}
@@ -109,4 +109,4 @@
<script src="{{ resourceUrl "scripts/register_check.js" }}"></script>
<script src="{{ resourceUrl "scripts/loginname_suffix.js" }}"></script>
{{template "main-bottom" .}}
{{template "main-bottom" .}}