RubyGems - j1-template - Versions diffs - 2021.2.3 → 2021.2.4 - Mend

j1-template 2021.2.3 → 2021.2.4

Files changed (643) hide show

data/assets/data/translator.html ADDED Viewed

@@ -0,0 +1,291 @@
+---
+regenerate:                             true
+exclude_from_search:                    true
+---
+{% capture cache %}
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/data/translator.html
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
+ # by the J1 Translator module
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #   liquid_var: {{ liquid_var | debug }}
+ #   config: {{ config | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment     = site.environment %}
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign modules         = site.data.modules %}
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign translate_defaults = modules.defaults.translator.defaults %}
+{% assign translate_settings = modules.translator.settings %}
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign translate_options  = translate_defaults | merge: translate_settings %}
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+{% comment %} Main
+================================================================================ {% endcomment %}
+<!-- [INFO   ] [j1.assets.data.translator.html               ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
+<head>
+  <meta name="robots" content="noindex, nofollow" />
+</head>
+{% comment %} i18n: translations
+-------------------------------------------------------------------------------- {% endcomment %}
+{% comment %} Modal translator dialog (default: en-EN)
+-------------------------------------------------------------------------------- {% endcomment %}
+<div id="google-data-en">
+  <div id="modal-google-translate-en" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <p class="lead">{{translate_options.modal_settings.title.en}}</p>
+      </div>
+      <div class="modal-body">
+        <div class="modal-body-text" style="font-size: 90%">
+          <p class="mb-3">{{translate_options.modal_settings.body_text.en}}</p>
+        </div>
+        <p>
+          <a href="#google-privacy" data-toggle="collapse" class="">Privacy Notice</a>
+          <a href="#google-options" data-toggle="collapse" class="float-right">My Settings</a>
+        </p>
+        <div id="google-privacy" class="collapse">
+          <div class="modal-body-text" style="font-size: 90%">
+            <p class="mb-4">{{translate_options.modal_settings.privacy_notice.en}}</p>
+          </div>
+        </div>
+        <div id="google-options" class="collapse">
+          <p class="tagline mt-4 mb-1"><b>Settings</b></p>
+          <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
+          <div class="translator-option" data-name="analysis">
+            <div class="switch">
+              <label>
+                <input id="checkboxAnalysis" type="checkbox" name="checkboxAnalysis" checked="true">
+                <span class="bmd-switch-track"></span>
+                Analysis enabled (Your Privacy)
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="personalization">
+            <div class="switch">
+              <label>
+                <input id="checkboxPersonalization" type="checkbox" name="checkboxPersonalization" checked="true">
+                <span class="bmd-switch-track"></span>
+                Personalization enabled (Your Privacy)
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="useLanguageFromBrowser">
+            <div class="switch">
+              <label>
+                <input id="checkboxuseLanguageFromBrowser" type="checkbox" name="checkboxuseLanguageFromBrowser" checked="true" disabled>
+                <span class="bmd-switch-track"></span>
+                Language settings taken from browser
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="translateAllPages">
+            <div class="switch">
+              <label>
+                <input id="checkboxTranslateAllPages" type="checkbox" name="checkboxTranslateAllPages" checked="true" disabled>
+                <span class="bmd-switch-track"></span>
+                Translation of all pages
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="translationEnabled">
+            <div class="switch">
+              <label>
+                <input id="checkboxTranslationEnabled" type="checkbox" name="checkboxTranslationEnabled" checked="true">
+                <span class="bmd-switch-track"></span>
+                Translation enabled
+              </label>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="translator-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
+        No, disable translation
+        </button>
+        <button id="translator-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
+        Yes, please translate
+        </button>
+        <button id="translator-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        Save selection
+        </button>
+        <button id="translator-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        I Agree on all
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+{% comment %} END Modal translator dialog (en-EN)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% comment %} Modal translator dialog (de-DE)
+-------------------------------------------------------------------------------- {% endcomment %}
+<div id="google-data-de">
+  <div id="modal-google-translate-de" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <p class="lead">{{translate_options.modal_settings.title.de}}</p>
+      </div>
+      <div class="modal-body">
+        <div class="modal-body-text" style="font-size: 90%">
+          <p class="mb-4">{{translate_options.modal_settings.body_text.de}}</p>
+        </div>
+        <p>
+          <a href="#google-privacy" data-toggle="collapse" class="">Datenschutzerklärung</a>
+          <a href="#google-options" data-toggle="collapse" class="float-right">Meine Einstellungen</a>
+        </p>
+        <div id="google-privacy" class="collapse">
+          <div class="modal-body-text" style="font-size: 90%">
+            <p class="mb-4">{{translate_options.modal_settings.privacy_notice.de}}</p>
+          </div>
+        </div>
+        <div id="google-options" class="collapse">
+          <p class="tagline mt-4 mb-1"><b>Settings</b></p>
+          <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
+          <div class="translator-option" data-name="analysis">
+            <div class="switch">
+              <label>
+                <input id="checkboxAnalysis" type="checkbox" name="checkboxAnalysis" checked="true">
+                <span class="bmd-switch-track"></span>
+                Analysen erlaubt (Ihre Privatsphäre)
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="personalization">
+            <div class="switch">
+              <label>
+                <input id="checkboxPersonalization" type="checkbox" name="checkboxPersonalization" checked="true">
+                <span class="bmd-switch-track"></span>
+                Personalisierung erlaubt (Ihre Privatsphäre)
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="useLanguageFromBrowser">
+            <div class="switch">
+              <label>
+                <input id="checkboxUseLanguageFromBrowser" type="checkbox" name="checkboxUseLanguageFromBrowser" checked="true">
+                <span class="bmd-switch-track"></span>
+                Spracheinstellungen vom Browser
+              </label>
+            </div>
+          </div>
+          <div class="translator-option" data-name="translateAllPages">
+            <div class="switch">
+              <label>
+                <input id="checkboxTranslateAllPages" type="checkbox" name="checkboxTranslateAllPages" checked="true" disabled>
+                <span class="bmd-switch-track"></span>
+                Übersetzung aller Seiten
+              </label>
+            </div>
+          </div>
+          <!-- div class="translator-option" data-name="translatorName">
+            <div class="switch">
+              <label>
+                <input id="checkboxTranslatorName" type="checkbox"  name="checkboxTranslatorNameEnabled" disabled="true" checked="true">
+                <span class="bmd-switch-track"></span>
+                Übersetzung eingeschaltet
+              </label>
+            </div>
+          </div -->
+          <div class="translator-option" data-name="translationEnabled">
+            <div class="switch">
+              <label>
+                <input id="checkboxTranslator" type="checkbox" name="checkboxTranslator" checked="true">
+                <span class="bmd-switch-track"></span>
+                Übersetzung eingeschaltet
+              </label>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button id="translator-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
+        Nein, bitte Übersetzungen abschalten
+        </button>
+        <button id="translator-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
+        Ja, bitte übersetzen
+        </button>
+        <button id="translator-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        Auswahl speichern
+        </button>
+        <button id="translator-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        Allen zustimmen
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+{% comment %} END Modal translator dialog (de-DE)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% endcapture %}
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

