j1-template 2021.2.6 → 2021.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028fe3d1a65d64d6219d163c9e489f63d482d48353f9e81a94d2779d3beffb58'
-  data.tar.gz: 35904d19f59636e14caaab87a0ca634fe4a1f4ac4b472434fe9f89bacf64d295
+  metadata.gz: 91ee0616f0905e55586302ee465112ca879423feebacb51e93e04f92f4978189
+  data.tar.gz: c64b4a5cfab5cef176f43568c76c5ec0c2550fb7cc8a37df5e8ac97f5cbb957f
 SHA512:
-  metadata.gz: 1f091e1530a0efef1f34d3ee2bfae8d8d50f9fa8380ac1b4e7a2bfdb31b996cfeee6d87f8f51805b0f41f23ea3e3c20d2e22de4b1b7d1e2753f945fa9989187d
-  data.tar.gz: 5421e440efcdb3633a4233b449f32dbf21a23031a08b75a4ba8135eaa0bbe68e57a3cf510bcaf888140895ed371665f4183d03021c5a93365c1224204ac64d8c
+  metadata.gz: 40b74cefa0cf230f69156a18b42e6df4932187c6b3b05083efdf11f6d84126e0bcc1279c375692a3360f539b183ab7de2b32a89eb584aadf8e039813bde69aba
+  data.tar.gz: 14207a1cd40024aaae0fe3c83a1aa0a72b36e2ba348315e3e2c06b0a8625b38be8405bbce5719c85bb1f00d8f6819e604803575f76a4dbbadb5c5010eca8b09a

data/_includes/themes/j1/modules/connectors/translators/google-translator.html

@@ -28,10 +28,11 @@
 <!-- [INFO   ] [j1.modules.connectors.translation     ] [ place callback for the Google Translator API ] -->
 <script>
   function googleTranslateElementInit() {
-    new google.translate.TranslateElement({
+    var gtAPI = new google.translate.TranslateElement({
       pageLanguage: 'en',
       layout: google.translate.TranslateElement.FloatPosition.TOP_LEFT
     },
     'google_translate_element');
+    j1.adapter.translator.postTranslateElementInit(gtAPI);
   }
 </script>

data/assets/data/translator.html

@@ -151,7 +151,7 @@ exclude_from_search:                    true
 
       <div class="modal-footer">
         <button id="translator-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="min-width: 20rem">
-        No, skip translation
+        No, disable translation
         </button>
         <button id="translator-buttonAgree" type="button" class="btn btn-primary btn-raised" style="min-width: 20rem">
         Yes, please translate
@@ -266,7 +266,7 @@ exclude_from_search:                    true
 
       <div class="modal-footer">
         <button id="translator-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="min-width: 20rem">
-        Nein, keine Übersetzung
+        Nein, Übersetzung abschalten
         </button>
         <button id="translator-buttonAgree" type="button" class="btn btn-primary btn-raised" style="min-width: 20rem">
         Ja, bitte übersetzen

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

@@ -174,7 +174,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          j1.cookieConsent = new BootstrapCookieConsent({
+          j1.cookieConsent = new CookieConsent ({
             contentURL:             moduleOptions.contentURL,                   // dialog content (modals) for all supported languages
             cookieName:             moduleOptions.cookieName,                   // name of the consent cookie
             cookieSameSite:         moduleOptions.cookieSameSite,               // restrict consent cookie
@@ -183,7 +183,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
             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()}
+            postSelectionCallback:  moduleOptions.postSelectionCallback,        // callback function, called after the user has made his selection        
           });
 
           _this.setState('finished');
@@ -303,7 +303,8 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
             name:     cookie_names.user_translate,
             data:     user_translate,
             samesite: 'Strict',
-            secure:   secure
+            secure:   secure,
+            expires:  365
           });
 
         }

data/assets/themes/j1/adapter/js/translator.1.js

