From 5b50bfcb3e2355f315ccad0962007db652996dff Mon Sep 17 00:00:00 2001 From: Euan Cameron Date: Mon, 23 Apr 2018 09:52:25 +0100 Subject: [PATCH 01/11] Add _gat_gtag_UA cookie to gtag cookies array --- tarteaucitron.services.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 81ea5c7..6c42d72 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -871,7 +871,13 @@ tarteaucitron.services.gtag = { "name": "Google Analytics (gtag.js)", "uri": "https://support.google.com/analytics/answer/6004245", "needConsent": true, - "cookies": ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz'], + "cookies": (function () { + // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array + var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.gtagUa; + gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_'); + cookies = ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie]; + return cookies; + })(), "js": function () { "use strict"; window.dataLayer = window.dataLayer || []; From d02bcca16d05828ace0ac461163d34d153d9ba97 Mon Sep 17 00:00:00 2001 From: Euan Cameron Date: Mon, 23 Apr 2018 10:25:09 +0100 Subject: [PATCH 02/11] Add _gat_gtag_UA cookie to gtag cookies array - Removed unneeded variable --- tarteaucitron.services.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 6c42d72..c072580 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -875,8 +875,7 @@ tarteaucitron.services.gtag = { // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.gtagUa; gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_'); - cookies = ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie]; - return cookies; + return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie]; })(), "js": function () { "use strict"; From eeaa77de33640b63a4b06d62a0d1508efbf9e01f Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Tue, 24 Apr 2018 16:45:13 +0900 Subject: [PATCH 03/11] Always load Google Analytics over HTTPS Recommended by Google - and is safer and faster --- tarteaucitron.services.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 81ea5c7..761209f 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -854,7 +854,7 @@ tarteaucitron.services.analytics = { }; window.ga.l = new Date(); - tarteaucitron.addScript('//www.google-analytics.com/analytics.js', '', function () { + tarteaucitron.addScript('https://www.google-analytics.com/analytics.js', '', function () { ga('create', tarteaucitron.user.analyticsUa, {'cookieExpires': 34128000}); ga('send', 'pageview'); if (typeof tarteaucitron.user.analyticsMore === 'function') { @@ -876,7 +876,7 @@ tarteaucitron.services.gtag = { "use strict"; window.dataLayer = window.dataLayer || []; - tarteaucitron.addScript('//www.googletagmanager.com/gtag/js?id=' + tarteaucitron.user.gtagUa, '', function () { + tarteaucitron.addScript('https://www.googletagmanager.com/gtag/js?id=' + tarteaucitron.user.gtagUa, '', function () { function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', tarteaucitron.user.gtagUa); From fa024eb3f39e6d3efdee80e7de62e1497e36dc50 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 26 Apr 2018 16:13:28 +0200 Subject: [PATCH 04/11] adding webmecanik service --- tarteaucitron.services.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 81ea5c7..48e14ea 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -1848,3 +1848,26 @@ tarteaucitron.services.facebookpixel = { } }; +// webmecanik +tarteaucitron.services.webmecanik = { + "key": "webmecanik", + "type": "analytic", + "name": "Webmecanik", + "uri": "https://webmecanik.com/tos", + "needConsent": true, + "cookies": ['mtc_id', 'mtc_sid'], + "js": function () { + "use strict"; + if (tarteaucitron.user.webmecanikurl === undefined) { + return; + } + window['WebmecanikTrackingObject'] = 'mt'; + window['mt'] = window['mt'] || function() { + (window['mt'].q = window['mt'].q || []).push(arguments); + }; + + tarteaucitron.addScript(tarteaucitron.user.webmecanikurl, '', function() { + mt('send', 'pageview'); + }); + } +}; \ No newline at end of file From 24fb4ed4005e84a8f1b1e54c6f1f1513537a6774 Mon Sep 17 00:00:00 2001 From: Norman Pracht - Webmecanik Date: Thu, 26 Apr 2018 16:43:13 +0200 Subject: [PATCH 05/11] update readme to add Webmecanik automation also i noticed that mautic is missing in the list. i created a new category :) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cbfb3a..6df3e5e 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,11 @@ Bonus: * Comment * Disqus * Facebook (commentaire) - + +* Marketing Automation & CRM + * Mautic + * Webmecanik Automation + * Social network * AddThis * AddToAny (feed) From 52fe843be604b3ef0fd0253c19d7d9d980a77a1f Mon Sep 17 00:00:00 2001 From: Encre Informatique Date: Tue, 22 May 2018 12:21:41 -0300 Subject: [PATCH 06/11] Fixed #89 : spanish translation for settings The sentence has been modified as stated in the issue. A couple of translation have been modified. --- lang/tarteaucitron.es.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/tarteaucitron.es.js b/lang/tarteaucitron.es.js index 65e5f9b..512d805 100644 --- a/lang/tarteaucitron.es.js +++ b/lang/tarteaucitron.es.js @@ -1,7 +1,7 @@ /*global tarteaucitron */ tarteaucitron.lang = { "adblock": "Hola! Este sitio web es transparente y le da la opción de activar los servicios de terceros.", - "adblock_call": "Por favor deshabilite su AdBlocker para comenzar a personalizar.", + "adblock_call": "Por favor deshabilite su AdBlocker para empezar a personalizar los servicios.", "reload": "Actualizar esta página", "alertBigScroll": "Al continuar para desplazarse,", @@ -14,7 +14,7 @@ tarteaucitron.lang = { "acceptAll": "OK, aceptar todas", "close": "Cerrar", - "all": "Preference for all services", + "all": "Ajustes para todos los servicios", "info": "Protegiendo tu privacidad", "disclaimer": "Aceptando estos servicios terceros, estas aceptando sus cookies y el uso de tecnologías de rastreo necesarias para su correcto funcionamiento.", @@ -28,7 +28,7 @@ tarteaucitron.lang = { "source": "Ver sitio web oficial", "credit": "Gestor de cookies realizada por tarteaucitron.js", - "fallback": "esta deshabilitado.", + "fallback": "está deshabilitado.", "ads": { "title": "Red de publicidad", From 263fa2fd4696562f18a7b7eee63e90d87809b6f1 Mon Sep 17 00:00:00 2001 From: Encre Informatique Date: Tue, 22 May 2018 12:26:07 -0300 Subject: [PATCH 07/11] Fixed #93 : dutch translation The Dutch translation has been added according to the issue. Beware I cannot check the translation itself. The nl locale has been added to the main script. --- lang/tarteaucitron.nl.js | 65 ++++++++++++++++++++++++++++++++++++++++ tarteaucitron.js | 4 ++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 lang/tarteaucitron.nl.js diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js new file mode 100644 index 0000000..f5f6fa7 --- /dev/null +++ b/lang/tarteaucitron.nl.js @@ -0,0 +1,65 @@ +/*global tarteaucitron */ +tarteaucitron.lang = { + "adblock": "Hallo! Deze site is transparant en laat u de services van derden kiezen die u wilt toestaan.", + "adblock_call": "Schakel uw adblocker uit om te beginnen met aanpassen.", + "reload": "Ververs de pagina", + + "alertBigScroll": "Door te blijven scrollen,", + "alertBigClick": "Als je doorgaat met het surfen op deze website,", + "alertBig": "staat je alle diensten van derden toe", + + "alertBigPrivacy": "Deze site maakt gebruik van cookies en geeft u controle over wat u wilt activeren", + "alertSmall": "Beheer instellingen", + "personalize": "Personaliseer", + "acceptAll": "OK, accepteer alle", + "close": "Sluit", + + "all": "Voorkeur voor alle diensten", + + "info": "Bescherming van uw privacy", + "disclaimer": "Door deze services van derden toe te staan, accepteert u hun cookies en het gebruik van trackingtechnologieën die nodig zijn voor hun goede werking.", + "allow": "Toestaan", + "deny": "Weigeren", + "noCookie": "Deze service gebruikt geen cookie", + "useCookie": "Deze service kan worden geïnstalleerd", + "useCookieCurrent": "Deze service is geïnstalleerd", + "useNoCookie": "Deze service heeft geen cookies geïnstalleerd.", + "more": "Lees meer", + "source": "Bekijk de officiële website", + "credit": "Cookie manager mogelijk gemakt door tarteaucitron.js", + + "fallback": "is uitgeschakeld.", + + "ads": { + "title": "Advertentienetwerk", + "details": "Advertentienetwerken kunnen inkomsten genereren door advertentieruimte op de site te verkopen." + }, + "analytic": { + "title": "Bezoekers meting", + "details": "De bezoekersdiensten voor het publiek worden gebruikt om nuttige statistieken te genereren om de site te verbeteren." + }, + "social": { + "title": "Sociale netwerken", + "details": "Sociale netwerken kunnen de bruikbaarheid van de site verbeteren en helpen deze via de shares te promoten." + }, + "video": { + "title": "Videos", + "details": "Video sharing-services helpen om rich media op de site toe te voegen en de zichtbaarheid ervan te vergroten." + }, + "comment": { + "title": "Comments", + "details": "Commentsmanagers faciliteren het indienen van opmerkingen en het bestrijden van spam." + }, + "support": { + "title": "Support", + "details": "Support diensten stellen u in staat contact op te nemen met het team van de site en helpen het te verbeteren." + }, + "api": { + "title": "APIs", + "details": "APIs worden gebruikt om scripts te laden: geolocatie, zoekmachines, vertalingen, ..." + }, + "other": { + "title": "Overig", + "details": "Diensten om webinhoud weer te geven." + } +}; diff --git a/tarteaucitron.js b/tarteaucitron.js index 88cd673..cfe1cb5 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -1040,7 +1040,7 @@ var tarteaucitron = { "use strict"; if (!navigator) { return 'en'; } - var availableLanguages = 'cs,en,fr,es,it,de,pt,pl,ru', + var availableLanguages = 'cs,en,fr,es,it,de,nl,pt,pl,ru', defaultLanguage = 'en', lang = navigator.language || navigator.browserLanguage || navigator.systemLanguage || navigator.userLang || null, @@ -1077,6 +1077,8 @@ var tarteaucitron = { return 'it_IT'; } else if (userLanguage === 'pt') { return 'pt_PT'; + } else if (userLanguage === 'nl') { + return 'nl_NL'; } else { return 'en_US'; } From a5f0900963b1025ce03e073aed72052e497655c6 Mon Sep 17 00:00:00 2001 From: Thomas Combe Date: Thu, 24 May 2018 09:47:44 +0200 Subject: [PATCH 08/11] Allow user to select tarteaucitron cookie domain (for multi-site) --- tarteaucitron.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tarteaucitron.js b/tarteaucitron.js index 88cd673..0cada71 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -865,14 +865,15 @@ var tarteaucitron = { expireTime = time + 31536000000, // 365 days regex = new RegExp("!" + key + "=(wait|true|false)", "g"), cookie = tarteaucitron.cookie.read().replace(regex, ""), - value = 'tarteaucitron=' + cookie + '!' + key + '=' + status; - - if (tarteaucitron.cookie.read().indexOf(key + '=' + status) === -1) { + value = 'tarteaucitron=' + cookie + '!' + key + '=' + status, + domain = (tarteaucitron.parameters.cookieDomain !== undefined && tarteaucitron.parameters.cookieDomain !== '') ? 'domain=' + tarteaucitron.parameters.cookieDomain + ';' : ''; + + if (tarteaucitron.cookie.read().indexOf(key + '=' + status) === -1) { tarteaucitron.pro('!' + key + '=' + status); } d.setTime(expireTime); - document.cookie = value + '; expires=' + d.toGMTString() + '; path=/;'; + document.cookie = value + '; expires=' + d.toGMTString() + '; path=/;' + domain; }, "read": function () { "use strict"; From a4bae2d1e3bbfa146662cec714d4e4b03d33625b Mon Sep 17 00:00:00 2001 From: Thomas Combe Date: Fri, 25 May 2018 16:05:48 +0200 Subject: [PATCH 09/11] Add how to use it --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 2cbfb3a..2cd12a2 100644 --- a/README.md +++ b/README.md @@ -99,3 +99,23 @@ In PHP for example, you can bypass all the script by setting this var `tarteauci # Installation guide [Visit opt-out.ferank.eu](https://opt-out.ferank.eu/) + + +# How to use + +```html + + + +``` From bc451eb573407d3548a5ac865f844bd730f9a85f Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Fri, 25 May 2018 23:49:34 +0200 Subject: [PATCH 10/11] Add reCAPTCHA --- tarteaucitron.services.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index ee91c55..f5f4e27 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -973,6 +973,20 @@ tarteaucitron.services.jsapi = { } }; +// recaptcha +tarteaucitron.services.recaptcha = { + "key": "recaptcha", + "type": "api", + "name": "reCAPTCHA", + "uri": "http://www.google.com/policies/privacy/", + "needConsent": true, + "cookies": ['nid'], + "js": function () { + "use strict"; + tarteaucitron.addScript('https://www.google.com/recaptcha/api.js'); + } +}; + // linkedin tarteaucitron.services.linkedin = { "key": "linkedin", From 2c755da28e4d71c40578c2b42eff4be7206cf06c Mon Sep 17 00:00:00 2001 From: encreinformatique Date: Thu, 14 Jun 2018 11:51:25 +0200 Subject: [PATCH 11/11] Fix couple of mispelling Line 9 and 29 have been modified to fix a mispelling. Thank you @johandenhollander --- lang/tarteaucitron.nl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js index f5f6fa7..dda9e78 100644 --- a/lang/tarteaucitron.nl.js +++ b/lang/tarteaucitron.nl.js @@ -6,7 +6,7 @@ tarteaucitron.lang = { "alertBigScroll": "Door te blijven scrollen,", "alertBigClick": "Als je doorgaat met het surfen op deze website,", - "alertBig": "staat je alle diensten van derden toe", + "alertBig": "sta je alle diensten van derden toe", "alertBigPrivacy": "Deze site maakt gebruik van cookies en geeft u controle over wat u wilt activeren", "alertSmall": "Beheer instellingen", @@ -26,7 +26,7 @@ tarteaucitron.lang = { "useNoCookie": "Deze service heeft geen cookies geïnstalleerd.", "more": "Lees meer", "source": "Bekijk de officiële website", - "credit": "Cookie manager mogelijk gemakt door tarteaucitron.js", + "credit": "Cookie manager mogelijk gemaakt door tarteaucitron.js", "fallback": "is uitgeschakeld.",