From ae483254dcfbfb84c1573261a4cf15a786bb5a04 Mon Sep 17 00:00:00 2001
From: Nicolas Zerr <nicolaszerr@stratis.fr>
Date: Fri, 20 Aug 2021 18:28:17 +0200
Subject: [PATCH] Accessibility improvements

---
 lang/tarteaucitron.bg.js |  1 +
 lang/tarteaucitron.ca.js |  1 +
 lang/tarteaucitron.cn.js |  1 +
 lang/tarteaucitron.cs.js | 15 ++++++-----
 lang/tarteaucitron.da.js |  3 ++-
 lang/tarteaucitron.de.js |  1 +
 lang/tarteaucitron.el.js |  1 +
 lang/tarteaucitron.en.js |  1 +
 lang/tarteaucitron.es.js |  1 +
 lang/tarteaucitron.fi.js |  1 +
 lang/tarteaucitron.fr.js |  1 +
 lang/tarteaucitron.hu.js |  1 +
 lang/tarteaucitron.it.js |  7 ++---
 lang/tarteaucitron.ja.js |  3 ++-
 lang/tarteaucitron.lt.js |  1 +
 lang/tarteaucitron.lv.js |  1 +
 lang/tarteaucitron.nl.js |  1 +
 lang/tarteaucitron.oc.js |  1 +
 lang/tarteaucitron.pl.js |  1 +
 lang/tarteaucitron.pt.js |  3 ++-
 lang/tarteaucitron.ro.js |  1 +
 lang/tarteaucitron.ru.js |  7 ++---
 lang/tarteaucitron.se.js |  1 +
 lang/tarteaucitron.sk.js |  1 +
 lang/tarteaucitron.sv.js |  1 +
 lang/tarteaucitron.tr.js |  1 +
 lang/tarteaucitron.vi.js |  1 +
 lang/tarteaucitron.zh.js |  1 +
 tarteaucitron.js         | 55 ++++++++++++++++++++++++++++++++--------
 29 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/lang/tarteaucitron.bg.js b/lang/tarteaucitron.bg.js
index 4a4b13f..06ac1b2 100644
--- a/lang/tarteaucitron.bg.js
+++ b/lang/tarteaucitron.bg.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Управление на бисквитките",
     "cookieDetail": "Информация за",
     "ourSite": "в нашият сайт",
+    "modalWindow": "(модален прозорец)",
     "newWindow": "(нов прозорец)",
     "allowAll": "Разреши всички",
     "denyAll": "Забрани всички",
diff --git a/lang/tarteaucitron.ca.js b/lang/tarteaucitron.ca.js
index 6a9834b..b97f970 100644
--- a/lang/tarteaucitron.ca.js
+++ b/lang/tarteaucitron.ca.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Panell de gestió de galetes",
     "cookieDetail": "Detalls de les galetes per a",
     "ourSite": "en la nostra web",
+    "modalWindow": "(finestra modale)",
     "newWindow": "(finestra nova)",
     "allowAll": "Permet totes les galetes",
     "denyAll": "Denega totes les galetes",