data/assets/data/translator_languages.json ADDED Viewed

@@ -0,0 +1,142 @@
+---
+regenerate:                             false
+exclude_from_search:                    true
+---
+{% capture cache %}
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/data/translator_languages.json
+ # The Liquid template is used by the J1 Translator module
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # Be carefull change the Liquid code. If the code is changed, check the
+ # integrity of the JSON data created. Invalid JSON data will cause the
+ # the J1 Translator module to fail.
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #   {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment         = site.environment %}
+{
+  "googleLanguages":
+  [
+  	{ "af":     { "name": "Afrikaans" }},
+  	{ "sq":     { "name": "Albanian" }},
+  	{ "ar":     { "name": "Arabic" }},
+  	{ "hy":     { "name": "Armenian" }},
+  	{ "az":     { "name": "Azerbaijani" }},
+  	{ "eu":     { "name": "Basque" }},
+  	{ "be":     { "name": "Belarusian" }},
+  	{ "bn":     { "name": "Bengali" }},
+  	{ "bg":     { "name": "Bulgarian" }},
+  	{ "ca":     { "name": "Catalan" }},
+  	{ "zh-CN":  { "name": "Chinese (Simplified)" }},
+  	{ "zh-TW":  { "name": "Chinese (Traditional)" }},
+  	{ "hr":     { "name": "Croatian" }},
+  	{ "cs":     { "name": "Czech" }},
+  	{ "da":     { "name": "Danish" }},
+  	{ "nl":     { "name": "Dutch" }},
+  	{ "eo":     { "name": "Esperanto" }},
+  	{ "et":     { "name": "Estonian" }},
+  	{ "tl":     { "name": "Filipino" }},
+  	{ "fi":     { "name": "Finnish" }},
+  	{ "fr":     { "name": "French" }},
+  	{ "gl":     { "name": "Galician" }},
+  	{ "ka":     { "name": "Georgian" }},
+  	{ "de":     { "name": "German" }},
+  	{ "el":     { "name": "Greek" }},
+  	{ "gu":     { "name": "Gujarati" }},
+  	{ "ht":     { "name": "Haitian Creole" }},
+  	{ "iw":     { "name": "Hebrew" }},
+  	{ "hi":     { "name": "Hindi" }},
+  	{ "hu":     { "name": "Hungarian" }},
+  	{ "is":     { "name": "Icelandic" }},
+  	{ "id":     { "name": "Indonesian" }},
+  	{ "ga":     { "name": "Irish" }},
+  	{ "it":     { "name": "Italian" }},
+  	{ "ja":     { "name": "Japanese" }},
+  	{ "kn":     { "name": "Kannada" }},
+  	{ "ko":     { "name": "Korean" }},
+  	{ "la":     { "name": "Latin" }},
+  	{ "lv":     { "name": "Latvian" }},
+  	{ "lt":     { "name": "Lithuanian" }},
+  	{ "mk":     { "name": "Macedonian" }},
+  	{ "ms":     { "name": "Malay" }},
+  	{ "mt":     { "name": "Maltese" }},
+  	{ "no":     { "name": "Norwegian" }},
+  	{ "fa":     { "name": "Persian" }},
+  	{ "pl":     { "name": "Polish" }},
+  	{ "pt":     { "name": "Portuguese" }},
+  	{ "ro":     { "name": "Romanian" }},
+  	{ "ru":     { "name": "Russian" }},
+  	{ "sr":     { "name": "Serbian" }},
+  	{ "sk":     { "name": "Slovak" }},
+  	{ "sl":     { "name": "Slovenian" }},
+  	{ "es":     { "name": "Spanish" }},
+  	{ "sw":     { "name": "Swahili" }},
+  	{ "sv":     { "name": "Swedish" }},
+  	{ "ta":     { "name": "Tamil" }},
+  	{ "te":     { "name": "Telugu" }},
+  	{ "th":     { "name": "Thai" }},
+  	{ "tr":     { "name": "Turkish" }},
+  	{ "uk":     { "name": "Ukrainian" }},
+  	{ "ur":     { "name": "Urdu" }},
+  	{ "vi":     { "name": "Vietnamese" }},
+  	{ "cy":     { "name": "Welsh" }},
+  	{ "yi":     { "name": "Yiddish" }}
+  ],
+  "deeplLanguages":
+  [
+  	{ "cs":     { "name": "Czech" }},
+  	{ "da":     { "name": "Danish" }},
+  	{ "de":     { "name": "German" }},
+  	{ "el":     { "name": "Greek" }},
+  	{ "es":     { "name": "Spanish" }},
+  	{ "en":     { "name": "English" }},
+  	{ "en-us":  { "name": "English (American)" }},
+  	{ "en-uk":  { "name": "English (British)" }},
+  	{ "et":     { "name": "Estonian" }},
+  	{ "ft":     { "name": "Finnish" }},
+  	{ "fr":     { "name": "French" }},
+  	{ "hu":     { "name": "Hungarian" }},
+  	{ "it":     { "name": "Italian" }},
+  	{ "ja":     { "name": "Japanese" }},
+  	{ "lv":     { "name": "Latvian" }},
+  	{ "lt":     { "name": "Lithuanian" }},
+  	{ "nl":     { "name": "Dutch" }},
+  	{ "af":     { "name": "Polish" }},
+  	{ "pt":     { "name": "Portuguese" }},
+  	{ "pt-pt":  { "name": "Portuguese (Portugal)" }},
+  	{ "pt-br":  { "name": "Portuguese (Brazilian)" }},
+  	{ "ro":     { "name": "Romanian" }},
+  	{ "ru":     { "name": "Russian" }},
+  	{ "sk":     { "name": "Slovak" }},
+  	{ "sl":     { "name": "Slovenian" }},
+  	{ "sv":     { "name": "Swedish" }},
+  	{ "zh":     { "name": "Chinese" }}
+  ]
+}
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJSON }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

