From be57d2a63c23c14191c0031251ac93e9b45c740d Mon Sep 17 00:00:00 2001 From: Luc MULLER Date: Thu, 22 Apr 2021 10:29:11 +0200 Subject: [PATCH 1/4] =?UTF-8?q?[Accessibilit=C3=A9]=20Ajout=20d'une=20info?= =?UTF-8?q?rmation=20textuelle=20sur=20l'=C3=A9tat=20courant=20des=20servi?= =?UTF-8?q?ces.=20Le=20RGAA=20Crit=C3=A8re=203.1=20pr=C3=A9voit=20:=20"=20?= =?UTF-8?q?Crit=C3=A8re=203.1.=20Dans=20chaque=20page=20web,=20l=E2=80=99i?= =?UTF-8?q?nformation=20ne=20doit=20pas=20=C3=AAtre=20donn=C3=A9e=20unique?= =?UTF-8?q?ment=20par=20la=20couleur.=20Cette=20r=C3=A8gle=20est-elle=20re?= =?UTF-8?q?spect=C3=A9e=20=3F"=20https://www.numerique.gouv.fr/publication?= =?UTF-8?q?s/rgaa-accessibilite/methode-rgaa/criteres/#topic3=20Cette=20co?= =?UTF-8?q?ntrainte=20d'accessibilit=C3=A9=20n'est=20pas=20respect=C3=A9e?= =?UTF-8?q?=20par=20Tarte=20Au=20Citron=20car=20la=20seule=20information?= =?UTF-8?q?=20qui=20indique=20quel=20service=20est=20activ=C3=A9=20est=20l?= =?UTF-8?q?a=20couleur=20du=20bouton.=20Ce=20commit=20ajoute=20une=20menti?= =?UTF-8?q?on,=20=C3=A0=20c=C3=B4t=C3=A9=20du=20titre=20du=20service=20ind?= =?UTF-8?q?iquant=20l'=C3=A9tat=20courant=20du=20service=20en=20question.?= =?UTF-8?q?=20Les=20traductions=20dans=20les=20diff=C3=A9rentes=20langues?= =?UTF-8?q?=20ont=20=C3=A9t=C3=A9=20faites=20avec=20Google=20Translate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lang/tarteaucitron.bg.js | 2 ++ lang/tarteaucitron.ca.js | 2 ++ lang/tarteaucitron.cn.js | 2 ++ lang/tarteaucitron.cs.js | 2 ++ lang/tarteaucitron.da.js | 2 ++ lang/tarteaucitron.de.js | 2 ++ lang/tarteaucitron.el.js | 2 ++ lang/tarteaucitron.en.js | 2 ++ lang/tarteaucitron.es.js | 2 ++ lang/tarteaucitron.fi.js | 2 ++ lang/tarteaucitron.fr.js | 2 ++ lang/tarteaucitron.hu.js | 2 ++ lang/tarteaucitron.it.js | 2 ++ lang/tarteaucitron.ja.js | 2 ++ lang/tarteaucitron.lv.js | 2 ++ lang/tarteaucitron.nl.js | 2 ++ lang/tarteaucitron.no.js | 2 ++ lang/tarteaucitron.oc.js | 2 ++ lang/tarteaucitron.pl.js | 2 ++ lang/tarteaucitron.pt.js | 3 +++ lang/tarteaucitron.ro.js | 2 ++ lang/tarteaucitron.ru.js | 2 ++ lang/tarteaucitron.se.js | 2 ++ lang/tarteaucitron.sk.js | 2 ++ lang/tarteaucitron.sv.js | 2 ++ lang/tarteaucitron.tr.js | 2 ++ lang/tarteaucitron.vi.js | 2 ++ lang/tarteaucitron.zh.js | 2 ++ tarteaucitron.js | 37 +++++++++++++++++++++++++------------ 29 files changed, 82 insertions(+), 12 deletions(-) diff --git a/lang/tarteaucitron.bg.js b/lang/tarteaucitron.bg.js index 5d93a82..4a4b13f 100644 --- a/lang/tarteaucitron.bg.js +++ b/lang/tarteaucitron.bg.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "е изключен.", + "allowed": "Позволен", + "disallowed": "Забранено", "ads": { "title": "Рекламодатели", diff --git a/lang/tarteaucitron.ca.js b/lang/tarteaucitron.ca.js index ce17c38..6a9834b 100644 --- a/lang/tarteaucitron.ca.js +++ b/lang/tarteaucitron.ca.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "està deshabilitat.", + "allowed": "Permès", + "disallowed": "Desautoritzat", "ads": { "title": "Xarxa de publicitat", diff --git a/lang/tarteaucitron.cn.js b/lang/tarteaucitron.cn.js index 2c9a460..10aed27 100644 --- a/lang/tarteaucitron.cn.js +++ b/lang/tarteaucitron.cn.js @@ -40,6 +40,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "已禁用。", + "allowed": "允许的", + "disallowed": "不允许的", "ads": { "title": "广告组", diff --git a/lang/tarteaucitron.cs.js b/lang/tarteaucitron.cs.js index d40a57a..c2cc7fc 100644 --- a/lang/tarteaucitron.cs.js +++ b/lang/tarteaucitron.cs.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "je vypnutý.", + "allowed": "povoleno", + "disallowed": "nepovoleno", "ads": { "title": "Reklamní síť", diff --git a/lang/tarteaucitron.da.js b/lang/tarteaucitron.da.js index 35705f9..e073c55 100644 --- a/lang/tarteaucitron.da.js +++ b/lang/tarteaucitron.da.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "er deaktiveret.", + "allowed": "tilladt", + "disallowed": "ikke tilladt", "ads": { "title": "Annonceringsnetværk", diff --git a/lang/tarteaucitron.de.js b/lang/tarteaucitron.de.js index dca36b2..253eb3c 100644 --- a/lang/tarteaucitron.de.js +++ b/lang/tarteaucitron.de.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "ist deaktiviert.", + "allowed": "erlaubt", + "disallowed": "nicht erlaubt", "ads": { "title": "Werbenetzwerke", diff --git a/lang/tarteaucitron.el.js b/lang/tarteaucitron.el.js index e451490..339e476 100644 --- a/lang/tarteaucitron.el.js +++ b/lang/tarteaucitron.el.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "είναι απενεργοποιημένο.", + "allowed": "επιτρέπεται", + "disallowed": "απαγορεύεται", "ads": { "title": "Διαφημιστικό Δίκτυο", diff --git a/lang/tarteaucitron.en.js b/lang/tarteaucitron.en.js index 91d37d8..bc4f7df 100644 --- a/lang/tarteaucitron.en.js +++ b/lang/tarteaucitron.en.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "is disabled.", + "allowed": "allowed", + "disallowed": "disallowed", "ads": { "title": "Advertising network", diff --git a/lang/tarteaucitron.es.js b/lang/tarteaucitron.es.js index eb8297b..3e64a79 100644 --- a/lang/tarteaucitron.es.js +++ b/lang/tarteaucitron.es.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "está deshabilitado.", + "allowed": "permitido", + "disallowed": "rechazado", "ads": { "title": "Red de publicidad", diff --git a/lang/tarteaucitron.fi.js b/lang/tarteaucitron.fi.js index 4eef7ca..9aa02e7 100644 --- a/lang/tarteaucitron.fi.js +++ b/lang/tarteaucitron.fi.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "hylätty.", + "allowed": "sallittu", + "disallowed": "kielletty", "ads": { "title": "Mainosverkosto", diff --git a/lang/tarteaucitron.fr.js b/lang/tarteaucitron.fr.js index 7d4d3fa..63d6bc2 100644 --- a/lang/tarteaucitron.fr.js +++ b/lang/tarteaucitron.fr.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "est désactivé.", + "allowed": "autorisé", + "disallowed": "interdit", "ads": { "title": "Régies publicitaires", diff --git a/lang/tarteaucitron.hu.js b/lang/tarteaucitron.hu.js index 63bfb23..e175ea9 100644 --- a/lang/tarteaucitron.hu.js +++ b/lang/tarteaucitron.hu.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "letiltott.", + "allowed": "megengedett", + "disallowed": "nem engedélyezett", "ads": { "title": "Reklámhálózat", diff --git a/lang/tarteaucitron.it.js b/lang/tarteaucitron.it.js index 9f740ad..0e3898c 100644 --- a/lang/tarteaucitron.it.js +++ b/lang/tarteaucitron.it.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "è disattivato", + "allowed": "permesso", + "disallowed": "non consentito", "ads": { "title": "Regie pubblicitarie", diff --git a/lang/tarteaucitron.ja.js b/lang/tarteaucitron.ja.js index 0586ae1..d7e9c99 100644 --- a/lang/tarteaucitron.ja.js +++ b/lang/tarteaucitron.ja.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "is disabled.", + "allowed": "許可", + "disallowed": "許可されていません", "ads": { "title": "Advertising network", diff --git a/lang/tarteaucitron.lv.js b/lang/tarteaucitron.lv.js index 63bfb23..586937a 100644 --- a/lang/tarteaucitron.lv.js +++ b/lang/tarteaucitron.lv.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "letiltott.", + "allowed": "atļauts", + "disallowed": "nav atļauts", "ads": { "title": "Reklámhálózat", diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js index 70687a2..33c4598 100644 --- a/lang/tarteaucitron.nl.js +++ b/lang/tarteaucitron.nl.js @@ -32,6 +32,8 @@ tarteaucitron.lang = { "credit": "Cookie manager mogelijk gemaakt door tarteaucitron.js", "fallback": "is uitgeschakeld.", + "allowed": "toegestaan", + "disallowed": "niet toegestaan", "toggleInfoBox": "Toon/verberg informatie over cookie opslag", "title": "Cookies beheer paneel", diff --git a/lang/tarteaucitron.no.js b/lang/tarteaucitron.no.js index 6e498b6..04820aa 100644 --- a/lang/tarteaucitron.no.js +++ b/lang/tarteaucitron.no.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback" : "er skrudd av.", + "allowed": "tillatt", + "disallowed": "ikke tillatt", "ads" : { "title" : "Annonsenettverk", diff --git a/lang/tarteaucitron.oc.js b/lang/tarteaucitron.oc.js index 6a2d3ff..fe582d7 100644 --- a/lang/tarteaucitron.oc.js +++ b/lang/tarteaucitron.oc.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "es desactivat.", + "allowed": "allowed", + "disallowed": "disallowed", "ads": { "title": "Regias publicitàrias", diff --git a/lang/tarteaucitron.pl.js b/lang/tarteaucitron.pl.js index 1466a07..5bdb50f 100644 --- a/lang/tarteaucitron.pl.js +++ b/lang/tarteaucitron.pl.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "jest nieaktywna.", + "allowed": "dozwolony", + "disallowed": "niedozwolone", "ads": { "title": "Sieć reklamowa", diff --git a/lang/tarteaucitron.pt.js b/lang/tarteaucitron.pt.js index aba2f8f..ce41725 100644 --- a/lang/tarteaucitron.pt.js +++ b/lang/tarteaucitron.pt.js @@ -41,6 +41,9 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "está desativado.", + "allowed": "permitido", + "disallowed": "não permitido", + "ads": { "title": "Rede de anúncios", "details": "As redes de anúncios podem gerar receitas com a venda de espaço publicitário no site." diff --git a/lang/tarteaucitron.ro.js b/lang/tarteaucitron.ro.js index 1bbfb2c..1c9d391 100644 --- a/lang/tarteaucitron.ro.js +++ b/lang/tarteaucitron.ro.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "este dezactivat.", + "allowed": "permis", + "disallowed": "nepermis", "ads": { "title": "Rețea de publicitate", diff --git a/lang/tarteaucitron.ru.js b/lang/tarteaucitron.ru.js index 1c83ff7..f471812 100644 --- a/lang/tarteaucitron.ru.js +++ b/lang/tarteaucitron.ru.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "fallback": "Деактивирован.", + "allowed": "разрешается", + "disallowed": "запрещено", "ads": { "title": "Рекламная сеть", diff --git a/lang/tarteaucitron.se.js b/lang/tarteaucitron.se.js index 06543b5..d29a600 100644 --- a/lang/tarteaucitron.se.js +++ b/lang/tarteaucitron.se.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "är ur funktion.", + "allowed": "tillåten", + "disallowed": "tillåtet", "ads": { "title": "Annonsnätverk", diff --git a/lang/tarteaucitron.sk.js b/lang/tarteaucitron.sk.js index 1356b68..4fc5483 100644 --- a/lang/tarteaucitron.sk.js +++ b/lang/tarteaucitron.sk.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "je zakázané.", + "allowed": "povolený", + "disallowed": "nepovolený", "ads": { "title": "Reklamná sieť", diff --git a/lang/tarteaucitron.sv.js b/lang/tarteaucitron.sv.js index 06543b5..2aabfa2 100644 --- a/lang/tarteaucitron.sv.js +++ b/lang/tarteaucitron.sv.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "är ur funktion.", + "allowed": "dovoljeno", + "disallowed": "nedovoljeno", "ads": { "title": "Annonsnätverk", diff --git a/lang/tarteaucitron.tr.js b/lang/tarteaucitron.tr.js index 2f592f0..98814cb 100644 --- a/lang/tarteaucitron.tr.js +++ b/lang/tarteaucitron.tr.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "devre dışı.", + "allowed": "izin verildi", + "disallowed": "izin verilmeyen", "ads": { "title": "Reklam yönetimi", diff --git a/lang/tarteaucitron.vi.js b/lang/tarteaucitron.vi.js index 990845d..4ce5a9f 100644 --- a/lang/tarteaucitron.vi.js +++ b/lang/tarteaucitron.vi.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "tắt.", + "allowed": "được phép", + "disallowed": "không được phép", "ads": { "title": "Mạng quảng cáo", diff --git a/lang/tarteaucitron.zh.js b/lang/tarteaucitron.zh.js index 2c9a460..10aed27 100644 --- a/lang/tarteaucitron.zh.js +++ b/lang/tarteaucitron.zh.js @@ -40,6 +40,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "已禁用。", + "allowed": "允许的", + "disallowed": "不允许的", "ads": { "title": "广告组", diff --git a/tarteaucitron.js b/tarteaucitron.js index d70fad6..3569b58 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -17,7 +17,7 @@ var scripts = document.getElementsByTagName('script'), var tarteaucitron = { - "version": 20210310, + "version": 20210422, "cdn": cdn, "user": {}, "lang": {}, @@ -391,7 +391,7 @@ var tarteaucitron = { } if (tarteaucitron.parameters.highPrivacy && !tarteaucitron.parameters.AcceptAllCta) { - html += '
'; + html += '
'; //html += '
'; html += ' '; html += ' ' + tarteaucitron.lang.alertBigPrivacy; @@ -411,7 +411,7 @@ var tarteaucitron = { //html += '
'; html += '
'; } else { - html += '
'; + html += '
'; //html += '
'; html += ' '; @@ -595,11 +595,11 @@ var tarteaucitron = { }, 1500); } if(tarteaucitron.parameters.closePopup === true){ - var closeElement = document.getElementById('tarteaucitronAlertBig'), - closeSpan = document.createElement('span'); - closeSpan.textContent = 'X'; - closeSpan.setAttribute('id', "tarteaucitronCloseCross"); - closeElement.insertBefore(closeSpan, closeElement.firstElementChild); + let element = document.getElementById('tarteaucitronAlertBig'); + let span = document.createElement('span') + span.textContent = 'X'; + span.setAttribute('id', "tarteaucitronCloseCross") + element.insertBefore(span, element.firstElementChild) } @@ -745,14 +745,15 @@ var tarteaucitron = { isDenied = (cookie.indexOf(service.key + '=false') >= 0), isAllowed = ((cookie.indexOf(service.key + '=true') >= 0) || (!service.needConsent && cookie.indexOf(service.key + '=false') < 0)), isResponded = (cookie.indexOf(service.key + '=false') >= 0 || cookie.indexOf(service.key + '=true') >= 0), - isDNTRequested = (navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1" || window.doNotTrack === "1"); + isDNTRequested = (navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1" || window.doNotTrack === "1"), + currentStatus = (isAllowed) ? tarteaucitron.lang.allowed : tarteaucitron.lang.disallowed; if (tarteaucitron.added[service.key] !== true) { tarteaucitron.added[service.key] = true; html += '
  • '; html += '
    '; - html += ' ' + service.name + ''; + html += ' ' + service.name + ' ('+currentStatus+')'; html += '
    '; if (tarteaucitron.parameters.moreInfoLink == true) { @@ -955,6 +956,12 @@ var tarteaucitron = { if (typeof tarteaucitronMagic === 'undefined' || tarteaucitronMagic.indexOf("_" + key + "_") < 0) { tarteaucitron.services[key].js(); } tarteaucitron.sendEvent(key + '_loaded'); } + var itemStatusElem = document.getElementById('tacCurrentStatus'+key); + if(status == true){ + itemStatusElem.innerHTML = tarteaucitron.lang.allowed; + }else{ + itemStatusElem.innerHTML = tarteaucitron.lang.disallowed; + } tarteaucitron.state[key] = status; tarteaucitron.cookie.create(key, status); tarteaucitron.userInterface.color(key, status); @@ -990,6 +997,12 @@ var tarteaucitron = { if (typeof tarteaucitronMagic === 'undefined' || tarteaucitronMagic.indexOf("_" + key + "_") < 0) { tarteaucitron.services[key].js(); } } } + var itemStatusElem = document.getElementById('tacCurrentStatus'+key); + if(status == true){ + itemStatusElem.innerHTML = tarteaucitron.lang.allowed; + }else{ + itemStatusElem.innerHTML = tarteaucitron.lang.disallowed; + } tarteaucitron.state[key] = status; tarteaucitron.cookie.create(key, status); tarteaucitron.userInterface.color(key, status); @@ -1234,8 +1247,8 @@ var tarteaucitron = { } //end ie compatibility - if (document.getElementById('tarteaucitronAlertBig') !== null) { - document.getElementById('tarteaucitronAlertBig').focus(); + if (document.getElementById('tarteaucitronPersonalize2') !== null) { + document.getElementById('tarteaucitronPersonalize2').focus(); } window.dispatchEvent(tacOpenAlertEvent); From b268e6253242a250d0ff794ee7287fdbbeb8e069 Mon Sep 17 00:00:00 2001 From: Luc MULLER Date: Thu, 22 Apr 2021 11:03:27 +0200 Subject: [PATCH 2/4] =?UTF-8?q?R=C3=A9cup=C3=A9ration=20des=20commits=203a?= =?UTF-8?q?073633e883705ef3f5dc49b5cc96214c4afe02=20et=20=2009db2562a5fb1d?= =?UTF-8?q?06379f5618d0636abdcd0c0ca8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lang/tarteaucitron.bg.js | 2 ++ lang/tarteaucitron.ca.js | 2 ++ lang/tarteaucitron.cn.js | 2 ++ lang/tarteaucitron.cs.js | 2 ++ lang/tarteaucitron.da.js | 2 ++ lang/tarteaucitron.de.js | 2 ++ lang/tarteaucitron.el.js | 2 ++ lang/tarteaucitron.en.js | 2 ++ lang/tarteaucitron.es.js | 2 ++ lang/tarteaucitron.fi.js | 2 ++ lang/tarteaucitron.fr.js | 2 ++ lang/tarteaucitron.hu.js | 2 ++ lang/tarteaucitron.it.js | 2 ++ lang/tarteaucitron.ja.js | 2 ++ lang/tarteaucitron.lv.js | 2 ++ lang/tarteaucitron.nl.js | 2 ++ lang/tarteaucitron.no.js | 2 ++ lang/tarteaucitron.oc.js | 2 ++ lang/tarteaucitron.pl.js | 2 ++ lang/tarteaucitron.pt.js | 3 +++ lang/tarteaucitron.ro.js | 2 ++ lang/tarteaucitron.ru.js | 2 ++ lang/tarteaucitron.se.js | 2 ++ lang/tarteaucitron.sk.js | 2 ++ lang/tarteaucitron.sv.js | 2 ++ lang/tarteaucitron.tr.js | 2 ++ lang/tarteaucitron.vi.js | 2 ++ lang/tarteaucitron.zh.js | 2 ++ tarteaucitron.js | 19 ++++++++++++++++--- 29 files changed, 73 insertions(+), 3 deletions(-) diff --git a/lang/tarteaucitron.bg.js b/lang/tarteaucitron.bg.js index 5d93a82..4a4b13f 100644 --- a/lang/tarteaucitron.bg.js +++ b/lang/tarteaucitron.bg.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "е изключен.", + "allowed": "Позволен", + "disallowed": "Забранено", "ads": { "title": "Рекламодатели", diff --git a/lang/tarteaucitron.ca.js b/lang/tarteaucitron.ca.js index ce17c38..6a9834b 100644 --- a/lang/tarteaucitron.ca.js +++ b/lang/tarteaucitron.ca.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "està deshabilitat.", + "allowed": "Permès", + "disallowed": "Desautoritzat", "ads": { "title": "Xarxa de publicitat", diff --git a/lang/tarteaucitron.cn.js b/lang/tarteaucitron.cn.js index 2c9a460..10aed27 100644 --- a/lang/tarteaucitron.cn.js +++ b/lang/tarteaucitron.cn.js @@ -40,6 +40,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "已禁用。", + "allowed": "允许的", + "disallowed": "不允许的", "ads": { "title": "广告组", diff --git a/lang/tarteaucitron.cs.js b/lang/tarteaucitron.cs.js index d40a57a..c2cc7fc 100644 --- a/lang/tarteaucitron.cs.js +++ b/lang/tarteaucitron.cs.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "je vypnutý.", + "allowed": "povoleno", + "disallowed": "nepovoleno", "ads": { "title": "Reklamní síť", diff --git a/lang/tarteaucitron.da.js b/lang/tarteaucitron.da.js index 35705f9..e073c55 100644 --- a/lang/tarteaucitron.da.js +++ b/lang/tarteaucitron.da.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "er deaktiveret.", + "allowed": "tilladt", + "disallowed": "ikke tilladt", "ads": { "title": "Annonceringsnetværk", diff --git a/lang/tarteaucitron.de.js b/lang/tarteaucitron.de.js index dca36b2..253eb3c 100644 --- a/lang/tarteaucitron.de.js +++ b/lang/tarteaucitron.de.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "ist deaktiviert.", + "allowed": "erlaubt", + "disallowed": "nicht erlaubt", "ads": { "title": "Werbenetzwerke", diff --git a/lang/tarteaucitron.el.js b/lang/tarteaucitron.el.js index e451490..339e476 100644 --- a/lang/tarteaucitron.el.js +++ b/lang/tarteaucitron.el.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "είναι απενεργοποιημένο.", + "allowed": "επιτρέπεται", + "disallowed": "απαγορεύεται", "ads": { "title": "Διαφημιστικό Δίκτυο", diff --git a/lang/tarteaucitron.en.js b/lang/tarteaucitron.en.js index 91d37d8..bc4f7df 100644 --- a/lang/tarteaucitron.en.js +++ b/lang/tarteaucitron.en.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "is disabled.", + "allowed": "allowed", + "disallowed": "disallowed", "ads": { "title": "Advertising network", diff --git a/lang/tarteaucitron.es.js b/lang/tarteaucitron.es.js index eb8297b..3e64a79 100644 --- a/lang/tarteaucitron.es.js +++ b/lang/tarteaucitron.es.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "está deshabilitado.", + "allowed": "permitido", + "disallowed": "rechazado", "ads": { "title": "Red de publicidad", diff --git a/lang/tarteaucitron.fi.js b/lang/tarteaucitron.fi.js index 4eef7ca..9aa02e7 100644 --- a/lang/tarteaucitron.fi.js +++ b/lang/tarteaucitron.fi.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "hylätty.", + "allowed": "sallittu", + "disallowed": "kielletty", "ads": { "title": "Mainosverkosto", diff --git a/lang/tarteaucitron.fr.js b/lang/tarteaucitron.fr.js index 7d4d3fa..63d6bc2 100644 --- a/lang/tarteaucitron.fr.js +++ b/lang/tarteaucitron.fr.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "est désactivé.", + "allowed": "autorisé", + "disallowed": "interdit", "ads": { "title": "Régies publicitaires", diff --git a/lang/tarteaucitron.hu.js b/lang/tarteaucitron.hu.js index 63bfb23..e175ea9 100644 --- a/lang/tarteaucitron.hu.js +++ b/lang/tarteaucitron.hu.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "letiltott.", + "allowed": "megengedett", + "disallowed": "nem engedélyezett", "ads": { "title": "Reklámhálózat", diff --git a/lang/tarteaucitron.it.js b/lang/tarteaucitron.it.js index 9f740ad..0e3898c 100644 --- a/lang/tarteaucitron.it.js +++ b/lang/tarteaucitron.it.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "è disattivato", + "allowed": "permesso", + "disallowed": "non consentito", "ads": { "title": "Regie pubblicitarie", diff --git a/lang/tarteaucitron.ja.js b/lang/tarteaucitron.ja.js index 0586ae1..d7e9c99 100644 --- a/lang/tarteaucitron.ja.js +++ b/lang/tarteaucitron.ja.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "is disabled.", + "allowed": "許可", + "disallowed": "許可されていません", "ads": { "title": "Advertising network", diff --git a/lang/tarteaucitron.lv.js b/lang/tarteaucitron.lv.js index 63bfb23..586937a 100644 --- a/lang/tarteaucitron.lv.js +++ b/lang/tarteaucitron.lv.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "letiltott.", + "allowed": "atļauts", + "disallowed": "nav atļauts", "ads": { "title": "Reklámhálózat", diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js index 70687a2..33c4598 100644 --- a/lang/tarteaucitron.nl.js +++ b/lang/tarteaucitron.nl.js @@ -32,6 +32,8 @@ tarteaucitron.lang = { "credit": "Cookie manager mogelijk gemaakt door tarteaucitron.js", "fallback": "is uitgeschakeld.", + "allowed": "toegestaan", + "disallowed": "niet toegestaan", "toggleInfoBox": "Toon/verberg informatie over cookie opslag", "title": "Cookies beheer paneel", diff --git a/lang/tarteaucitron.no.js b/lang/tarteaucitron.no.js index 6e498b6..04820aa 100644 --- a/lang/tarteaucitron.no.js +++ b/lang/tarteaucitron.no.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback" : "er skrudd av.", + "allowed": "tillatt", + "disallowed": "ikke tillatt", "ads" : { "title" : "Annonsenettverk", diff --git a/lang/tarteaucitron.oc.js b/lang/tarteaucitron.oc.js index 6a2d3ff..fe582d7 100644 --- a/lang/tarteaucitron.oc.js +++ b/lang/tarteaucitron.oc.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "es desactivat.", + "allowed": "allowed", + "disallowed": "disallowed", "ads": { "title": "Regias publicitàrias", diff --git a/lang/tarteaucitron.pl.js b/lang/tarteaucitron.pl.js index 1466a07..5bdb50f 100644 --- a/lang/tarteaucitron.pl.js +++ b/lang/tarteaucitron.pl.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "jest nieaktywna.", + "allowed": "dozwolony", + "disallowed": "niedozwolone", "ads": { "title": "Sieć reklamowa", diff --git a/lang/tarteaucitron.pt.js b/lang/tarteaucitron.pt.js index aba2f8f..ce41725 100644 --- a/lang/tarteaucitron.pt.js +++ b/lang/tarteaucitron.pt.js @@ -41,6 +41,9 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "está desativado.", + "allowed": "permitido", + "disallowed": "não permitido", + "ads": { "title": "Rede de anúncios", "details": "As redes de anúncios podem gerar receitas com a venda de espaço publicitário no site." diff --git a/lang/tarteaucitron.ro.js b/lang/tarteaucitron.ro.js index 1bbfb2c..1c9d391 100644 --- a/lang/tarteaucitron.ro.js +++ b/lang/tarteaucitron.ro.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "este dezactivat.", + "allowed": "permis", + "disallowed": "nepermis", "ads": { "title": "Rețea de publicitate", diff --git a/lang/tarteaucitron.ru.js b/lang/tarteaucitron.ru.js index 1c83ff7..f471812 100644 --- a/lang/tarteaucitron.ru.js +++ b/lang/tarteaucitron.ru.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "fallback": "Деактивирован.", + "allowed": "разрешается", + "disallowed": "запрещено", "ads": { "title": "Рекламная сеть", diff --git a/lang/tarteaucitron.se.js b/lang/tarteaucitron.se.js index 06543b5..d29a600 100644 --- a/lang/tarteaucitron.se.js +++ b/lang/tarteaucitron.se.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "är ur funktion.", + "allowed": "tillåten", + "disallowed": "tillåtet", "ads": { "title": "Annonsnätverk", diff --git a/lang/tarteaucitron.sk.js b/lang/tarteaucitron.sk.js index 1356b68..4fc5483 100644 --- a/lang/tarteaucitron.sk.js +++ b/lang/tarteaucitron.sk.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "je zakázané.", + "allowed": "povolený", + "disallowed": "nepovolený", "ads": { "title": "Reklamná sieť", diff --git a/lang/tarteaucitron.sv.js b/lang/tarteaucitron.sv.js index 06543b5..2aabfa2 100644 --- a/lang/tarteaucitron.sv.js +++ b/lang/tarteaucitron.sv.js @@ -42,6 +42,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "är ur funktion.", + "allowed": "dovoljeno", + "disallowed": "nedovoljeno", "ads": { "title": "Annonsnätverk", diff --git a/lang/tarteaucitron.tr.js b/lang/tarteaucitron.tr.js index 2f592f0..98814cb 100644 --- a/lang/tarteaucitron.tr.js +++ b/lang/tarteaucitron.tr.js @@ -44,6 +44,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "devre dışı.", + "allowed": "izin verildi", + "disallowed": "izin verilmeyen", "ads": { "title": "Reklam yönetimi", diff --git a/lang/tarteaucitron.vi.js b/lang/tarteaucitron.vi.js index 990845d..4ce5a9f 100644 --- a/lang/tarteaucitron.vi.js +++ b/lang/tarteaucitron.vi.js @@ -43,6 +43,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "tắt.", + "allowed": "được phép", + "disallowed": "không được phép", "ads": { "title": "Mạng quảng cáo", diff --git a/lang/tarteaucitron.zh.js b/lang/tarteaucitron.zh.js index 2c9a460..10aed27 100644 --- a/lang/tarteaucitron.zh.js +++ b/lang/tarteaucitron.zh.js @@ -40,6 +40,8 @@ tarteaucitron.lang = { "icon": "Cookies", "fallback": "已禁用。", + "allowed": "允许的", + "disallowed": "不允许的", "ads": { "title": "广告组", diff --git a/tarteaucitron.js b/tarteaucitron.js index d70fad6..e8081f4 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -17,7 +17,7 @@ var scripts = document.getElementsByTagName('script'), var tarteaucitron = { - "version": 20210310, + "version": 20210422, "cdn": cdn, "user": {}, "lang": {}, @@ -745,14 +745,15 @@ var tarteaucitron = { isDenied = (cookie.indexOf(service.key + '=false') >= 0), isAllowed = ((cookie.indexOf(service.key + '=true') >= 0) || (!service.needConsent && cookie.indexOf(service.key + '=false') < 0)), isResponded = (cookie.indexOf(service.key + '=false') >= 0 || cookie.indexOf(service.key + '=true') >= 0), - isDNTRequested = (navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1" || window.doNotTrack === "1"); + isDNTRequested = (navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1" || window.doNotTrack === "1"), + currentStatus = (isAllowed) ? tarteaucitron.lang.allowed : tarteaucitron.lang.disallowed; if (tarteaucitron.added[service.key] !== true) { tarteaucitron.added[service.key] = true; html += '
  • '; html += '
    '; - html += ' ' + service.name + ''; + html += ' ' + service.name + ' ('+currentStatus+')'; html += '
    '; if (tarteaucitron.parameters.moreInfoLink == true) { @@ -955,6 +956,12 @@ var tarteaucitron = { if (typeof tarteaucitronMagic === 'undefined' || tarteaucitronMagic.indexOf("_" + key + "_") < 0) { tarteaucitron.services[key].js(); } tarteaucitron.sendEvent(key + '_loaded'); } + var itemStatusElem = document.getElementById('tacCurrentStatus'+key); + if(status == true){ + itemStatusElem.innerHTML = tarteaucitron.lang.allowed; + }else{ + itemStatusElem.innerHTML = tarteaucitron.lang.disallowed; + } tarteaucitron.state[key] = status; tarteaucitron.cookie.create(key, status); tarteaucitron.userInterface.color(key, status); @@ -990,6 +997,12 @@ var tarteaucitron = { if (typeof tarteaucitronMagic === 'undefined' || tarteaucitronMagic.indexOf("_" + key + "_") < 0) { tarteaucitron.services[key].js(); } } } + var itemStatusElem = document.getElementById('tacCurrentStatus'+key); + if(status == true){ + itemStatusElem.innerHTML = tarteaucitron.lang.allowed; + }else{ + itemStatusElem.innerHTML = tarteaucitron.lang.disallowed; + } tarteaucitron.state[key] = status; tarteaucitron.cookie.create(key, status); tarteaucitron.userInterface.color(key, status); From 481c375ca5f18be0c1e56d19e19cba4bfa6266ed Mon Sep 17 00:00:00 2001 From: Luc MULLER Date: Thu, 22 Apr 2021 11:10:09 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Mise=20=C3=A0=20niveau=20de=20tarteaucitron?= =?UTF-8?q?.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tarteaucitron.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tarteaucitron.js b/tarteaucitron.js index 3569b58..18f7ea4 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -391,7 +391,7 @@ var tarteaucitron = { } if (tarteaucitron.parameters.highPrivacy && !tarteaucitron.parameters.AcceptAllCta) { - html += '
    '; + html += '
    '; //html += '
    '; html += ' '; html += ' ' + tarteaucitron.lang.alertBigPrivacy; @@ -411,7 +411,7 @@ var tarteaucitron = { //html += '
    '; html += '
    '; } else { - html += '
    '; + html += '
    '; //html += '
    '; html += ' '; @@ -595,11 +595,11 @@ var tarteaucitron = { }, 1500); } if(tarteaucitron.parameters.closePopup === true){ - let element = document.getElementById('tarteaucitronAlertBig'); - let span = document.createElement('span') - span.textContent = 'X'; - span.setAttribute('id', "tarteaucitronCloseCross") - element.insertBefore(span, element.firstElementChild) + var closeElement = document.getElementById('tarteaucitronAlertBig'), + closeSpan = document.createElement('span'); + closeSpan.textContent = 'X'; + closeSpan.setAttribute('id', "tarteaucitronCloseCross"); + closeElement.insertBefore(closeSpan, closeElement.firstElementChild); } @@ -1247,8 +1247,8 @@ var tarteaucitron = { } //end ie compatibility - if (document.getElementById('tarteaucitronPersonalize2') !== null) { - document.getElementById('tarteaucitronPersonalize2').focus(); + if (document.getElementById('tarteaucitronAlertBig') !== null) { + document.getElementById('tarteaucitronAlertBig').focus(); } window.dispatchEvent(tacOpenAlertEvent); From ada89e28b5a950e648cfadff5df68b9423fd04e6 Mon Sep 17 00:00:00 2001 From: Luc MULLER Date: Thu, 22 Apr 2021 11:12:00 +0200 Subject: [PATCH 4/4] tarteaucitron.js Ajout d'un tab manquant --- tarteaucitron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.js b/tarteaucitron.js index 18f7ea4..e8081f4 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -596,7 +596,7 @@ var tarteaucitron = { } if(tarteaucitron.parameters.closePopup === true){ var closeElement = document.getElementById('tarteaucitronAlertBig'), - closeSpan = document.createElement('span'); + closeSpan = document.createElement('span'); closeSpan.textContent = 'X'; closeSpan.setAttribute('id', "tarteaucitronCloseCross"); closeElement.insertBefore(closeSpan, closeElement.firstElementChild);