@@ -0,0 +1,525 @@
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/translator.js
+ # Liquid template to create the Template Adapter for J1 Translator
+ #
+ # Product/Info:
+ # http://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid var initialization
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment         = site.environment %}
+{% assign blocks              = site.data.blocks %}
+{% assign modules             = site.data.modules %}
+{% assign template_config     = site.data.j1_config %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign translator_defaults = modules.defaults.translator.defaults %}
+{% assign translator_settings = modules.translator.settings %}
+{% assign tracking_enabled    = template_config.analytics.enabled %}
+
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign translator_options     = translator_defaults | merge: translator_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/translator.js
+ # JS Adapter for J1 Translate
+ #
+ #  Product/Info:
+ #  http://jekyll.one
+ #
+ #  Copyright (C) 2021 Juergen Adams
+ #
+ #  J1 Template is licensed under MIT License.
+ #  See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
+// -----------------------------------------------------------------------------
+// https://github.com/EdwardBalaj/Simple-DeepL-API-Integration
+// https://github.com/marghoobsuleman/ms-Dropdown
+// https://www.marghoobsuleman.com/image-dropdown/help
+// https://www.marghoobsuleman.com/image-dropdown/advanced-help
+'use strict';
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+j1.adapter['translator'] = (function (j1, window) {
+
+  var environment       = '{{environment}}';
+  var tracking_enabled  = ('{{tracking_enabled}}' === 'true') ? true: false;    // Analytics/GA enabled?
+  var moduleOptions     = {};
+  var user_translate    = {};
+  var _this;
+  var $modal;
+  var domain;
+  var cookie_names;
+  var user_consent;
+  var logger;
+  var url;
+  var baseUrl;
+  var hostname;
+  var domain;
+  var cookie_sub_domains;
+  var secure;
+  var logText;
+  var cookie_written;
+  var modal_language;
+  var navigator_language;
+  var translation_language;
+  var ddSourceLanguage;
+  var head;
+  var script;
+  var languageList;
+
+  // ---------------------------------------------------------------------------
+  // helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // setCookie()
+  // writes a flat cookie (not using an encoded JSON string)
+  // ---------------------------------------------------------------------------
+  function setCookie(options /*cName, cValue, expDays*/) {
+    var defaults = {};
+    var settings;
+    var document_cookie;
+    var stringifiedAttributes = '';
+
+    defaults = {
+        name: '',
+        path: '/',
+        expires: 0,
+        domain: 'localhost',
+        samesite: 'Strict',
+        http_only: false,
+        secure: false
+    };
+    settings = $.extend(defaults, options);
+
+    stringifiedAttributes += '; ' + 'path=' + settings.path;
+
+    if (settings.expires > 0) {
+      date.setTime(date.getTime() + (settings.expires * 24 * 60 * 60 * 1000));
+      stringifiedAttributes += '; ' + 'expires=' + date.toUTCString();
+    }
+
+    stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+
+    if (settings.secure) {
+      stringifiedAttributes += '; ' + 'secure=' + settings.secure;
+    }
+
+    // document_cookie = settings.name + '=' + settings.data  + '; path=' + settings.path + '; ' + 'domain=' + settings.domain + '; ' + 'SameSite=' + settings.samesite + ';';
+    document_cookie = settings.name + '=' + settings.data + stringifiedAttributes;
+
+    document.cookie = document_cookie;
+  };
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // Initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this                 = j1.adapter.translator;
+      logger                = log4javascript.getLogger('j1.adapter.translator');
+      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;
+      modal_language        = "{{site.language}}";
+      navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
+      translation_language  = navigator_language.split('-')[0];
+      cookie_names          = j1.getCookieNames();
+      head                  = document.getElementsByTagName('head')[0];
+      script                = document.createElement('script');
+      script.id             = 'google-translate';
+      script.src            = '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit';
+
+      user_translate = {
+        'translatorName':           'google',
+        'translationEnabled':       false,
+        'analysis':                 true,
+        'personalization':          true,
+        'translateAllPages':        true,
+        'useLanguageFromBrowser':   true,
+        'translationLanguage':      translation_language,
+      };
+
+      // set domain used by cookies
+      if(domain !== 'localhost') {
+        cookie_sub_domains = '.' + hostname;
+      } else {
+        cookie_sub_domains = hostname;
+      }
+
+      if (j1.existsCookie(cookie_names.user_translate)) {
+        user_translate = j1.readCookie(cookie_names.user_translate);
+      } else {
+        logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+        cookie_written = j1.writeCookie({
+          name:     cookie_names.user_translate,
+          data:     user_translate,
+          samesite: 'Strict',
+          expires:  365
+        });
+      }
+
+      // set domain used by cookies
+      if(domain !== 'localhost') {
+        cookie_sub_domains = '.' + hostname;
+      } else {
+        cookie_sub_domains = hostname;
+      }
+
+      // initialize state flag
+      _this.state = 'pending';
+      // _this.settings.languageList = '/assets/data/ms_select.json';
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.translator',
+        generated:   '{{site.time}}'
+      }, options);
+
+      {% comment %} Load module config from yml data
+      -------------------------------------------------------------------------- {% endcomment %}
+      // Load  module DEFAULTS|CONFIG
+      /* eslint-disable */
+      moduleOptions = $.extend({}, {{translator_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
+
+      if (typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
+      }
+
+      // -----------------------------------------------------------------------
+      // initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_page_ready = setInterval (function (options) {
+        user_consent = j1.readCookie(cookie_names.user_consent);
+
+        if ( j1.getState() === 'finished' ) {
+          _this.setState('started');
+          logger.info('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
+
+          if ($('google_translate_element')) {
+            $('google_translate_element').hide();
+          }
+
+          // show|hide translate button if enabled
+          if (moduleOptions.hideTranslatorIcon) {
+            if (!user_consent.analysis || !user_consent.personalization) {
+              // disable google translate button if visible
+              if ($('#quickLinksTranslateButton').css('display') === 'block')  {
+                $('#quickLinksTranslateButton').css('display', 'none');
+              }
+            }
+            if (user_consent.analysis && user_consent.personalization) {
+              // enable google translate button if not visible
+              if ($('#quickLinksTranslateButton').css('display') === 'none')  {
+                $('#quickLinksTranslateButton').css('display', 'block');
+              }
+            }
+          }
+
+          // update user_translate cookie
+          user_translate.analysis         = user_consent.analysis;
+          user_translate.personalization  = user_consent.personalization;
+          cookie_written = j1.writeCookie({
+            name:     cookie_names.user_translate,
+            data:     user_translate,
+            samesite: 'Strict',
+            secure:   secure
+          });
+
+          j1.translator = new Translator({
+            contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
+            cookieName:               moduleOptions.cookieName,                 // the name of the User State Cookie (primary data)
+            cookieConsentName:        moduleOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
+            disableLanguageSelector:  moduleOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
+            dialogContainerID:        moduleOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
+            dialogLanguage:           moduleOptions.dialogLanguage,             // language for the dialog (modal)
+            translationLanguage:      moduleOptions.translationLanguage,        // default language for translation
+            translationLanguages:     moduleOptions.google.translationLanguages,// supported languages for translation
+            translationEnabled:       moduleOptions.translationEnabled,         // run translation enabled|disabled
+            translatorName:           moduleOptions.translatorName,             // translator used for translation
+            xhrDataElement:           moduleOptions.xhrDataElement,             // container for all language-specific dialogs (modals)
+            postSelectionCallback:    moduleOptions.google.postSelectionCallback
+          });
+
+          if (user_consent.analysis && user_consent.personalization && user_translate.translationEnabled) {
+            if (moduleOptions.translatorName === 'google') {
+              head.appendChild(script);
+              if ($('google_translate_element')) {
+                $('google_translate_element').hide();
+              }
+            }
+          } else {
+            if (moduleOptions.translatorName === 'google') {
+              j1.removeCookie({name: 'googtrans', domain: domain});
+            }
+          }
+
+          _this.setState('finished');
+          logger.info('\n' + 'state: ' + _this.getState());
+          logger.debug('\n' + 'module initialized successfully');
+          clearInterval(dependencies_met_page_ready);
+        }
+      });
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // messageHandler: MessageHandler for J1 google_translate module
+    // Manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info('\n' + message.text);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    }, // END getState
+
+    // -------------------------------------------------------------------------
+    // postTranslateElementInit()
+    // ???
+    // -------------------------------------------------------------------------
+    postTranslateElementInit: function () {
+      // var transCode = '/en/de';
+      //
+      // // set the transCode cookie (googtrans)
+      // setCookie({
+      //   name: 'googtrans',
+      //   data: transCode
+      // });
+      // j1.removeCookie({name: 'googtrans', domain: domain});
+      return;
+    }, // END postTranslateElementInit
+
+    // -------------------------------------------------------------------------
+    // cbGoogle()
+    // Called by the translator CORE module after the user
+    // has made the lanuage selection for translation (callback)
+    // -------------------------------------------------------------------------
+    cbGoogle: function () {
+      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 msDropdownLang = document.getElementById('dropdownJSON').msDropdown;
+      var msDropdown     = document.getElementById('dropdownJSON').msDropdown;
+      var head;
+      var script;
+      var srcLang;
+      var destLang;
+      var transCode;
+      var cookie_written;
+      var htmlScriptElement;
+      var selectedTranslationLanguage;
+
+      logger.info('\n' + 'entered post selection callback from google_translate');
+      logger.debug('\n' + 'current values from cookie consent: ' + JSON.stringify(user_consent));
+      logger.debug('\n' + 'current values from user state: ' + JSON.stringify(user_state));
+
+      selectedTranslationLanguage = msDropdownLang.value;
+      logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
+
+      // update cookie consent settings
+      user_consent.analysis         = user_translate.analysis;
+      user_consent.personalization  = user_translate.personalization;
+
+      cookie_written = j1.writeCookie({
+        name:     cookie_names.user_consent,
+        data:     user_consent,
+        samesite: 'Strict',
+        secure:   secure,
+        expires:  0
+      });
+
+      // translation allowed
+      if (user_consent.analysis && user_consent.personalization)  {
+        head              = document.getElementsByTagName('head')[0];
+        script            = document.createElement('script');
+        script.id         = 'google-translate';
+        script.src        = '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit';
+        htmlScriptElement = document.getElementById(script.id);
+
+        if (user_translate.translationEnabled && moduleOptions.translatorName === 'google') {
+          // head.appendChild(script);
+
+          if ($('google_translate_element')) {
+            $('google_translate_element').hide();
+          }
+
+          // set transCode settings
+          srcLang   = "{{site.language}}";
+          destLang  = translation_language;
+          transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
+
+          // set the transCode cookie (googtrans)
+          setCookie({
+            name: 'googtrans',
+            data: transCode
+          });
+
+          // enable google transalate button if not visible
+          if ($('#quickLinksTranslateButton').css('display') === 'none')  {
+            $('#quickLinksTranslateButton').css('display', 'block');
+          }
+        } else { // translation NOT allowed
+
+          // update cookie user translate settings
+          user_translate.translationEnabled = false;
+          cookie_written = j1.writeCookie({
+            name:     cookie_names.user_translate,
+            data:     user_translate,
+            samesite: 'Strict',
+            secure:   secure
+          });
+
+          // stop translation for all pages
+          if (htmlScriptElement) { htmlScriptElement.remove(); }
+          j1.removeCookie({name: 'googtrans', domain: domain});
+        }
+      }
+
+      // translation NOT allowed
+      if (!user_translate.analysis || !user_translate.personalization) {
+        head       = document.getElementsByTagName('head')[0];
+        script     = document.createElement('script');
+        script.id  = 'google-translate';
+
+        // update cookie consent settings
+        user_consent.analysis        = user_translate.analysis;
+        user_consent.personalization = user_translate.personalization;
+        cookie_written = j1.writeCookie({
+          name:     cookie_names.user_consent,
+          data:     user_consent,
+          samesite: 'Strict',
+          secure:   secure,
+          expires:  0
+        });
+
+        // update cookie user translate settings
+        user_translate.translationEnabled = false;
+        cookie_written = j1.writeCookie({
+          name:     cookie_names.user_translate,
+          data:     user_consent,
+          samesite: 'Strict',
+          secure:   secure,
+          expires:  0
+        });
+
+        // stop translation for all pages
+        if (htmlScriptElement) { htmlScriptElement.remove(); }
+        j1.removeCookie({name: 'googtrans', domain: domain});
+      }
+
+      if (moduleOptions.reloadPageOnChange) {
+        // reload current page (skip cache)
+        location.reload(true);
+      }
+
+      // disable google translate button if visible
+      if ($('#quickLinksTranslateButton').css('display') === 'block')  {
+        $('#quickLinksTranslateButton').css('display', 'none');
+      }
+
+    }, // END cbGoogle
+
+    // -------------------------------------------------------------------------
+    // cbDeepl()
+    // Called by the translator CORE module after the user
+    // has made the lanuage selection for translation (callback)
+    // -------------------------------------------------------------------------
+    cbDeepl: function () {
+
+      // code for post procession on Deepl translations
+
+    } // END cbDeepl
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{{ cache | strip_empty_lines }}
+{% assign cache = nil %}

data/assets/themes/j1/adapter/js/translator.js

@@ -117,16 +117,37 @@ j1.adapter['translator'] = (function (j1, window) {
   function setCookie(options /*cName, cValue, expDays*/) {
     var defaults = {};
     var settings;
+    var document_cookie;
+    var stringifiedAttributes = '';
 
     defaults = {
         name: '',
         path: '/',
         expires: 0,
-        domain: 'localhost'
+        domain: 'localhost',
+        samesite: 'Strict',
+        http_only: false,
+        secure: false
     };
     settings = $.extend(defaults, options);
 
-    document.cookie = settings.name + "=" + settings.data  + "; path=/";
+    stringifiedAttributes += '; ' + 'path=' + settings.path;
+
+    if (settings.expires > 0) {
+      date.setTime(date.getTime() + (settings.expires * 24 * 60 * 60 * 1000));
+      stringifiedAttributes += '; ' + 'expires=' + date.toUTCString();
+    }
+
+    stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+
+    if (settings.secure) {
+      stringifiedAttributes += '; ' + 'secure=' + settings.secure;
+    }
+
+    // document_cookie = settings.name + '=' + settings.data  + '; path=' + settings.path + '; ' + 'domain=' + settings.domain + '; ' + 'SameSite=' + settings.samesite + ';';
+    document_cookie = settings.name + '=' + settings.data + stringifiedAttributes;
+
+    document.cookie = document_cookie;
   };
 
   // ---------------------------------------------------------------------------
@@ -148,6 +169,7 @@ j1.adapter['translator'] = (function (j1, window) {
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
       secure                = (url.protocol.includes('https')) ? true : false;
       modal_language        = "{{site.language}}";
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
@@ -168,6 +190,7 @@ j1.adapter['translator'] = (function (j1, window) {
         'translationLanguage':      translation_language,
       };
 
+      // load|initialize user translate cookie
       if (j1.existsCookie(cookie_names.user_translate)) {
         user_translate = j1.readCookie(cookie_names.user_translate);
       } else {
@@ -176,17 +199,11 @@ j1.adapter['translator'] = (function (j1, window) {
           name:     cookie_names.user_translate,
           data:     user_translate,
           samesite: 'Strict',
+          secure:   secure,
           expires:  365
         });
       }
 
-      // set domain used by cookies
-      if(domain !== 'localhost') {
-        cookie_domain = '.' + hostname;
-      } else {
-        cookie_domain = hostname;
-      }
-
       // initialize state flag
       _this.state = 'pending';
       // _this.settings.languageList = '/assets/data/ms_select.json';
@@ -221,6 +238,7 @@ j1.adapter['translator'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
+          // hide the google translate element if exists
           if ($('google_translate_element')) {
             $('google_translate_element').hide();
           }
@@ -248,7 +266,8 @@ j1.adapter['translator'] = (function (j1, window) {
             name:     cookie_names.user_translate,
             data:     user_translate,
             samesite: 'Strict',
-            secure:   secure
+            secure:   secure,
+            expires:  365
           });
 
           j1.translator = new Translator({
@@ -266,15 +285,21 @@ j1.adapter['translator'] = (function (j1, window) {
             postSelectionCallback:    moduleOptions.google.postSelectionCallback
           });
 
+          // enable|disable translation (after callback)
           if (user_consent.analysis && user_consent.personalization && user_translate.translationEnabled) {
             if (moduleOptions.translatorName === 'google') {
               head.appendChild(script);
-              $('google_translate_element').hide();
+              if ($('google_translate_element')) {
+                $('google_translate_element').hide();
+              }
             }
           } else {
             if (moduleOptions.translatorName === 'google') {
-              j1.removeCookie({name: 'googtrans'});
-           }
+              // remove all googtrans cookies that POTENTIALLY exists
+              Cookies.remove('googtrans', { domain: cookie_domain });
+              Cookies.remove('googtrans', { domain: hostname });
+              Cookies.remove('googtrans');
+            }
           }
 
           _this.setState('finished');
@@ -328,32 +353,35 @@ j1.adapter['translator'] = (function (j1, window) {
       return _this.state;
     }, // END getState
 
+    // -------------------------------------------------------------------------
+    // postTranslateElementInit()
+    // ???
+    // -------------------------------------------------------------------------
+    postTranslateElementInit: function (response) {
+      // code for post processing
+      logger.info('\n' + 'postTranslateElementInit entered');
+      logger.info('\n' + response.T.Dh);
+      return;
+    }, // END postTranslateElementInit
+
     // -------------------------------------------------------------------------
     // cbGoogle()
-    // Called by the translator CORE module after the user
-    // has made the lanuage selection for translation (callback)
+    // Called by the translator CORE module after the user made the
+    // selection for a translation|language
     // -------------------------------------------------------------------------
     cbGoogle: function () {
+      var logger         = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
       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 msDropdownLang = document.getElementById('dropdownJSON').msDropdown;
       var msDropdown     = document.getElementById('dropdownJSON').msDropdown;
-      var head;
-      var script;
+      var selectedTranslationLanguage;
       var srcLang;
       var destLang;
       var transCode;
-      var cookie_written;
-      var htmlScriptElement;
-      var selectedTranslationLanguage;
-
-      logger.info('\n' + 'entered post selection callback from google_translate');
-      logger.debug('\n' + 'current values from cookie consent: ' + JSON.stringify(user_consent));
-      logger.debug('\n' + 'current values from user state: ' + JSON.stringify(user_state));
 
-      selectedTranslationLanguage = msDropdownLang.value;
+      selectedTranslationLanguage = msDropdown.value;
       logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
       // update cookie consent settings
@@ -365,109 +393,34 @@ j1.adapter['translator'] = (function (j1, window) {
         data:     user_consent,
         samesite: 'Strict',
         secure:   secure,
-        expires:  0
+        expires:  365
       });
 
-      // translation allowed
-      if (user_consent.analysis && user_consent.personalization)  {
-        head              = document.getElementsByTagName('head')[0];
-        script            = document.createElement('script');
-        script.id         = 'google-translate';
-        script.src        = '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit';
-        htmlScriptElement = document.getElementById(script.id);
-
-        if (user_translate.translationEnabled && moduleOptions.translatorName === 'google') {
-          head.appendChild(script);
-
-          if ($('google_translate_element')) {
-            $('google_translate_element').hide();
-          }
-
-          // set transCode settings
-          srcLang   = "{{site.language}}";
-          destLang  = translation_language;
-          transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
+      // set transCode settings
+      srcLang   = "{{site.language}}";
+      destLang  = translation_language;
+      transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
 
-          // set the transCode cookie (googtrans)
-          setCookie({
-            name: 'googtrans',
-            data: transCode
-          });
+      // remove all googtrans cookies that POTENTIALLY exists
+      Cookies.remove('googtrans', { domain: cookie_domain });
+      Cookies.remove('googtrans', { domain: hostname });
+      Cookies.remove('googtrans');
 
-          // enable google transalate button if not visible
-          if ($('#quickLinksTranslateButton').css('display') === 'none')  {
-            $('#quickLinksTranslateButton').css('display', 'block');
-          }
-        } else { // translation NOT allowed
-
-          // update cookie user translate settings
-          user_translate.translationEnabled = false;
-          cookie_written = j1.writeCookie({
-            name:     cookie_names.user_translate,
-            data:     user_translate,
-            samesite: 'Strict',
-            secure:   secure
-          });
-
-          // stop translation for all pages
-          if (htmlScriptElement) { htmlScriptElement.remove(); }
-          j1.removeCookie({name: 'googtrans'});
-        }
-      }
-
-      // translation NOT allowed
-      if (!user_translate.analysis || !user_translate.personalization) {
-        head       = document.getElementsByTagName('head')[0];
-        script     = document.createElement('script');
-        script.id  = 'google-translate';
-
-        // update cookie consent settings
-        user_consent.analysis        = user_translate.analysis;
-        user_consent.personalization = user_translate.personalization;
-        cookie_written = j1.writeCookie({
-          name:     cookie_names.user_consent,
-          data:     user_consent,
-          samesite: 'Strict',
-          secure:   secure,
-          expires:  0
-        });
-
-        // update cookie user translate settings
-        user_translate.translationEnabled = false;
-        cookie_written = j1.writeCookie({
-          name:     cookie_names.user_translate,
-          data:     user_consent,
-          samesite: 'Strict',
-          secure:   secure,
-          expires:  0
-        });
-
-        // stop translation for all pages
-        if (htmlScriptElement) { htmlScriptElement.remove(); }
-        j1.removeCookie({name: 'googtrans'});
-      }
-
-      if (moduleOptions.reloadPageOnChange) {
-        // reload current page (skip cache)
-        location.reload(true);
-      }
-
-      // disable google translate button if visible
-      if ($('#quickLinksTranslateButton').css('display') === 'block')  {
-        $('#quickLinksTranslateButton').css('display', 'none');
-      }
+      // write the googtrans cookie w/o DOMAIN!
+      Cookies.set('googtrans', transCode);
 
+      // reload current page (skip cache)
+      location.reload(true);
     }, // END cbGoogle
 
     // -------------------------------------------------------------------------
     // cbDeepl()
-    // Called by the translator CORE module after the user
-    // has made the lanuage selection for translation (callback)
+    // Called by the translator CORE module after the user made the
+    // selection for a translation language
     // -------------------------------------------------------------------------
     cbDeepl: function () {
-
-      // code for post procession on Deepl translations
-
+      var logger     = log4javascript.getLogger('j1.adapter.translator.cbDeepl');
+      // code for post processing
     } // END cbDeepl
 
   }; // END return

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js

@@ -37,7 +37,7 @@
 /* eslint JSUnfilteredForInLoop: "off"                                        */
 // -----------------------------------------------------------------------------
 
-function BootstrapCookieConsent(props) {
+function CookieConsent(props) {
   var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
   var self                  = this;
   var detailedSettingsShown = false;
@@ -58,11 +58,12 @@ function BootstrapCookieConsent(props) {
     contentURL:             '/assets/data/cookieconsent',                       // URL contain the consent dialogs (modals) for ALL supported languages
     cookieName:             'j1.user.translate',                                // name of the cookie, in which the configuration is stored
     cookieStorageDays:      365,                                                // duration the configuration cookie is stored on the client
-    postSelectionCallback:  undefined,                                          // callback function, called after the user has made his selection
+    postSelectionCallback:  '',                                                 // callback function, called after the user has made his selection
     whitelisted:            [],                                                 // pages NO consent modal dialog is issued
     xhrDataElement:         'consent-data',                                     // src container for all language-specific consent dialogs (taken from contentURL)
     dialogContainerID:      'consent-modal',                                    // dest container, the dialog modal is loaded (dynamically)
     cookieSameSite:         'Strict',                                           // restrict the consent cookie to first-party (do NOT send cookie to other domains)
+    cookieSecure:           true
   };
 
   // merge property settings
@@ -128,6 +129,59 @@ function BootstrapCookieConsent(props) {
     }
   };
 
+  // ---------------------------------------------------------------------------
+  // extend()
+  // deep merge of two objects
+  // ---------------------------------------------------------------------------
+  function extend () {
+    var extended = {};
+    var deep = false;
+    var i = 0;
+    var length = arguments.length;
+
+    // Check if a deep merge
+    if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) {
+        deep = arguments[0];
+        i++;
+    }
+
+    // Merge the object into the extended object
+    var merge = function (obj) {
+        for ( var prop in obj ) {
+            if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) {
+                // If deep merge and property is an object, merge properties
+                if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) {
+                    extended[prop] = extend( true, extended[prop], obj[prop] );
+                } else {
+                    extended[prop] = obj[prop];
+                }
+            }
+        }
+    };
+
+    // Loop through each object and conduct a merge
+    for ( ; i < length; i++ ) {
+        var obj = arguments[i];
+        merge(obj);
+     }
+           return extended;
+  }
+
+  // ---------------------------------------------------------------------------
+  // executeFunctionByName()
+  // execute a function by NAME (functionName) in a browser context
+  // (e.g. window) the function is published
+  // ---------------------------------------------------------------------------
+  function executeFunctionByName (functionName, context /*, args */) {
+    var args = Array.prototype.slice.call(arguments, 2);
+    var namespaces = functionName.split('.');
+    var func = namespaces.pop();
+    for(var i = 0; i < namespaces.length; i++) {
+      context = context[namespaces[i]];
+    }
+    return context[func].apply(context, args);
+  }
+
   function showDialog(options) {
     Events.documentReady(function () {
 
@@ -143,11 +197,17 @@ function BootstrapCookieConsent(props) {
         document.body.append(self.modal);
         self.$modal = $(self.modal);
 
-        if (self.props.postSelectionCallback) {
-          self.$modal.on("hidden.bs.modal", function () {
-            self.props.postSelectionCallback();
-          });
-        }
+        // ---------------------------------------------------------------------
+        // register events for the dialog (modal)
+        // ---------------------------------------------------------------------
+
+        // ---------------------------------------------------------------------
+        // on 'hidden'
+        // ---------------------------------------------------------------------
+        self.$modal.on('hidden.bs.modal', function () {
+          // process settings after the user has made his selections
+          executeFunctionByName (self.props.postSelectionCallback, window);
+        }); // END modal on 'hidden'
 
         // load modal content
         //
@@ -253,12 +313,12 @@ function BootstrapCookieConsent(props) {
   }
 
   function agreeAll() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
     self.$modal.modal('hide');
   }
 
   function doNotAgree() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
 
     // jadams, 2021-07-15: all cookies NOT longer supported by j1.expireCookie
     // TODO: Create loop over all cookies found in page
@@ -271,7 +331,7 @@ function BootstrapCookieConsent(props) {
   }
 
   function saveSettings() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
     self.$modal.modal('hide');
   }
 

data/assets/themes/j1/modules/translator/js/translator.js

@@ -467,16 +467,17 @@ function Translator(props) {
 
   // ---------------------------------------------------------------------------
   // agreeAll()
-  // process current settings from checkboxes for button `agreeAll`
+  // process current settings from checkboxes for button 'agreeAll'
+  // On 'agreeAll', enable ALL settings required for translation
   // ---------------------------------------------------------------------------
   function agreeAll() {
-    var settings;
-    var consentSettings = {};
+    var translationSettings = gatherOptions(true);
+    var consentSettings     = {};
 
-    settings                        = gatherOptions();
+    // enable and write all settings required for translation (consent cookie)
     consentSettings                 = JSON.parse(Cookie.get(self.props.cookieConsentName));
-    consentSettings.analysis        = settings.analysis;
-    consentSettings.personalization = settings.personalization;
+    consentSettings.analysis        = translationSettings.analysis;
+    consentSettings.personalization = translationSettings.personalization;
 
     Cookie.set(
       self.props.cookieConsentName,
@@ -485,9 +486,11 @@ function Translator(props) {
       self.props.sameSite,
       self.props.secure
     );
+
+    // enable and write all settings required for translation (translation cookie)
     Cookie.set(
       self.props.cookieName,
-      JSON.stringify(gatherOptions(true)),
+      JSON.stringify(translationSettings),
       self.props.cookieStorageDays,
       self.props.sameSite,
       self.props.secure

data/assets/themes/j1/modules/translator/js/translator.min.js

@@ -12,4 +12,4 @@
  #  See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
-function Translator(d){var p=this;var u=log4javascript.getLogger("j1.core.translator");var l=new liteURL(window.location.href);var c=(l.protocol.includes("https"))?true:false;var q=false;var g;var s;this.props={contentURL:"/assets/data/translator",cookieName:"j1.user.state",cookieConsentName:"j1.user.consent",cookieStorageDays:365,cookieSameSite:"Strict",cookieSecure:c,translationEnabled:false,disableLanguageSelector:false,translatorName:"google",translationLanguages:"all",translationLanguage:"auto",translateAllPages:true,hideSuggestionBox:true,hidePoweredBy:true,hideTopFrame:true,dialogLanguage:"content",dialogLanguages:["en","de"],dialogContainerID:"translator-modal",xhrDataElement:"",postSelectionCallback:"",};for(var e in d){this.props[e]=d[e]}if(this.props.dialogLanguage.indexOf("-")!==-1){this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]}if(!this.props.dialogLanguages.includes(this.props.dialogLanguage)){this.props.dialogLanguage=this.props.dialogLanguages[0]}this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage;u.info("\ninitializing core module: started");u.info("\nstate: started");var f={set:function(x,z,C,y,A){var B=window.btoa(z);var v="";if(C){var w=new Date();w.setTime(w.getTime()+(C*24*60*60*1000));v="; expires="+w.toUTCString()}if(A){document.cookie=x+"="+(B||"")+v+"; Path=/; SameSite="+y+"; secure="+A+";"}else{document.cookie=x+"="+(B||"")+v+"; Path=/; SameSite="+y+";"}},get:function(w){var z=w+"=";var v=document.cookie.split(";");for(var x=0;x<v.length;x++){var B=v[x];while(B.charAt(0)===" "){B=B.substring(1,B.length)}if(B.indexOf(z)===0){var A=B.substring(z.length,B.length);var y=window.atob(A);return y}}return undefined}};var n={documentReady:function(v){if(document.readyState!=="loading"){v()}else{document.addEventListener("DOMContentLoaded",v)}}};function t(){var v={};var w=false;var x=0;var y=arguments.length;if(Object.prototype.toString.call(arguments[0])==="[object Boolean]"){w=arguments[0];x++}var A=function(B){for(var C in B){if(Object.prototype.hasOwnProperty.call(B,C)){if(w&&Object.prototype.toString.call(B[C])==="[object Object]"){v[C]=t(true,v[C],B[C])}else{v[C]=B[C]}}}};for(;x<y;x++){var z=arguments[x];A(z)}return v}function h(A,x){var v=Array.prototype.slice.call(arguments,2);var z=A.split(".");var y=z.pop();for(var w=0;w<z.length;w++){x=x[z[w]]}return x[y].apply(x,v)}function j(w){var v;var x=t({size:0,width:250,multiple:false,selectedIndex:1,enableAutoFilter:false,visibleRows:null,},w);v="#"+x.selector;$.ajax({url:x.url,dataType:"json",success:function(A){var z=[];if(p.props.translationLanguages.includes("all")){z=A[x.elm]}else{for(var y=0;y<A[x.elm].length;y++){if(p.props.translationLanguages.includes(A[x.elm][y].value)){z.push(A[x.elm][y])}}}if(x.visibleRows>z.length){x.visibleRows=z.length}MsDropdown.make(v,{byJson:{data:z,name:x.name,size:x.size,width:x.width,multiple:x.multiple,},enableAutoFilter:x.enableAutoFilter,visibleRows:x.visibleRows,})},error:function(y,A,z){u.error("\nfailed to retrieve JSON data from: "+x.url)}})}function m(){n.documentReady(function(){p.modal=document.getElementById(p.props.dialogContainerID);if(!p.modal){u.info("\nload consent modal");p.modal=document.createElement("div");p.modal.id=p.props.dialogContainerID;p.modal.setAttribute("class","modal fade");p.modal.setAttribute("tabindex","-1");p.modal.setAttribute("role","dialog");p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID);document.body.append(p.modal);p.$modal=$(p.modal);p.$modal.on("show.bs.modal",function(){var w;var x;u.info("\nshow.bs.modal: entered");$.when(j({url:"/assets/data/iso-639-language-codes-flags.json",elm:"iso-639-languages",selector:"dropdownJSON",width:400,visibleRows:8,})).then(function(y){u.info("\ncreating msDropdown from JSON data: finished")})});p.$modal.on("shown.bs.modal",function(){var w=document.getElementById("dropdownJSON").msDropdown;if(!w.length){u.error("\nno msDropdown found in translation dialog");p.$modal.hide()}else{if(p.props.translationLanguage==="auto"){g=navigator.language||navigator.userLanguage;s=g.split("-")[0]}w.selectedIndex=$("#dropdownJSON option[value="+s+"]").index();if(p.props.disableLanguageSelector){w.disabled=true}$("#dropdownJSON").show();$("body").addClass("stop-scrolling")}});p.$modal.on("hidden.bs.modal",function(){$("body").removeClass("stop-scrolling");h(p.props.postSelectionCallback,window)});var v=p.props.contentURL+"/index.html";$.get(v).done(function(w){u.info("\nloading consent modal: successfully");p.modal.innerHTML=w;p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html();$(p.modal).modal({backdrop:"static",keyboard:false});p.$buttonDoNotAgree=$("#translator-buttonDoNotAgree");p.$buttonAgree=$("#translator-buttonAgree");p.$buttonSave=$("#translator-buttonSave");p.$buttonAgreeAll=$("#translator-buttonAgreeAll");u.info("\nload/initialze options from cookie");k();i();$("#google-options").on("hide.bs.collapse",function(){q=false;k()}).on("show.bs.collapse",function(){q=true;k()});u.info("\ninitialze button event handler");p.$buttonDoNotAgree.click(function(){b()});p.$buttonAgree.click(function(){o()});p.$buttonSave.click(function(){$("#google-options").collapse("hide");r();i()});p.$buttonAgreeAll.click(function(){$("#google-options").collapse("hide");o()})}).fail(function(){u.error("\nloading translator dialog (modal): failed");u.warn("\nprobably no|wrong `contentURL` set")})}else{p.$modal.modal("show")}}.bind(this))}function i(){var x=p.getSettings();if(x){for(var w in x){var v=p.$modal.find("#google-options .translator-option[data-name="+w+'] input[type="checkbox"]');v.prop("checked",x[w])}}}function k(){if(q){p.$buttonDoNotAgree.hide();p.$buttonAgree.hide();p.$buttonSave.show();p.$buttonAgreeAll.show()}else{p.$buttonDoNotAgree.show();p.$buttonAgree.show();p.$buttonSave.hide();p.$buttonAgreeAll.hide()}}function a(w){var v=p.$modal.find("#google-options .translator-option");var y={};for(var z=0;z<v.length;z++){var B=v[z];var x=B.getAttribute("data-name");if(x==="necessary"){y[x]=true}else{if(w===undefined){var A=$(B).find('input[type="checkbox"]');y[x]=A.prop("checked")}else{y[x]=!!w}}}return y}function o(){var w;var v={};w=a();v=JSON.parse(f.get(p.props.cookieConsentName));v.analysis=w.analysis;v.personalization=w.personalization;f.set(p.props.cookieConsentName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);f.set(p.props.cookieName,JSON.stringify(a(true)),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}function b(){var v=a();v.translationEnabled=false;f.set(p.props.cookieName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}function r(){var w;var v={};w=a();v=JSON.parse(f.get(p.props.cookieConsentName));v.analysis=w.analysis;v.personalization=w.personalization;f.set(p.props.cookieConsentName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);f.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}this.showDialog=function(){m()};this.getSettings=function(w){var v=f.get(p.props.cookieName);if(v){var x=JSON.parse(f.get(p.props.cookieName));if(w===undefined){return x}else{if(x){return x[w]}else{return false}}}else{return undefined}};u.info("\ninitializing core module finished");u.info("\nstate: finished")};
+function Translator(d){var p=this;var u=log4javascript.getLogger("j1.core.translator");var l=new liteURL(window.location.href);var c=(l.protocol.includes("https"))?true:false;var q=false;var g;var s;this.props={contentURL:"/assets/data/translator",cookieName:"j1.user.state",cookieConsentName:"j1.user.consent",cookieStorageDays:365,cookieSameSite:"Strict",cookieSecure:c,translationEnabled:false,disableLanguageSelector:false,translatorName:"google",translationLanguages:"all",translationLanguage:"auto",translateAllPages:true,hideSuggestionBox:true,hidePoweredBy:true,hideTopFrame:true,dialogLanguage:"content",dialogLanguages:["en","de"],dialogContainerID:"translator-modal",xhrDataElement:"",postSelectionCallback:"",};for(var e in d){this.props[e]=d[e]}if(this.props.dialogLanguage.indexOf("-")!==-1){this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]}if(!this.props.dialogLanguages.includes(this.props.dialogLanguage)){this.props.dialogLanguage=this.props.dialogLanguages[0]}this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage;u.info("\ninitializing core module: started");u.info("\nstate: started");var f={set:function(x,z,C,y,A){var B=window.btoa(z);var v="";if(C){var w=new Date();w.setTime(w.getTime()+(C*24*60*60*1000));v="; expires="+w.toUTCString()}if(A){document.cookie=x+"="+(B||"")+v+"; Path=/; SameSite="+y+"; secure="+A+";"}else{document.cookie=x+"="+(B||"")+v+"; Path=/; SameSite="+y+";"}},get:function(w){var z=w+"=";var v=document.cookie.split(";");for(var x=0;x<v.length;x++){var B=v[x];while(B.charAt(0)===" "){B=B.substring(1,B.length)}if(B.indexOf(z)===0){var A=B.substring(z.length,B.length);var y=window.atob(A);return y}}return undefined}};var n={documentReady:function(v){if(document.readyState!=="loading"){v()}else{document.addEventListener("DOMContentLoaded",v)}}};function t(){var v={};var w=false;var x=0;var y=arguments.length;if(Object.prototype.toString.call(arguments[0])==="[object Boolean]"){w=arguments[0];x++}var A=function(B){for(var C in B){if(Object.prototype.hasOwnProperty.call(B,C)){if(w&&Object.prototype.toString.call(B[C])==="[object Object]"){v[C]=t(true,v[C],B[C])}else{v[C]=B[C]}}}};for(;x<y;x++){var z=arguments[x];A(z)}return v}function h(A,x){var v=Array.prototype.slice.call(arguments,2);var z=A.split(".");var y=z.pop();for(var w=0;w<z.length;w++){x=x[z[w]]}return x[y].apply(x,v)}function j(w){var v;var x=t({size:0,width:250,multiple:false,selectedIndex:1,enableAutoFilter:false,visibleRows:null,},w);v="#"+x.selector;$.ajax({url:x.url,dataType:"json",success:function(A){var z=[];if(p.props.translationLanguages.includes("all")){z=A[x.elm]}else{for(var y=0;y<A[x.elm].length;y++){if(p.props.translationLanguages.includes(A[x.elm][y].value)){z.push(A[x.elm][y])}}}if(x.visibleRows>z.length){x.visibleRows=z.length}MsDropdown.make(v,{byJson:{data:z,name:x.name,size:x.size,width:x.width,multiple:x.multiple,},enableAutoFilter:x.enableAutoFilter,visibleRows:x.visibleRows,})},error:function(y,A,z){u.error("\nfailed to retrieve JSON data from: "+x.url)}})}function m(){n.documentReady(function(){p.modal=document.getElementById(p.props.dialogContainerID);if(!p.modal){u.info("\nload consent modal");p.modal=document.createElement("div");p.modal.id=p.props.dialogContainerID;p.modal.setAttribute("class","modal fade");p.modal.setAttribute("tabindex","-1");p.modal.setAttribute("role","dialog");p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID);document.body.append(p.modal);p.$modal=$(p.modal);p.$modal.on("show.bs.modal",function(){var w;var x;u.info("\nshow.bs.modal: entered");$.when(j({url:"/assets/data/iso-639-language-codes-flags.json",elm:"iso-639-languages",selector:"dropdownJSON",width:400,visibleRows:8,})).then(function(y){u.info("\ncreating msDropdown from JSON data: finished")})});p.$modal.on("shown.bs.modal",function(){var w=document.getElementById("dropdownJSON").msDropdown;if(!w.length){u.error("\nno msDropdown found in translation dialog");p.$modal.hide()}else{if(p.props.translationLanguage==="auto"){g=navigator.language||navigator.userLanguage;s=g.split("-")[0]}w.selectedIndex=$("#dropdownJSON option[value="+s+"]").index();if(p.props.disableLanguageSelector){w.disabled=true}$("#dropdownJSON").show();$("body").addClass("stop-scrolling")}});p.$modal.on("hidden.bs.modal",function(){$("body").removeClass("stop-scrolling");h(p.props.postSelectionCallback,window)});var v=p.props.contentURL+"/index.html";$.get(v).done(function(w){u.info("\nloading consent modal: successfully");p.modal.innerHTML=w;p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html();$(p.modal).modal({backdrop:"static",keyboard:false});p.$buttonDoNotAgree=$("#translator-buttonDoNotAgree");p.$buttonAgree=$("#translator-buttonAgree");p.$buttonSave=$("#translator-buttonSave");p.$buttonAgreeAll=$("#translator-buttonAgreeAll");u.info("\nload/initialze options from cookie");k();i();$("#google-options").on("hide.bs.collapse",function(){q=false;k()}).on("show.bs.collapse",function(){q=true;k()});u.info("\ninitialze button event handler");p.$buttonDoNotAgree.click(function(){b()});p.$buttonAgree.click(function(){o()});p.$buttonSave.click(function(){$("#google-options").collapse("hide");r();i()});p.$buttonAgreeAll.click(function(){$("#google-options").collapse("hide");o()})}).fail(function(){u.error("\nloading translator dialog (modal): failed");u.warn("\nprobably no|wrong `contentURL` set")})}else{p.$modal.modal("show")}}.bind(this))}function i(){var x=p.getSettings();if(x){for(var w in x){var v=p.$modal.find("#google-options .translator-option[data-name="+w+'] input[type="checkbox"]');v.prop("checked",x[w])}}}function k(){if(q){p.$buttonDoNotAgree.hide();p.$buttonAgree.hide();p.$buttonSave.show();p.$buttonAgreeAll.show()}else{p.$buttonDoNotAgree.show();p.$buttonAgree.show();p.$buttonSave.hide();p.$buttonAgreeAll.hide()}}function a(w){var v=p.$modal.find("#google-options .translator-option");var y={};for(var z=0;z<v.length;z++){var B=v[z];var x=B.getAttribute("data-name");if(x==="necessary"){y[x]=true}else{if(w===undefined){var A=$(B).find('input[type="checkbox"]');y[x]=A.prop("checked")}else{y[x]=!!w}}}return y}function o(){var w=a(true);var v={};v=JSON.parse(f.get(p.props.cookieConsentName));v.analysis=w.analysis;v.personalization=w.personalization;f.set(p.props.cookieConsentName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);f.set(p.props.cookieName,JSON.stringify(w),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}function b(){var v=a();v.translationEnabled=false;f.set(p.props.cookieName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}function r(){var w;var v={};w=a();v=JSON.parse(f.get(p.props.cookieConsentName));v.analysis=w.analysis;v.personalization=w.personalization;f.set(p.props.cookieConsentName,JSON.stringify(v),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);f.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.sameSite,p.props.secure);p.$modal.modal("hide")}this.showDialog=function(){m()};this.getSettings=function(w){var v=f.get(p.props.cookieName);if(v){var x=JSON.parse(f.get(p.props.cookieName));if(w===undefined){return x}else{if(x){return x[w]}else{return false}}}else{return undefined}};u.info("\ninitializing core module finished");u.info("\nstate: finished")};

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.2.6'
+  VERSION = '2021.2.10'
 end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.2.6'
+gem 'j1-template', '~> 2021.2.10'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.2.6
+version:                                2021.2.10
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/cookieconsent.yml

@@ -27,7 +27,6 @@ settings:
 
   enabled:                            true
   show_cookie_icon:                   true
-  reloadPageOnChange:                 true
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -25,6 +25,8 @@ about_config:
 defaults:
 
   enabled:                              false
+
+  reloadPageOnChange:                   true
   autoShowDialog:                       true                                    # show consent dialog if NO consent cookie found
   dialogLanguage:                       content                                 # auto|content|one of dialogLanguages
   dialogLanguages:                      [en, de]                                # supported dialog (modal) languages, defaults to FIRST language defined by languages
@@ -36,7 +38,7 @@ defaults:
   whitelisted:                          [ '/pages/public/legal/en/privacy' ]    # pages NO consent issued, currently NOT supported
   xhrDataElement:                       consent-data                            # container for all language-specific consent modals (taken from contentURL)
   dialogContainerID:                    consent-dialog                          # container, the dialog modal is (dynamically) loaded
-  postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # currently hardcoded
+  postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # called after the user has made his selection
 
   modal_settings:
 

data/lib/starter_web/_data/modules/defaults/translator.yml

@@ -46,7 +46,7 @@ defaults:
 #
   google:
 
-    postSelectionCallback:              "j1.adapter.translator.cbGoogle"        # callback to run the translation
+    postSelectionCallback:              j1.adapter.translator.cbGoogle          # callback to run the translation
     hideSuggestionBox:                  true                                    # disable suggestions on translated text
     hidePoweredBy:                      true                                    # disable label "Powered by Google"
     hideTopFrame:                       true                                    # disable the (google) translator frame

data/lib/starter_web/_includes/attributes.asciidoc

@@ -433,7 +433,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.2.6
+:j1--version:                                     2021.2.10
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.2.6'
+    VERSION = '2021.2.10'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.2.6",
+  "version": "2021.2.10",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.2.6",
+  "version": "2021.2.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.2.6",
+  "version": "2021.2.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2021.2.6
+  version: 2021.2.10
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -400,6 +400,7 @@ files:
 - assets/themes/j1/adapter/js/rtextResizer.js
 - assets/themes/j1/adapter/js/themer.js
 - assets/themes/j1/adapter/js/toccer.js
+- assets/themes/j1/adapter/js/translator.1.js
 - assets/themes/j1/adapter/js/translator.js
 - assets/themes/j1/core/country-flags/1x1/ad.svg
 - assets/themes/j1/core/country-flags/1x1/ae.svg