From 7a07d00397ba104a8053ecf6e11a1e2ff2ca0d68 Mon Sep 17 00:00:00 2001
From: LucasHengelhaupt <l.hengelhaupt@intershop.com>
Date: Thu, 2 Nov 2023 10:20:06 +0100
Subject: [PATCH] removed privacy policy text

---
 .../registration-newsletter-field.component.html          | 8 +-------
 .../registration-newsletter-field.component.ts            | 6 +-----
 src/assets/i18n/de_DE.json                                | 3 +--
 src/assets/i18n/en_US.json                                | 3 +--
 src/assets/i18n/fr_FR.json                                | 3 +--
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.html b/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.html
index 21d93ce940..def8c6ba14 100644
--- a/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.html
+++ b/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.html
@@ -1,4 +1,4 @@
-<div class="row form-group">
+<div *ngIf="'marketing.newsletterSubscriptionEnabled' | ishServerSetting" class="row form-group">
   <div [class.has-error]="showError" class="offset-md-4 col-md-8">
     <div class="form-check" [attr.data-testing-id]="'registration_newsletter-wrapper'">
       <input
@@ -10,12 +10,6 @@
       />
       <label class="form-check-label" [attr.for]="id">
         <div>{{ 'registration.newsletter_subscription.text' | translate }}</div>
-        <span
-          [ishServerHtml]="
-            'registration.newsletter_subscription.privacy_policy.text'
-              | translate : { '0': 'page://page.privacyPolicy.pagelet2-Page' }
-          "
-        ></span>
       </label>
     </div>
   </div>
diff --git a/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.ts b/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.ts
index f1ea0d3a14..1756372f50 100644
--- a/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.ts
+++ b/src/app/pages/registration/formly/registration-newsletter-field/registration-newsletter-field.component.ts
@@ -9,8 +9,4 @@ import { FieldType, FieldTypeConfig } from '@ngx-formly/core';
   templateUrl: './registration-newsletter-field.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class RegistrationNewsletterFieldComponent extends FieldType<FieldTypeConfig> {
-  get subscribed(): boolean {
-    return true;
-  }
-}
+export class RegistrationNewsletterFieldComponent extends FieldType<FieldTypeConfig> {}
diff --git a/src/assets/i18n/de_DE.json b/src/assets/i18n/de_DE.json
index 8d4b60171b..f32ccfc342 100644
--- a/src/assets/i18n/de_DE.json
+++ b/src/assets/i18n/de_DE.json
@@ -1125,8 +1125,7 @@
   "recaptcha.v2.incorrect.error": "Beweisen Sie, dass Sie keine Maschine sind.",
   "recaptcha.v3.info_text": "Diese Seite ist durch reCAPTCHA geschützt und es gelten die Google <a href=\"{{0}}\" target=\"_blank\">Datenschutzbestimmungen</a> und <a href=\"{{1}}\" target=\"_blank\">Nutzungsbedingungen</a>.",
   "recentlyViewed.component.heading": "Zuletzt angesehen",
-  "registration.newsletter_subscription.privacy_policy.text": "Ich habe die <a href=\"{{0}}\" target=\"_blank\">Datenschutzhinweise</a> gelesen. Ich kann mein Einverständnis jederzeit widerrufen.",
-  "registration.newsletter_subscription.text": "Ich bin damit einverstanden, Newslettern zu erhalten und über Sonderangebote informiert zu werden (optional).",
+  "registration.newsletter_subscription.text": "Ich bin damit einverstanden, Newsletter zu erhalten und über Sonderangebote informiert zu werden (optional).",
   "registration.tac.error.tip": "Bitte stimmen Sie den Bedingungen zu, um fortzufahren.",
   "registration.tac_privacy_policy.text": "Ich akzeptiere die <a href=\"{{0}}\" target=\"_blank\">AGB</a> und <a href=\"{{1}}\" target=\"_blank\">Datenschutzhinweise</a>.",
   "restricted-items.Remove.button": "Artikel entfernen",
diff --git a/src/assets/i18n/en_US.json b/src/assets/i18n/en_US.json
index 28b07eeda8..e0bba99c8b 100644
--- a/src/assets/i18n/en_US.json
+++ b/src/assets/i18n/en_US.json
@@ -1125,8 +1125,7 @@
   "recaptcha.v2.incorrect.error": "Please verify that you are a real person.",
   "recaptcha.v3.info_text": "This site is protected by reCAPTCHA and the Google <a href=\"{{0}}\" target=\"_blank\">Privacy Policy</a> and <a href=\"{{1}}\" target=\"_blank\">Terms of Service</a> apply.",
   "recentlyViewed.component.heading": "Recently Viewed",
-  "registration.newsletter_subscription.privacy_policy.text": "I have read the <a href=\"{{0}}\" target=\"_blank\">Privacy Policy</a>. I can unsubscribe from newsletters any time.",
-  "registration.newsletter_subscription.text": "I agree to receive newsletter and be notified of sales and promotions (optional).",
+  "registration.newsletter_subscription.text": "I agree to receive newsletters and be notified of sales and promotions - unsubscribe anytime (optional).",
   "registration.tac.error.tip": "Please agree to the terms to continue.",
   "registration.tac_privacy_policy.text": "I agree to the <a href=\"{{0}}\" target=\"_blank\">Terms & Conditions</a> and <a href=\"{{1}}\" target=\"_blank\">Privacy Policy</a>.",
   "restricted-items.Remove.button": "Remove Item",
diff --git a/src/assets/i18n/fr_FR.json b/src/assets/i18n/fr_FR.json
index a25a7b2543..d658961c4e 100644
--- a/src/assets/i18n/fr_FR.json
+++ b/src/assets/i18n/fr_FR.json
@@ -1125,8 +1125,7 @@
   "recaptcha.v2.incorrect.error": "Veuillez vérifier que vous êtes une personne réelle.",
   "recaptcha.v3.info_text": "Ce site est protégé par reCAPTCHA et <a href=\"{{0}}\" target=\"_blank\">la politique de confidentialité</a> de Google ainsi que ses <a href=\"{{1}}\" target=\"_blank\">conditions de service</a> s’appliquent.",
   "recentlyViewed.component.heading": "Récemment consultés",
-  "registration.newsletter_subscription.privacy_policy.text": "J’ai lu la <a href=\"{{0}}\" target=\"_blank\">politique de confidentialité</a>. Je peux me désabonner des bulletins d’information à tout moment.",
-  "registration.newsletter_subscription.text": "J’accepte de recevoir la lettre d’information et d’être informé des ventes et des promotions (optionnel).",
+  "registration.newsletter_subscription.text": "J’accepte de recevoir des bulletins d’information et d’être informé des ventes et des promotions (optionnel).",
   "registration.tac.error.tip": "Veuillez accepter les conditions pour continuer.",
   "registration.tac_privacy_policy.text": "J’accepte les <a href=\"{{0}}\" target=\"_blank\">Conditions générales</a> et <a href=\"{{1}}\" target=\"_blank\">la Politique de confidentialité</a>.",
   "restricted-items.Remove.button": "Supprimer l’article",