fix: privacy policy (#1559)

zitadel · Apr 12, 2021 · 05c6d06 · 05c6d06
1 parent 75d4b33
commit 05c6d06
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/console/src/app/app.component.html b/console/src/app/app.component.html
@@ -203,4 +203,4 @@
             <span>{{'MENU.IAMADMIN' | translate}}</span>
         </div>
     </ng-container>
-</ng-container>
+</ng-container>
diff --git a/internal/ui/login/static/i18n/de.yaml b/internal/ui/login/static/i18n/de.yaml
@@ -154,10 +154,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: Datenchutzerklärung
+  PrivacyLink: https://zitadel.ch/pdf/datenschutz.pdf
   ExternalLogin: oder registriere dich mit einem externen Benutzer
 
 RegistrationOrg:
@@ -214,8 +217,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:

diff --git a/internal/ui/login/static/i18n/en.yaml b/internal/ui/login/static/i18n/en.yaml
@@ -154,10 +154,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:
@@ -214,8 +217,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:

diff --git a/internal/ui/login/static/templates/footer.html b/internal/ui/login/static/templates/footer.html
@@ -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}}
diff --git a/internal/ui/login/static/templates/register.html b/internal/ui/login/static/templates/register.html
@@ -80,7 +80,7 @@ <h1>{{t "Registration.Title"}}</h1>
         </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 @@ <h1>{{t "Registration.Title"}}</h1>
                     <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>

diff --git a/internal/ui/login/static/templates/register_org.html b/internal/ui/login/static/templates/register_org.html
@@ -76,6 +76,10 @@ <h1>{{t "RegistrationOrg.Title"}}</h1>
                 <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>