data/assets/themes/j1/adapter/js/cookieConsent.js CHANGED Viewed

@@ -56,14 +56,10 @@ regenerate:                             true
  # JS Adapter for J1 CookieConsent
  #
  #  Product/Info:
- #  https://shaack.com
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Stefan Haack
  #  Copyright (C) 2021 Juergen Adams
  #
- #  bootstrap-cookie-banner is licensed under MIT License.
- #  See: https://github.com/shaack/bootstrap-cookie-banner/blob/master/LICENSE
  #  J1 Template is licensed under MIT License.
  #  See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
@@ -101,7 +97,8 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
   var secure;
   var logText;
   var cookie_written;
-  var language;
+  var contentLanguage;
+  var navigatorLanguage;
   // NOTE: RegEx for tracking_id: ^(G|UA|YT|MO)-[a-zA-Z0-9-]+$
   // See: https://stackoverflow.com/questions/20411767/how-to-validate-google-analytics-tracking-id-using-a-javascript-function/20412153
@@ -123,14 +120,15 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this         = j1.adapter.cookieConsent;
-      logger        = log4javascript.getLogger('j1.adapter.cookieConsent');
-      url           = new liteURL(window.location.href);
-      baseUrl       = url.origin;
-      hostname      = url.hostname;
-      domain        = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      secure        = (url.protocol.includes('https')) ? true : false;
-      language      = "{{site.language}}";
+      _this             = j1.adapter.cookieConsent;
+      logger            = log4javascript.getLogger('j1.adapter.cookieConsent');
+      url               = new liteURL(window.location.href);
+      baseUrl           = url.origin;
+      hostname          = url.hostname;
+      domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      secure            = (url.protocol.includes('https')) ? true : false;
+      contentLanguage   = '{{site.language}}';
+      navigatorLanguage = navigator.language || navigator.userLanguage;
       // set domain used by cookies
       if(domain !== 'localhost') {
@@ -161,6 +159,12 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         moduleOptions = j1.mergeData(moduleOptions, settings);
       }
