Unverified Commit 5b0a146e authored by Bram ten Hove's avatar Bram ten Hove
Browse files

Issue #3390595: Adopt a different copy for end-users

parent 48d70135

config/install/data_policy.data_policy.yml

+1 −1
Original line number Diff line number Diff line 
enforce_consent: false

entity_id: 0

consent_text: 'I agree with the [id:1]'
 
consent_text: 'I read and consent to the [id:1]'

data_policy.routing.yml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ data_policy.data_policy.agreement: 
  path: '/data-policy-agreement'

  defaults:

    _form: '\Drupal\data_policy\Form\DataPolicyAgreement'

    _title: 'Data policy agreement'

    _title: 'Protection of your personal data'

  requirements:

    _custom_access: '\Drupal\data_policy\Controller\DataPolicy::agreementAccess'

src/Form/DataPolicyAgreement.php

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class DataPolicyAgreement extends FormBase { 
          [

            '#type' => 'html_tag',

            '#tag' => 'strong',

            '#value' => $this->t('Our data policy has been updated on %date', [

            '#value' => $this->t('Our data protection statement has been updated on %date', [

              '%date' => $date,

            ]),

          ],
@@ -122,7 +122,7 @@ class DataPolicyAgreement extends FormBase { 
      $form['not_agree'] = [

        '#type' => 'html_tag',

        '#tag' => 'p',

        '#value' => $this->t('Agreement to the data policy is required for continue using this platform. If you do not agree with the data policy, you will be guided to @url process.', [

        '#value' => $this->t('Consent to the data protection statement(s) is required for continuing using this platform. If you do not consent, you will be guided to @url process.', [

          '@url' => $link->toString(),

        ]),

        '#theme_wrappers' => [

src/RedirectSubscriber.php

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ class RedirectSubscriber implements EventSubscriberInterface { 
  private function addStatusLink() {

    if ($this->routeMatch->getRouteName() !== 'data_policy.data_policy.agreement') {

      $link = Link::createFromRoute($this->t('here'), 'data_policy.data_policy.agreement');

      $this->messenger->addStatus($this->t('We published a new version of the data policy. You can review the data policy @url.', [

      $this->messenger->addStatus($this->t('We published a new version of the data protection statement. You can review the data protection statement @url.', [

        '@url' => $link->toString(),

      ]));

    }