diff --git a/lang/tarteaucitron.cn.js b/lang/tarteaucitron.cn.js
index 10aed27..3af4a4f 100644
--- a/lang/tarteaucitron.cn.js
+++ b/lang/tarteaucitron.cn.js
@@ -33,6 +33,7 @@ tarteaucitron.lang = {
     "title": "Cookie管理面板",
     "cookieDetail": "Cookie详情",
     "ourSite": "显示在我们的网站上",
+    "modalWindow": "（模态窗口）",
     "newWindow": "（新建窗口）",
     "allowAll": "允许",
     "denyAll": "禁用",
diff --git a/lang/tarteaucitron.cs.js b/lang/tarteaucitron.cs.js
index c2cc7fc..75b917b 100644
--- a/lang/tarteaucitron.cs.js
+++ b/lang/tarteaucitron.cs.js
@@ -31,13 +31,14 @@ tarteaucitron.lang = {
     "source": "Zobrazit oficiální stránku",
     "credit": "Správce cookies od tarteaucitron.js",
 
-    "toggleInfoBox": "Show/hide informations about cookie storage",
-    "title": "Cookies management panel",
-    "cookieDetail": "Cookie detail for",
-    "ourSite": "on our site",
-    "newWindow": "(new window)",
-    "allowAll": "Allow all cookies",
-    "denyAll": "Deny all cookies",
+    "toggleInfoBox": "Zobrazit/skrýt informace o ukládání souborů cookie",
+    "title": "Panel pro správu cookies",
+    "cookieDetail": "Podrobnosti o souboru cookie pro",
+    "ourSite": "na našem webu",
+    "modalWindow": "(modální okno)",
+    "newWindow": "(nové okno)",
+    "allowAll": "Povolit všechny soubory cookie",
+    "denyAll": "Odmítnout všechny cookies",
 
     "icon": "Cookies",
     
diff --git a/lang/tarteaucitron.da.js b/lang/tarteaucitron.da.js
index e073c55..1300234 100644
--- a/lang/tarteaucitron.da.js
+++ b/lang/tarteaucitron.da.js
@@ -35,7 +35,8 @@ tarteaucitron.lang = {
     "toggleInfoBox": "Vis / skjul informationer om opbevaring af cookies",
     "title": "CCookie-styringspanel",
     "cookieDetail": "Cookie detaljer for",
-    "ourSite": "på vores side",
+    "ourSite": "på vores site",
+    "modalWindow": "(modal vindue)",
     "newWindow": "(nyt vindue)",
     "allowAll": "Tillad alle cookies",
     "denyAll": "Afvis alle cookies",
diff --git a/lang/tarteaucitron.de.js b/lang/tarteaucitron.de.js
index 253eb3c..e9b49c4 100644
--- a/lang/tarteaucitron.de.js
+++ b/lang/tarteaucitron.de.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Cookie-Einstellungen",
     "cookieDetail": "Cookie Details für",
     "ourSite": "auf unserer Seite",
+    "modalWindow": "(modales Fenster)",
     "newWindow": "(neues Fenster)",
     "allowAll": "Erlaube alle Cookies",
     "denyAll": "Verbiete alle Cookies",
diff --git a/lang/tarteaucitron.el.js b/lang/tarteaucitron.el.js
index 339e476..c423cd3 100644
--- a/lang/tarteaucitron.el.js
+++ b/lang/tarteaucitron.el.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Πίνακας διαχείρισης &quot;Μπισκότων&quot; (Cookies)",
     "cookieDetail": "Λεπτομέρειες &quot;μπισκότων&quot; (cookies) για",
     "ourSite": "στον ιστότοπο μας",
+    "modalWindow": "(modal παράθυρο)",
     "newWindow": "(νέο παράθυρο)",
     "allowAll": "Επέτρεψε όλα τα &quot;μπισκότα&quot; (cookies)",
     "denyAll": "Απόρριψε όλα τα &quot;μπισκότα&quot; (cookies)",
diff --git a/lang/tarteaucitron.en.js b/lang/tarteaucitron.en.js
index bc4f7df..5411280 100644
--- a/lang/tarteaucitron.en.js
+++ b/lang/tarteaucitron.en.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Cookies management panel",
     "cookieDetail": "Cookie detail for",
     "ourSite": "on our site",
+    "modalWindow": "(modal window)",
     "newWindow": "(new window)",
     "allowAll": "Allow all cookies",
     "denyAll": "Deny all cookies",
diff --git a/lang/tarteaucitron.es.js b/lang/tarteaucitron.es.js
index 3e64a79..5739313 100644
--- a/lang/tarteaucitron.es.js
+++ b/lang/tarteaucitron.es.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Panel de gestión de cookies",
     "cookieDetail": "Detalles de las cookies para",
     "ourSite": "en nuestra web",
+    "modalWindow": "(ventana modal)",
     "newWindow": "(ventana nueva)",
     "allowAll": "Permitir todas las cookies",
     "denyAll": "Denegar todas las cookies",
diff --git a/lang/tarteaucitron.fi.js b/lang/tarteaucitron.fi.js
index 9aa02e7..3e38a46 100644
--- a/lang/tarteaucitron.fi.js
+++ b/lang/tarteaucitron.fi.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Evästeiden hallintapaneeli",
     "cookieDetail": "Evästetiedot",
     "ourSite": "sivustollamme",
+    "modalWindow": "(modaalinen ikkuna)",
     "newWindow": "uusi ikkuna",
     "allowAll": "Hyväksy kaikki evästeet",
     "denyAll": "Kiellä kaikki evästeet",
diff --git a/lang/tarteaucitron.fr.js b/lang/tarteaucitron.fr.js
index 63d6bc2..780d639 100644
--- a/lang/tarteaucitron.fr.js
+++ b/lang/tarteaucitron.fr.js
@@ -37,6 +37,7 @@ tarteaucitron.lang = {
     "title": "Panneau de gestion des cookies",
     "cookieDetail": "Détail des cookies",
     "ourSite": "sur notre site",
+    "modalWindow": "(fenêtre modale)",
     "newWindow": "(nouvelle fenêtre)",
     "allowAll": "Tout accepter",
     "denyAll": "Tout refuser",
diff --git a/lang/tarteaucitron.hu.js b/lang/tarteaucitron.hu.js
index e175ea9..1428d19 100644
--- a/lang/tarteaucitron.hu.js
+++ b/lang/tarteaucitron.hu.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Süti preferenciák",
     "cookieDetail": "Süti adatok a következőhöz:",
     "ourSite": "weboldalunkon",
+    "modalWindow": "(modális ablak)",
     "newWindow": "(új ablak)",
     "allowAll": "Elfogadom az öszeset",
     "denyAll": "Elutasítom",
diff --git a/lang/tarteaucitron.it.js b/lang/tarteaucitron.it.js
index 0e3898c..5b33775 100644
--- a/lang/tarteaucitron.it.js
+++ b/lang/tarteaucitron.it.js
@@ -35,9 +35,10 @@ tarteaucitron.lang = {
     "title": "Cookies management panel",
     "cookieDetail": "Cookie detail for",
     "ourSite": "on our site",
-    "newWindow": "(new window)",
-    "allowAll": "Allow all cookies",
-    "denyAll": "Deny all cookies",
+    "modalWindow": "(finestra modale)",
+    "newWindow": "(nuova finestra)",
+    "allowAll": "Consenti tutti i cookie",
+    "denyAll": "Rifiuta tutti i cookie",
 
     "icon": "Cookies",
     
diff --git a/lang/tarteaucitron.ja.js b/lang/tarteaucitron.ja.js
index d7e9c99..8a47fc2 100644
--- a/lang/tarteaucitron.ja.js
+++ b/lang/tarteaucitron.ja.js
@@ -36,7 +36,8 @@ tarteaucitron.lang = {
     "title": "クッキー利用の管理について",
     "cookieDetail": "Cookie detail for",
     "ourSite": "on our site",
-    "newWindow": "(new window)",
+    "modalWindow": "(モーダルウィンドウ)",
+    "newWindow": "(新しい窓)",
     "allowAll": "すべてのクッキーを許可する",
     "denyAll": "すべてのクッキーを拒否する",
 
diff --git a/lang/tarteaucitron.lt.js b/lang/tarteaucitron.lt.js
index 52044c9..e5730d7 100644
--- a/lang/tarteaucitron.lt.js
+++ b/lang/tarteaucitron.lt.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Slapukų valdymo skydelis",
     "cookieDetail": "Išsami slapuko informacija",
     "ourSite": "mūsų svetainėje",
+    "modalWindow": "(modalinis langas)",
     "newWindow": "(naujas langas)",
     "allowAll": "Leisti visus slapukus",
     "denyAll": "Atsisakyti visų slapukų",
diff --git a/lang/tarteaucitron.lv.js b/lang/tarteaucitron.lv.js
index 586937a..af6b895 100644
--- a/lang/tarteaucitron.lv.js
+++ b/lang/tarteaucitron.lv.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Süti preferenciák",
     "cookieDetail": "Süti adatok a következőhöz:",
     "ourSite": "weboldalunkon",
+    "modalWindow": "(modal window)",
     "newWindow": "(új ablak)",
     "allowAll": "Elfogadom az öszeset",
     "denyAll": "Elutasítom",
diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js
index 33c4598..e008499 100644
--- a/lang/tarteaucitron.nl.js
+++ b/lang/tarteaucitron.nl.js
@@ -39,6 +39,7 @@ tarteaucitron.lang = {
     "title": "Cookies beheer paneel",
     "cookieDetail": "Cookie detail voor",
     "ourSite": "op onze site",
+    "modalWindow": "(modaal venster)",
     "newWindow": "(nieuw venster)",
     "allowAll": "Sta alle cookies toe",
     "denyAll": "Weiger alle cookies",
diff --git a/lang/tarteaucitron.oc.js b/lang/tarteaucitron.oc.js
index 3c6bbad..0e14b1a 100644
--- a/lang/tarteaucitron.oc.js
+++ b/lang/tarteaucitron.oc.js
@@ -37,6 +37,7 @@ tarteaucitron.lang = {
     "title": "Panèl de gestion dels cookies",
     "cookieDetail": "Detalh dels cookies",
     "ourSite": "sus nòstre site",
+    "modalWindow": "(modale fenèstra)",
     "newWindow": "(novèla fenèstra)",
     "allowAll": "Autorizar totes los cookies",
     "denyAll": "Interdire totes los cookies",
diff --git a/lang/tarteaucitron.pl.js b/lang/tarteaucitron.pl.js
index 5bdb50f..c264ec8 100644
--- a/lang/tarteaucitron.pl.js
+++ b/lang/tarteaucitron.pl.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Panel zarządzania plikami cookies",
     "cookieDetail": "Szczegóły plików cookie dla",
     "ourSite": "na naszej stronie",
+    "modalWindow": "(okno modalne)",
     "newWindow": "(nowe okno)",
     "allowAll": "Zezwól na wszystkie pliki cookies",
     "denyAll": "Zablokuj wszystkie pliki cookies",
diff --git a/lang/tarteaucitron.pt.js b/lang/tarteaucitron.pt.js
index 7152346..5ecc363 100644
--- a/lang/tarteaucitron.pt.js
+++ b/lang/tarteaucitron.pt.js
@@ -34,7 +34,8 @@ tarteaucitron.lang = {
     "title": "Painel de Gerenciamento de Cookies",
     "cookieDetail": "Detalhe do Cookie",
     "ourSite": "em nosso site",
-    "newWindow": "(nova janela)",
+    "modalWindow": "(janela modal)",
+    "newWindow": "(janela nova)",
     "allowAll": "Permite todos os cookies",
     "denyAll": "Proibe todos cookies",
 
diff --git a/lang/tarteaucitron.ro.js b/lang/tarteaucitron.ro.js
index 1c9d391..ff784fd 100644
--- a/lang/tarteaucitron.ro.js
+++ b/lang/tarteaucitron.ro.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Panoul de gestionare a panourilor cookie",
     "cookieDetail": "Detaliile cookie pentru",
     "ourSite": "pe site-ul nostru",
+    "modalWindow": "(fereastra modală)",
     "newWindow": "(fereastră nouă)",
     "allowAll": "Permiteți toate cookie-urile",
     "denyAll": "Respinge toate cookie-urile",
diff --git a/lang/tarteaucitron.ru.js b/lang/tarteaucitron.ru.js
index f471812..7c01374 100644
--- a/lang/tarteaucitron.ru.js
+++ b/lang/tarteaucitron.ru.js
@@ -33,9 +33,10 @@ tarteaucitron.lang = {
 
     "toggleInfoBox": "Show/hide informations about cookie storage",
     "title": "Панель управления cookies",
-    "cookieDetail": "Cookie detail for",
-    "ourSite": "on our site",
-    "newWindow": "(new window)",
+    "cookieDetail": "Информация о файлах cookie для",
+    "ourSite": "на нашем сайте",
+    "modalWindow": "(модальное окно)",
+    "newWindow": "(новое окно)",
     "allowAll": "Разрешить использование cookies",
     "denyAll": "Запретить использование cookies",
 
diff --git a/lang/tarteaucitron.se.js b/lang/tarteaucitron.se.js
index d29a600..3ff01a8 100644
--- a/lang/tarteaucitron.se.js
+++ b/lang/tarteaucitron.se.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Cookie- hanteringspanel",
     "cookieDetail": "cookie- detalj för",
     "ourSite": "på vår webbplats",
+    "modalWindow": "(modalt fönster)",
     "newWindow": "(nytt fönster)",
     "allowAll": "Tillåt alla cookie",
     "denyAll": "Neka alla cookies",
diff --git a/lang/tarteaucitron.sk.js b/lang/tarteaucitron.sk.js
index 4fc5483..9d9d44b 100644
--- a/lang/tarteaucitron.sk.js
+++ b/lang/tarteaucitron.sk.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Panel riadenia súborov cookie",
     "cookieDetail": "Podrobnosti súboru cookie pre",
     "ourSite": "na našich stránkach",
+    "modalWindow": "(modálne okno)",
     "newWindow": "(nové okno)",
     "allowAll": "Povoľte všetky súbory cookie",
     "denyAll": "Odmietnuť všetky súbory cookie",
diff --git a/lang/tarteaucitron.sv.js b/lang/tarteaucitron.sv.js
index 2aabfa2..cafcfeb 100644
--- a/lang/tarteaucitron.sv.js
+++ b/lang/tarteaucitron.sv.js
@@ -35,6 +35,7 @@ tarteaucitron.lang = {
     "title": "Cookie- hanteringspanel",
     "cookieDetail": "cookie- detalj för",
     "ourSite": "på vår webbplats",
+    "modalWindow": "(modalt fönster)",
     "newWindow": "(nytt fönster)",
     "allowAll": "Tillåt alla cookie",
     "denyAll": "Neka alla cookies",
diff --git a/lang/tarteaucitron.tr.js b/lang/tarteaucitron.tr.js
index 98814cb..f6288b4 100644
--- a/lang/tarteaucitron.tr.js
+++ b/lang/tarteaucitron.tr.js
@@ -37,6 +37,7 @@ tarteaucitron.lang = {
     "title": "Çerez yönetimi paneli",
     "cookieDetail": "Ayrıntı çerezleri",
     "ourSite": "sitemizde",
+    "modalWindow": "(kalıcı pencere)",
     "newWindow": "(yeni pencere)",
     "allowAll": "Tüm çerezlere izin verin",
     "denyAll": "Tüm çerezleri yasaklayın",
diff --git a/lang/tarteaucitron.vi.js b/lang/tarteaucitron.vi.js
index 4ce5a9f..6d9c29c 100644
--- a/lang/tarteaucitron.vi.js
+++ b/lang/tarteaucitron.vi.js
@@ -36,6 +36,7 @@ tarteaucitron.lang = {
     "title": "Bảng quản lý cookie",
     "cookieDetail": "Cookie chi tiết",
     "ourSite": "trên site của chúng ta",
+    "modalWindow": "(cửa sổ phương thức)",
     "newWindow": "(Cửa sổ mới)",
     "allowAll": "Cho phép tất cả các Cookies",
     "denyAll": "Từ chối cất cả cookies",
diff --git a/lang/tarteaucitron.zh.js b/lang/tarteaucitron.zh.js
index 10aed27..3af4a4f 100644
--- a/lang/tarteaucitron.zh.js
+++ b/lang/tarteaucitron.zh.js
@@ -33,6 +33,7 @@ tarteaucitron.lang = {
     "title": "Cookie管理面板",
     "cookieDetail": "Cookie详情",
     "ourSite": "显示在我们的网站上",
+    "modalWindow": "（模态窗口）",
     "newWindow": "（新建窗口）",
     "allowAll": "允许",
     "denyAll": "禁用",
diff --git a/tarteaucitron.js b/tarteaucitron.js
index 40493e7..4cfac62 100644
--- a/tarteaucitron.js
+++ b/tarteaucitron.js
@@ -250,6 +250,7 @@ var tarteaucitron = {
         tarteaucitron.hashtag = tarteaucitron.parameters.hashtag;
         tarteaucitron.highPrivacy = tarteaucitron.parameters.highPrivacy;
         tarteaucitron.handleBrowserDNTRequest = tarteaucitron.parameters.handleBrowserDNTRequest;
+        tarteaucitron.customCloserId = tarteaucitron.parameters.customCloserId;
 
         // Step 1: load css
         if ( !tarteaucitron.parameters.useExternalCss ) {
@@ -310,9 +311,17 @@ var tarteaucitron = {
 
                 // Step 3: prepare the html
                 html += '<div id="tarteaucitronPremium"></div>';
-                html += '<button type="button" id="tarteaucitronBack" aria-label="' + tarteaucitron.lang.close + '"></button>';
+                if (tarteaucitron.reloadThePage) {
+                    html += '<button type="button" id="tarteaucitronBack" aria-label="' + tarteaucitron.lang.close + ' (' + tarteaucitron.lang.reload + ')"></button>';
+                } else {
+                    html += '<button type="button" id="tarteaucitronBack" aria-label="' + tarteaucitron.lang.close + '"></button>';
+                }
                 html += '<div id="tarteaucitron" role="dialog" aria-modal="true" aria-describedby="tarteaucitronInfo" aria-labelledby="dialogTitle" tabindex="-1">';
-                html += '   <button type="button" id="tarteaucitronClosePanel">';
+                if (tarteaucitron.reloadThePage) {
+                    html += '   <button type="button" id="tarteaucitronClosePanel" aria-label="' + tarteaucitron.lang.close + ' (' + tarteaucitron.lang.reload + ')">';
+                } else {
+                    html += '   <button type="button" id="tarteaucitronClosePanel">';
+                }
                 html += '       ' + tarteaucitron.lang.close;
                 html += '   </button>';
                 html += '   <div id="tarteaucitronServices">';
@@ -322,7 +331,7 @@ var tarteaucitron = {
                 html += '         ' + tarteaucitron.lang.disclaimer;
                 if (tarteaucitron.parameters.privacyUrl !== "") {
                     html += '   <br/><br/>';
-                    html += '   <button type="button" id="tarteaucitronPrivacyUrlDialog">';
+                    html += '   <button type="button" id="tarteaucitronPrivacyUrlDialog" role="link">';
                     html += '       ' + tarteaucitron.lang.privacyUrl;
                     html += '   </button>';
                 }
@@ -397,12 +406,12 @@ var tarteaucitron = {
                     html += '       ' + tarteaucitron.lang.alertBigPrivacy;
                     html += '   </span>';
                     //html += '   <span class="tarteaucitronAlertBigBtnWrapper">';
-                    html += '   <button type="button" id="tarteaucitronPersonalize">';
+                    html += '   <button type="button" id="tarteaucitronPersonalize" aria-label="' + tarteaucitron.lang.personalize + ' ' + tarteaucitron.lang.modalWindow + '">';
                     html += '       ' + tarteaucitron.lang.personalize;
                     html += '   </button>';
 
                     if (tarteaucitron.parameters.privacyUrl !== "") {
-                        html += '   <button type="button" id="tarteaucitronPrivacyUrl">';
+                        html += '   <button role="link" type="button" id="tarteaucitronPrivacyUrl">';
                         html += '       ' + tarteaucitron.lang.privacyUrl;
                         html += '   </button>';
                     }
@@ -429,18 +438,22 @@ var tarteaucitron = {
 
 
                     if (tarteaucitron.parameters.DenyAllCta) {
+                        if (tarteaucitron.reloadThePage) {
+                                    html += '   <button type="button" class="tarteaucitronCTAButton tarteaucitronDeny" id="tarteaucitronAllDenied2" aria-label="' + tarteaucitron.lang.denyAll + ' (' + tarteaucitron.lang.reload + ')">';
+                        } else {
                                     html += '   <button type="button" class="tarteaucitronCTAButton tarteaucitronDeny" id="tarteaucitronAllDenied2">';
+                        }
                                     html += '       <span class="tarteaucitronCross"></span> ' + tarteaucitron.lang.denyAll;
                                     html += '   </button>';
                                     //html += '   <br/><br/>';
                     }
 
-                    html += '   <button type="button" id="tarteaucitronCloseAlert">';
+                    html += '   <button type="button" id="tarteaucitronCloseAlert" aria-label="' + tarteaucitron.lang.personalize + ' ' + tarteaucitron.lang.modalWindow + '">';
                     html += '       ' + tarteaucitron.lang.personalize;
                     html += '   </button>';
 
                     if (tarteaucitron.parameters.privacyUrl !== "") {
-                        html += '   <button type="button" id="tarteaucitronPrivacyUrl">';
+                        html += '   <button type="button" id="tarteaucitronPrivacyUrl" role="link">';
                         html += '       ' + tarteaucitron.lang.privacyUrl;
                         html += '   </button>';
                     }
@@ -454,14 +467,14 @@ var tarteaucitron = {
                 if (tarteaucitron.parameters.showIcon === true) {
                     html += '<div id="tarteaucitronIcon" class="tarteaucitronIcon' + tarteaucitron.parameters.iconPosition + '">';
                     html += '   <button type="button" id="tarteaucitronManager">';
-                    html += '       <img src="' + (tarteaucitron.parameters.iconSrc ? tarteaucitron.parameters.iconSrc : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAGA0lEQVRoge1a207bWBRdBtJwLYZhKDMVmlSK1LxNkPo+ZH6g8B6p5AuALwC+APoFoVLeoT8whPeRSt+CZKmZVu3AiIsRlEtCktGyjy8xzuXYhvahS0JJHJ/4rLP3XnuffcAPfGdQ7mM6jRLSAF4BxqsbewB2lRS2o35mpEQaJcwCyANIdLi1DGBNSWEzqmdHRqRRwjqAJclhtExOSUEP+/xIiDRKhhUWfL7ShTtBuJnqcw+/z4Ql0xNmMEwSSz4kuNIzSgpjSsqYJP/GeE185wYJroedRyiLNEpGLLzzrHSuk+83SgbxvOcyyRaDziWsRVZkSRDinpzPbwVGWIucuohsKynMS47fAQyls/BMSRmKJo3AFhG5wm2N1wF+Zs3zebbFfR0RxrXcJHQlgH+LMW616pR/WiIMEXfW3mtzXyeEGWsjKot8c4TOI98L+iKaR5PS6IUk88RLAO9F8UjrbYoYMOosNavpfmODIiwRXRR/G3ohaWVo1RU/c30jV8ab2mV8qVGzHWBOLyTLZiWs5Rolg/C3ySOi0tXP/k4aEwOwSBKPJs7Rp16ABJTe+p1xVX0It/owqqdDEMRoqd3RFxqDPh20Ig6VEPVC0i5RSCD+6wl6HlW7GksSlUMV11/GrUs5NasFLusDE9ELSVphXemtJwaT/8JyIRvxNNCfBmIiNdR04LII3DSrbe0yjqvyJF/ppptqVlt+MCLCEh/oOkPPP6N38Mb5cnQBGFsEqmXg5j3QMwoMzwGnr4HYbybBq13gZAOom/FO63zdf2qQArCsZrUN2TlJy69eSDKYV+6Q4MpP75ivHzPA53ngaBW4eGuSOt0A/lsGPmXMz0+3TFJcTfFbPfFbfnwlhON+iQhlWmA82CQ4ocQ7c6KcfL3DHuls0yT6Sx4YnLXJDCQOIRRv5yGIJBgP8Sdisj2qubpc5UGJmo+W49ifVmzL8HcpGhQPvZCUKiCliIhEN0tr2OCqHuSA8gwQ/92MkU7gxEmeVqGrTTgpxPXbUrtGWYus0I9thRIraagRQUIDf7Qn4yZhKRiFQIyhfMfUr3yblokVWSJ6k8xSnc7eNN/RjowfCYiFoDUFer1S3gW6JiJ8Nt30EMbEhU+vzSIztuRYjRLsR8IHLjlf7HZ+MrWWEXxNmbvapt4jGSqZRYSkGUetSNTPzHsui5YMQ2ajJUNks6mw4wT54Ok2ShnzzIPCUGshzawCRKy5FqvrTZe0RWzQGvw79m67XZjKmxJrLsICjtZa55gxXy+6F4sYsEtxTqhXdRTLC8ulSDaWoCLsolfN+8YUhOsJV709H7Cudr0LlVEtzqBcN+shEyThdR941OnAbF8pirKJqXyupTRTtQSReiVmXW1j7oBErB0d9xM2WEd5J9ZKYtuR4WKwwBSoORbpGrJ5ZI9lt71irJmGX1px0JYE26uNErawr2zfIcP4OHEKXm66PA3wjpCNEfpJunI4muifPjKvsFCkGjExTq63yxMJsZNMYF/J4HmDC5A3Yq36jy0ClePHVhwuu/b1HSFlEfHD5ZtD1bEK44Qu1mWys6tbWmZyPWckzlPTGiRw/XHCuk+q4Rek+mVrVL/UppwrdDEGNV2kpyuhccgc5Oxm9vWnn+19vJrVpLor0kTUrGacMplb1CfOFyTD4o9uNrHqr2Z+ZMSp1c2XcVSORnh9Q81q3k599ETgkNnjg0nGzi10K7rX+bZpHbrblPcY5A4Zxk2xcjzCvTpd9027Aa0QtouyyrKFRR6D/04DwkFGvHPXM3Qda/Jb4nPgI7hQLVM1q5HIBt2MzQNa57Z1DiiLAGa5Mi+O4Sz3Mpp6laPHO6InII3ITnX1QtI+EOX+m9ZxleOZ/j9PiuKoLi3aqXPuEoSye/Vhkm+LalbLtHhMS0R6zu7aZ3vP2jOjL7QVv4McxhcDnZIelAQibGIbULOapf3PuE1Vs9qeaOTdkVKr00gCQiw4NlBzDvf1Lxx+uP5r3Dgv5KQZRzWn+GRwz8jmDS8itUg7iB6vLuJCF5Uty4A9mVKkFR6MiJDachST/oHvHgD+B4SoUIitpF05AAAAAElFTkSuQmCC') + '" alt="' + tarteaucitron.lang.icon + '" title="' + tarteaucitron.lang.icon + '">';
+                    html += '       <img src="' + (tarteaucitron.parameters.iconSrc ? tarteaucitron.parameters.iconSrc : 'data:image/png;base64,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') + '" alt="' + tarteaucitron.lang.icon + ' ' + tarteaucitron.lang.modalWindow + '" title="' + tarteaucitron.lang.icon + ' ' + tarteaucitron.lang.modalWindow + '">';
                     html += '   </button>';
                     html += '</div>';
                 }
 
                 if (tarteaucitron.parameters.showAlertSmall === true) {
                     html += '<div id="tarteaucitronAlertSmall" class="tarteaucitronAlertSmall' + orientation + '">';
-                    html += '   <button type="button" id="tarteaucitronManager">';
+                    html += '   <button type="button" id="tarteaucitronManager" aria-label="' + tarteaucitron.lang.alertSmall + ' ' + tarteaucitron.lang.modalWindow + '">';
                     html += '       ' + tarteaucitron.lang.alertSmall;
                     html += '       <span id="tarteaucitronDot">';
                     html += '           <span id="tarteaucitronDotGreen"></span>';
@@ -472,7 +485,11 @@ var tarteaucitron = {
                         html += '   </button><!-- @whitespace';
                         html += '   --><button type="button" id="tarteaucitronCookiesNumber">0</button>';
                         html += '   <div id="tarteaucitronCookiesListContainer">';
-                        html += '       <button type="button" id="tarteaucitronClosePanelCookie">';
+                        if (tarteaucitron.reloadThePage) {
+                            html += '       <button type="button" id="tarteaucitronClosePanelCookie" aria-label="' + tarteaucitron.lang.close + ' (' + tarteaucitron.lang.reload + ')">';
+                        } else {
+                            html += '       <button type="button" id="tarteaucitronClosePanelCookie">';
+                        }
                         html += '           ' + tarteaucitron.lang.close;
                         html += '       </button>';
                         html += '       <div class="tarteaucitronCookiesListMain" id="tarteaucitronCookiesTitle">';
@@ -958,6 +975,10 @@ var tarteaucitron = {
                 if (tarteaucitron.state[key] !== status) {
                     if (status === false && tarteaucitron.launch[key] === true) {
                         tarteaucitron.reloadThePage = true;
+                        if (tarteaucitron.checkIfExist('tarteaucitronClosePanel')) {
+                            var ariaCloseValue = document.getElementById('tarteaucitronClosePanel').textContent.trim() + ' (' + tarteaucitron.lang.reload + ')';
+                            document.getElementById('tarteaucitronClosePanel').setAttribute("aria-label", ariaCloseValue);
+                        }
                     }
                     if (tarteaucitron.launch[key] !== true && status === true) {
 
@@ -995,6 +1016,10 @@ var tarteaucitron = {
 
             if (status === false && tarteaucitron.launch[key] === true) {
                 tarteaucitron.reloadThePage = true;
+                if (tarteaucitron.checkIfExist('tarteaucitronClosePanel')) {
+                    var ariaCloseValue = document.getElementById('tarteaucitronClosePanel').textContent.trim() + ' (' + tarteaucitron.lang.reload + ')';
+                    document.getElementById('tarteaucitronClosePanel').setAttribute("aria-label", ariaCloseValue);
+                }
             }
 
             // if not already launched... launch the service
@@ -1217,8 +1242,12 @@ var tarteaucitron = {
             } else {
                 tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none');
             }
-            if (document.getElementById('tarteaucitronCloseAlert') !== null) {
+            if (tarteaucitron.checkIfExist('tarteaucitronCloseAlert')) {
                 document.getElementById('tarteaucitronCloseAlert').focus();
+            } else if (tarteaucitron.checkIfExist('tarteaucitronManager')) {
+                document.getElementById('tarteaucitronManager').focus();
+            } else if (tarteaucitron.customCloserId && tarteaucitron.checkIfExist(tarteaucitron.customCloserId)) {
+                document.getElementById(tarteaucitron.customCloserId).focus();
             }
             if (document.getElementsByTagName('body')[0].classList !== undefined) {
                 document.getElementsByTagName('body')[0].classList.remove('tarteaucitron-modal-open');
@@ -1818,6 +1847,10 @@ var tarteaucitron = {
     "addInternalScript": function (url, id, callback, execute, attrName, attrVal) {
         tarteaucitron.addScript(url, id, callback, execute, attrName, attrVal, true);
     },
+    "checkIfExist": function (elemId) {
+        "use strict";
+        return document.getElementById(elemId) !== null && document.getElementById(elemId).offsetWidth !== 0 && document.getElementById(elemId).offsetHeight !== 0;
+    },
     "makeAsync": {
         "antiGhost": 0,
         "buffer": '',