Commit a6811abf authored by Sven Berg Ryen's avatar Sven Berg Ryen
Browse files

Issue #3279048 by mathilde_dumond, svenryen, Berdir, agoradesign, Gábor...

Issue #3279048 by mathilde_dumond, svenryen, Berdir, agoradesign, Gábor Hojtsy, andypost: English translation of the data protection policy path set back to the default value
parent 89d5a186
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
@@ -10,30 +10,30 @@ exclude_paths: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/user/*/*"
exclude_admin_theme: false
langcode: en
popup_agreed:
  value: '<h2>Thank you for accepting cookies</h2><p>You can now hide this message or find out more about cookies.</p>'
  value: ''
  format: 'restricted_html'
popup_agree_button_message: 'Accept'
popup_agree_button_message: ''
popup_agreed_enabled: false
popup_bg_hex: '0779bf'
popup_clicking_confirmation: true
popup_scrolling_confirmation: false
popup_delay: 1000
show_more_info: true
popup_more_info_button_message: 'More info'
popup_more_info_button_message: ''
popup_enabled: true
popup_find_more_button_message: 'More info'
popup_find_more_button_message: ''
popup_height: 0
popup_hide_agreed: false
popup_hide_button_message: 'Hide'
popup_hide_button_message: ''
popup_info:
  value: '<h2>We use cookies on this site to enhance your user experience</h2><p>By clicking the Accept button, you agree to us doing so.</p>'
  value: ''
  format: 'restricted_html'
mobile_popup_info:
  value: '<h2>We use cookies on this site to enhance your user experience</h2><p>By tapping the Accept button, you agree to us doing so.</p>'
  value: ''
  format: 'restricted_html'
popup_info_template: 'new'
mobile_breakpoint: 768
popup_link: '<front>'
popup_link: ''
popup_link_new_window: true
popup_position: false
fixed_top_position: true
@@ -47,20 +47,20 @@ exclude_uid_1: false
better_support_for_screen_readers: false
use_mobile_message: false
method: 'opt_in'
disagree_button_label: 'No, thanks'
disagree_button_label: ''
disabled_javascripts: ''
automatic_cookies_removal: true
allowed_cookies: ''
consent_storage_method: 'do_not_store'
withdraw_message:
  value: '<h2>We use cookies on this site to enhance your user experience</h2><p>You have given your consent for us to set cookies.</p>'
  value: ''
  format: 'restricted_html'
withdraw_action_button_label: 'Withdraw consent'
withdraw_tab_button_label: 'Privacy settings'
withdraw_action_button_label: ''
withdraw_tab_button_label: ''
withdraw_enabled: false
enable_save_preferences_button: true
save_preferences_button_label: 'Save preferences'
accept_all_categories_button_label: 'Accept all cookies'
save_preferences_button_label: ''
accept_all_categories_button_label: ''
withdraw_button_on_info_popup: false
domain_all_sites: false
settings_tab_enabled: false
+20 −3
Original line number Diff line number Diff line
@@ -113,7 +113,24 @@ function eu_cookie_compliance_install() {
    $config->set('uuid', \Drupal::service('uuid')->generate());
  }

  $config->set('popup_agreed.format', $default_filter_format)
  // Set the defaults here rather than in the install file, to overcome a
  // translation issue in Drupal core that resets translated config when
  // translated strings are updated or another module gets installed.
  $config->set('popup_agreed.value', t('<h2>Thank you for accepting cookies</h2><p>You can now hide this message or find out more about cookies.</p>'))
    ->set('popup_agree_button_message', t('Accept'))
    ->set('popup_more_info_button_message', t('More info'))
    ->set('popup_find_more_button_message', t('More info'))
    ->set('popup_hide_button_message', t('Hide'))
    ->set('popup_info.value', t('<h2>We use cookies on this site to enhance your user experience</h2><p>By clicking the Accept button, you agree to us doing so.</p>'))
    ->set('mobile_popup_info.value', t('<h2>We use cookies on this site to enhance your user experience</h2><p>By tapping the Accept button, you agree to us doing so.</p>'))
    ->set('popup_link', '<front>')
    ->set('disagree_button_label', t('No, thanks'))
    ->set('withdraw_message.value', t('<h2>We use cookies on this site to enhance your user experience</h2><p>You have given your consent for us to set cookies.</p>'))
    ->set('withdraw_action_button_label', t('Withdraw consent'))
    ->set('withdraw_tab_button_label', t('Privacy settings'))
    ->set('save_preferences_button_label', t('Save preferences'))
    ->set('accept_all_categories_button_label', t('Accept all cookies'))
    ->set('popup_agreed.format', $default_filter_format)
    ->set('popup_info.format', $default_filter_format)
    ->set('mobile_popup_info.format', $default_filter_format)
    ->set('withdraw_message.format', $default_filter_format)
@@ -145,14 +162,14 @@ function eu_cookie_compliance_requirements($phase) {
      $config = $language_manager->getLanguageConfigOverride($language->getId(), 'eu_cookie_compliance.settings');

      // Get the config variables. This will use the overridden language.
      $popup_link = $config->get('popup_link');
      $popup_link = $config->get('popup_link') ?: '<front>';

      // Check the current language for wrongly configured policy link.
      if ($popup_link === '<front>' && $show_policy && $default_language->getId() !== $language->getId()) {
        $requirements['eu_cookie_compliance_' . $key] = [
          'title' => t('EU Cookie Compliance'),
          'severity' => REQUIREMENT_WARNING,
          'description' => t('Language @language_id: Your privacy policy link is pointing at the front page. This is the default value after installation, and unless your privacy policy is actually posted at the front page, you will need to create a separate page for the privacy policy and link to that page.', ['@language_id' => $language->getName()]),
          'description' => t('Language @language_id: Your privacy policy link is not set or is pointing at the front page. This is the default value after installation, and unless your privacy policy is actually posted at the front page, you will need to create a separate page for the privacy policy and link to that page.', ['@language_id' => $language->getName()]),
          'value' => t('Privacy policy link not provided'),
        ];
      }