+      if (moduleOptions.dialogLanguage === 'auto') {
+        moduleOptions.dialogLanguage = navigatorLanguage;
+      } else if (moduleOptions.dialogLanguage === 'content') {
+        moduleOptions.dialogLanguage = contentLanguage;
+      }
       // -----------------------------------------------------------------------
       // initializer
       // -----------------------------------------------------------------------
@@ -171,14 +175,14 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           logger.info('\n' + 'module is being initialized');
           j1.cookieConsent = new BootstrapCookieConsent({
-            contentURL:             moduleOptions.contentURL,
-            cookieName:             moduleOptions.cookieName,
-            language:               language,
-            whitelisted:            moduleOptions.whitelisted,
-            reloadPageOnChange:     moduleOptions.reloadPageOnChange,
-            xhr_data_element:       moduleOptions.xhr_data_element + '-' + language,
-            sameSite:               moduleOptions.sameSite,
-            secure:                 secure,
+            contentURL:             moduleOptions.contentURL,                   // dialog content (modals) for all supported languages
+            cookieName:             moduleOptions.cookieName,                   // name of the consent cookie
+            cookieSameSite:         moduleOptions.cookieSameSite,               // restrict consent cookie
+            dialogLanguage:         moduleOptions.dialogLanguage,               // language for the dialog (modal)
+            whitelisted:            moduleOptions.whitelisted,                  // pages NOt dialog is shown
+            reloadPageOnChange:     moduleOptions.reloadPageOnChange,           // reload if setzings has changed
+            dialogContainerID:      moduleOptions.dialogContainerID,            // container, the dialog modal is (dynamically) loaded
+            xhrDataElement:         moduleOptions.xhrDataElement,               // container for all language-specific dialogs (modals)
             postSelectionCallback:  function () {j1.adapter.cookieConsent.cbCookie()}
           });
