fix: privacypolicy (#1586)

* fix: email as username on orgs possible

* fix: privacy policy in register

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

Co-authored-by: mffap <mpa@caos.ch>

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

Co-authored-by: mffap <mpa@caos.ch>

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

Co-authored-by: mffap <mpa@caos.ch>

* fix: privacy policy in register

Co-authored-by: mffap <mpa@caos.ch>
This commit is contained in:
Fabi 2021-04-14 11:48:19 +02:00 committed by GitHub
parent 3a02eaec01
commit 996802a28f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 11 deletions

View File

@ -153,10 +153,13 @@ Registration:
Diverse: diverse
Password: Passwort
Password2: Passwort wiederholen
Tos: Allgemeine Geschäftsbedingungen
TosAndPrivacy: Allgemeine Geschäftsbedingungen und Datenschutz
TosConfirm: Ich akzeptiere die
TosLinkText: AGBs
TosConfirmAnd: und die
TosLink: https://zitadel.ch/pdf/agb.pdf
PrivacyLinkText: Datenschutzerklärung
PrivacyLink: https://zitadel.ch/pdf/datenschutz.pdf
ExternalLogin: oder registriere dich mit einem externen Benutzer
RegistrationOrg:
@ -178,10 +181,13 @@ RegistrationOrg:
Diverse: diverse
Password: Passwort
Password2: Passwort wiederholen
Tos: Allgemeine Geschäftsbedingungen
TosAndPrivacy: Allgemeine Geschäftsbedingungen und Datenschutz
TosConfirm: Ich akzeptiere die
TosLinkText: AGBs
TosConfirmAnd: und die
TosLink: https://zitadel.ch/pdf/agb.pdf
PrivacyLinkText: Datenschutzerklärung
PrivacyLink: https://zitadel.ch/pdf/datenschutz.pdf
LinkingUsersDone:
Title: Benutzerlinking
@ -213,8 +219,10 @@ Actions:
PasswordLogin: Mit Passwort anmelden
Footer:
TosPrivacyPolicy: Datenschutz und AGB
Tos: AGB
TosLink: https://zitadel.ch/pdf/agb.pdf
Privacy: Datenschutzerklärung
PrivacyLink: https://zitadel.ch/pdf/datenschutz.pdf
Help: Hilfe
Errors:

View File

@ -153,10 +153,13 @@ Registration:
Diverse: diverse / X
Password: Password
Password2: Password confirmation
Tos: Terms and conditions
TosConfirm: I agree the
TosAndPrivacy: Terms and conditions
TosConfirm: I accept the
TosLinkText: TOS
TosConfirmAnd: and the
TosLink: https://zitadel.ch/pdf/tos.pdf
PrivacyLinkText: privacy policy
PrivacyLink: https://zitadel.ch/pdf/privacy.pdf
ExternalLogin: or register with an external user
RegistrationOrg:
@ -178,10 +181,13 @@ RegistrationOrg:
Diverse: diverse / X
Password: Password
Password2: Password confirmation
Tos: Terms and conditions
TosConfirm: I agree the
TosAndPrivacy: Terms and conditions
TosConfirm: I accept the
TosLinkText: TOS
TosConfirmAnd: and the
TosLink: https://zitadel.ch/pdf/tos.pdf
PrivacyLinkText: privacy policy
PrivacyLink: https://zitadel.ch/pdf/privacy.pdf
LogoutDone:
Title: Logged out
@ -213,8 +219,10 @@ Actions:
PasswordLogin: Login with password
Footer:
TosPrivacyPolicy: ToS and Privacy Policy
Tos: TOS
TosLink: https://zitadel.ch/pdf/agb.pdf
Privacy: Privacy policy
PrivacyLink: https://zitadel.ch/pdf/privacy.pdf
Help: Help
Errors:

View File

@ -1,7 +1,8 @@
{{define "footer"}}
<footer>
<span class="fill-space"></span>
<a href="{{t "Footer.TosLink"}}" rel="noopener noreferrer" target="_blank" alt="Privacy Policy">{{t "Footer.TosPrivacyPolicy"}}</a>
<a href="{{t "Footer.TosLink"}}" rel="noopener noreferrer" target="_blank" alt="TOS">{{t "Footer.Tos"}}</a>
<a href="{{t "Footer.PrivacyLink"}}" rel="noopener noreferrer" target="_blank" alt="Privacy Policy">{{t "Footer.Privacy"}}</a>
<a href="https://docs.zitadel.ch/use" target="_black" alt="Help">{{t "Footer.Help"}}</a>
</footer>
{{end}}

View File

@ -80,7 +80,7 @@
</div>
<div class="lgn-field">
<label class="lgn-label">{{t "Registration.Tos"}}</label>
<label class="lgn-label">{{t "Registration.TosAndPrivacy"}}</label>
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
@ -89,6 +89,10 @@
<a class="tos-link" target="_blank" href="{{t "Registration.TosLink"}}" rel="noopener noreferrer">
{{t "Registration.TosLinkText"}}
</a>
{{t "Registration.TosConfirmAnd"}}
<a class="tos-link" target="_blank" href="{{t "Registration.PrivacyLink"}}" rel="noopener noreferrer">
{{t "Registration.PrivacyLinkText"}}
</a>
</label>
</div>
</div>

View File

@ -69,13 +69,17 @@
</div>
<div class="lgn-field">
<label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.Tos"}}</label>
<label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacy"}}</label>
<div class="lgn-checkbox">
<input class="lgn-input" type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
<label class="lgn-label" for="register-term-confirmation">
{{t "RegistrationOrg.TosConfirm"}}
<a class="tos-link" target="_blank" href="{{t "RegistrationOrg.TosLink"}}" rel="noopener noreferrer">{{t "RegistrationOrg.TosLinkText"}}</a>
{{t "Registration.TosConfirmAnd"}}
<a class="tos-link" target="_blank" href="{{t "Registration.PrivacyLink"}}" rel="noopener noreferrer">
{{t "Registration.PrivacyLinkText"}}
</a>
</label>
</div>
</div>