@@ -244,8 +248,10 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       var cookie_names        = j1.getCookieNames();
       var user_state          = j1.readCookie(cookie_names.user_state);
       var user_consent        = j1.readCookie(cookie_names.user_consent);
+      var user_translate      = j1.readCookie(cookie_names.user_translate);
       var json                = JSON.stringify(user_consent);
       var user_agent          = platform.ua;
+      var cookie_written;
       logger.info('\n' + 'entered post selection callback from CookieConsent');
       logger.info('\n' + 'current values from CookieConsent: ' + json);
@@ -255,16 +261,6 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         $('#quickLinksCookieButton').css('display', 'block');
       }
-      // jadams, 2021-07-11: moved to j1 adapter (displayPage)
-      // NOTE: Warning needs to be moved to another module
-      // because page is reloaded after selection
-      //
-      // if (tracking_enabled && !tracking_id_valid) {
-      //   logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
-      // } else {
-      //   logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
-      // }
       logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
       j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
       logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
@@ -279,7 +275,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // See: https://github.com/luciomartinez/gtag-opt-in/wiki
       if (tracking_enabled && tracking_id_valid) {
         GTagOptIn.register(tracking_id);
-        if (user_consent.analyses)  {
+        if (user_consent.analysis)  {
           logger.info('\n' + 'enable: GA');
           GTagOptIn.optIn();
         } else {
@@ -296,10 +292,20 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         // Managing providers for personalization OptIn/Out (Comments|Ads)
         //
-        if (!user_consent.analyses || !user_consent.personalization) {
+        if (!user_consent.analysis || !user_consent.personalization) {
           // expire consent|state cookies to session
           j1.expireCookie({ name: cookie_names.user_state });
           j1.expireCookie({ name: cookie_names.user_consent });
+          j1.expireCookie({ name: cookie_names.user_translate });
+          user_translate.translationEnabled = false;
+          cookie_written = j1.writeCookie({
+            name:     cookie_names.user_translate,
+            data:     user_translate,
+            samesite: 'Strict',
+            secure:   secure
+          });
         }
         if (moduleOptions.reloadPageOnChange) {
           // reload current page (skip cache)
@@ -315,10 +321,11 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         // Managing providers for personalization OptIn/Out (Comments|Ads)
         //
-        if (!user_consent.analyses || !user_consent.personalization) {
+        if (!user_consent.analysis || !user_consent.personalization) {
           // expire consent|state cookies to session
           j1.expireCookie({ name: cookie_names.user_state });
           j1.expireCookie({ name: cookie_names.user_consent });
+          j1.expireCookie({ name: cookie_names.user_translate });
         }
         if (moduleOptions.reloadPageOnChange) {
           // reload current page (skip cache)