diff --git a/event/listener.php b/event/listener.php
index 661c8ae..489d0d8 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -117,6 +117,12 @@ public function add_googleanalytics_configs($event)
'type' => 'radio:yes_no',
'explain' => true,
],
+ 'googleanalytics_show_agreement' => [
+ 'lang' => 'ACP_GA_SHOW_AGREEMENT',
+ 'validate' => 'bool',
+ 'type' => 'radio:yes_no',
+ 'explain' => true,
+ ],
];
// Add the new config vars after warnings_expire_days in the display_vars config array
@@ -164,7 +170,8 @@ public function validate_googleanalytics_id($event)
*/
public function append_agreement()
{
- if (!$this->config['googleanalytics_id']
+ if (!$this->config['googleanalytics_show_agreement']
+ || !$this->config['googleanalytics_id']
|| (strpos($this->user->page['page_name'], 'ucp') !== 0)
|| !$this->template->retrieve_var('S_AGREEMENT')
|| ($this->template->retrieve_var('AGREEMENT_TITLE') !== $this->language->lang('PRIVACY')))
diff --git a/language/ar/googleanalytics_acp.php b/language/ar/googleanalytics_acp.php
index 4b724ca..de69210 100644
--- a/language/ar/googleanalytics_acp.php
+++ b/language/ar/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” كود Google Analytics ID الذي أدخلته غير صالح.
يجب أن يكون على الشكل “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'تفعيل إخفاء هوية عنوان IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'فعّل هذا الخيار إذا كنت تريد أن تكون البيانات التي يجمعها Google Analytics متوافقة مع اللائحة العامة لحماية البيانات في الاتحاد الأوروبي (GDPR). لاحظ أن تفعيل هذا الخيار قد يقلل قليلًا من دقة التقارير الجغرافية.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'إفصاح التحليلات',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'عرض تفاصيل في سياسة الخصوصية حول كيفية جمع Google Analytics لمعلومات المستخدم ومعالجتها.',
));
diff --git a/language/cs/googleanalytics_acp.php b/language/cs/googleanalytics_acp.php
index 1269a92..011a993 100644
--- a/language/cs/googleanalytics_acp.php
+++ b/language/cs/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” není platné ID klienta ve službě Google Analytics.
Mělo by být ve tvaru “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Zapnout anonymizaci IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Tuto možnost povolte, pokud chcete, aby data shromážděná službou Google Analytics byla v souladu s obecným nařízením EU o ochraně osobních údajů (GDPR). Upozorňujeme, že povolení této možnosti může mírně snížit přesnost geografických přehledů.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Informace o analytice',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Zobrazit v zásadách ochrany osobních údajů podrobnosti o tom, jak služba Google Analytics shromažďuje a zpracovává informace o uživatelích.',
));
diff --git a/language/da/googleanalytics_acp.php b/language/da/googleanalytics_acp.php
index 1b3f665..cd5d478 100644
--- a/language/da/googleanalytics_acp.php
+++ b/language/da/googleanalytics_acp.php
@@ -46,4 +46,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” er ikke en gyldig Google Analytics ID kode.
Det skal være i formen: “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Slå IP-anonymisering til',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Aktivér denne mulighed, hvis du ønsker, at data indsamlet af Google Analytics skal overholde EU’s generelle forordning om databeskyttelse (GDPR). Bemærk, at aktivering af denne mulighed kan reducere nøjagtigheden af geografiske rapporter en smule.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Oplysninger om Analytics',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Vis oplysninger i privatlivspolitikken om, hvordan Google Analytics indsamler og behandler brugeroplysninger.',
));
diff --git a/language/de/googleanalytics_acp.php b/language/de/googleanalytics_acp.php
index 188f6cf..6aa511c 100644
--- a/language/de/googleanalytics_acp.php
+++ b/language/de/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.
Sie sollte die folgende Form haben: “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'IP-Anonymisierung aktivieren',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Aktiviere diese Option, wenn die von Google Analytics erfassten Daten mit der Datenschutz-Grundverordnung (DSGVO) der EU vereinbar sein sollen. Beachte, dass diese Option die Genauigkeit geografischer Berichte geringfügig verringern kann.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Analytics-Hinweis',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'In der Datenschutzerklärung Informationen darüber anzeigen, wie Google Analytics Benutzerdaten erfasst und verarbeitet.',
));
diff --git a/language/de_x_sie/googleanalytics_acp.php b/language/de_x_sie/googleanalytics_acp.php
index 65f3e1e..69bbc04 100644
--- a/language/de_x_sie/googleanalytics_acp.php
+++ b/language/de_x_sie/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.
Sie sollte die folgende Form haben: “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'IP-Anonymisierung aktivieren',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Aktivieren Sie diese Option, wenn die von Google Analytics erfassten Daten mit der Datenschutz-Grundverordnung (DSGVO) der EU vereinbar sein sollen. Beachten Sie, dass diese Option die Genauigkeit geografischer Berichte geringfügig verringern kann.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Analytics-Hinweis',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'In der Datenschutzerklärung Informationen darüber anzeigen, wie Google Analytics Benutzerdaten erfasst und verarbeitet.',
));
diff --git a/language/el/googleanalytics_acp.php b/language/el/googleanalytics_acp.php
index 087c560..9eb9d20 100644
--- a/language/el/googleanalytics_acp.php
+++ b/language/el/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => 'Το "%s" δεν είναι έγκυρο αναγνωριστικό παρακολούθησης (ID code) του Google Analytics.
Πρέπει να είναι μορφής “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Ενεργοποίηση ανωνυμοποίησης IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Ενεργοποιήστε αυτή την επιλογή αν θέλετε τα δεδομένα που συλλέγονται από το Google Analytics να συμμορφώνονται με τον Γενικό Κανονισμό Προστασίας Δεδομένων της ΕΕ (GDPR). Σημειώστε ότι η ενεργοποίηση αυτής της επιλογής μπορεί να μειώσει ελαφρώς την ακρίβεια των γεωγραφικών αναφορών.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Γνωστοποίηση αναλυτικών στοιχείων',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Εμφάνιση λεπτομερειών στην Πολιτική απορρήτου σχετικά με τον τρόπο με τον οποίο το Google Analytics συλλέγει και επεξεργάζεται πληροφορίες χρηστών.',
));
diff --git a/language/en/googleanalytics_acp.php b/language/en/googleanalytics_acp.php
index 2d4af47..ae4388c 100644
--- a/language/en/googleanalytics_acp.php
+++ b/language/en/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” is not a valid Google Analytics ID code.
It should be in the form “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Analytics disclosure',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Show details in the Privacy Policy about how Google Analytics collects and processes user information.',
));
diff --git a/language/es/googleanalytics_acp.php b/language/es/googleanalytics_acp.php
index 4684082..1bc1868 100644
--- a/language/es/googleanalytics_acp.php
+++ b/language/es/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” no es un código ID válido de Google Analytics.
Debería ser de esta forma “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Activar anonimización de IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Active esta opción si desea que los datos recopilados por Google Analytics cumplan con el Reglamento general de protección de datos de la UE (GDPR). Tenga en cuenta que habilitar esta opción puede reducir ligeramente la precisión de los informes geográficos.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Divulgación sobre analíticas',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Mostrar en la Política de privacidad información sobre cómo Google Analytics recopila y procesa la información del usuario.',
));
diff --git a/language/es_x_tu/googleanalytics_acp.php b/language/es_x_tu/googleanalytics_acp.php
index 0c34319..ef011e4 100644
--- a/language/es_x_tu/googleanalytics_acp.php
+++ b/language/es_x_tu/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” no es un código ID válido de Google Analytics.
Debería ser de esta forma “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Activar anonimización de IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Activa esta opción si deseas que los datos recopilados por Google Analytics cumplan con el Reglamento general de protección de datos de la UE (GDPR). Ten en cuenta que habilitar esta opción puede reducir ligeramente la precisión de los informes geográficos.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Divulgación sobre analíticas',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Mostrar en la Política de privacidad información sobre cómo Google Analytics recopila y procesa la información del usuario.',
));
diff --git a/language/fr/googleanalytics_acp.php b/language/fr/googleanalytics_acp.php
index 1758ec4..0935f11 100644
--- a/language/fr/googleanalytics_acp.php
+++ b/language/fr/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '« %s » n’est pas un ID Google Analytics valide.
Ce doit être au format « G-XXXXXXXXXX ».',
'ACP_GA_ANONYMIZE_IP' => 'Activer l’anonymisation de l’adresse IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Permet aux données collectées par Google Analytics d’être conformes au Règlement général sur la protection des données (RGPD). Note : l’activation de cette option peut diminuer la précision des emplacements géographiques dans les rapports.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Divulgation relative aux statistiques',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Afficher dans la politique de confidentialité des informations sur la manière dont Google Analytics collecte et traite les informations des utilisateurs.',
));
diff --git a/language/hr/googleanalytics_acp.php b/language/hr/googleanalytics_acp.php
index f6e84ef..422adda 100644
--- a/language/hr/googleanalytics_acp.php
+++ b/language/hr/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” nije ispravan Google Analytics ID kod.
Trebao bi biti u obliku: “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Uključi anonimizaciju IP adrese',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Omogući ovu opciju ako želiš da podaci koje prikuplja Google Analytics budu usklađeni s Općom uredbom EU-a o zaštiti podataka (GDPR). Imaj na umu da omogućavanje ove opcije može malo smanjiti točnost geografskih izvješća.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Obavijest o analitici',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Prikaži u Pravilima privatnosti pojedinosti o tome kako Google Analytics prikuplja i obrađuje korisničke podatke.',
));
diff --git a/language/hr_x_vi/googleanalytics_acp.php b/language/hr_x_vi/googleanalytics_acp.php
index d504fe3..babe098 100644
--- a/language/hr_x_vi/googleanalytics_acp.php
+++ b/language/hr_x_vi/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” nije ispravan Google Analytics ID kod.
Trebao bi biti u obliku: “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Uključite anonimizaciju IP adrese',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Omogućite ovu opciju ako želite da podaci koje prikuplja Google Analytics budu usklađeni s Općom uredbom EU-a o zaštiti podataka (GDPR). Imajte na umu da omogućavanje ove opcije može malo smanjiti točnost geografskih izvješća.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Obavijest o analitici',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Prikaži u Pravilima privatnosti pojedinosti o tome kako Google Analytics prikuplja i obrađuje korisničke podatke.',
));
diff --git a/language/it/googleanalytics_acp.php b/language/it/googleanalytics_acp.php
index a1d3c26..5a27b2d 100644
--- a/language/it/googleanalytics_acp.php
+++ b/language/it/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” non è un codice ID valido di Google Analytics.
Dove essere nel formato “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Attiva l’anonimizzazione IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Abilita questa opzione se vuoi che i dati raccolti da Google Analytics siano conformi al Regolamento generale sulla protezione dei dati dell’UE (GDPR). Tieni presente che l’attivazione di questa opzione può ridurre leggermente la precisione dei report geografici.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Informativa sui dati analitici',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Mostra nell’Informativa sulla privacy i dettagli su come Google Analytics raccoglie ed elabora le informazioni degli utenti.',
));
diff --git a/language/nl/googleanalytics_acp.php b/language/nl/googleanalytics_acp.php
index 05e9495..8f69442 100644
--- a/language/nl/googleanalytics_acp.php
+++ b/language/nl/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” is geen geldige Google Analytics ID code.
Het moet iets zijn in de vorm van “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'IP-anonimisering inschakelen',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Schakel deze optie in als je wilt dat de gegevens die door Google Analytics worden verzameld voldoen aan de Algemene verordening gegevensbescherming (AVG) van de EU. Houd er rekening mee dat het inschakelen van deze optie de nauwkeurigheid van geografische rapportage licht kan verminderen.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Openbaarmaking over Analytics',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Toon in het privacybeleid hoe Google Analytics gebruikersinformatie verzamelt en verwerkt.',
));
diff --git a/language/pl/googleanalytics_acp.php b/language/pl/googleanalytics_acp.php
index 2e23a4d..9c37f40 100644
--- a/language/pl/googleanalytics_acp.php
+++ b/language/pl/googleanalytics_acp.php
@@ -46,4 +46,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” nie jest prawidłowym identyfikatorem śledzenia Google Analytics.
Identyfikator śledzenia powinien mieć postać “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Włącz anonimizację adresów IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Wybranie Tak spowoduje, że dane zbierane przez Google Analytics będą zgodne z ogólnym rozporządzeniem o ochronie danych osobowych (RODO). Włączenie tej opcji może wpłynąć na dokładność geograficznej lokalizacji użytkowników.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Informacje o analityce',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Pokaż w Polityce prywatności szczegółowe informacje o tym, jak Google Analytics zbiera i przetwarza informacje o użytkownikach.',
));
diff --git a/language/pt/googleanalytics_acp.php b/language/pt/googleanalytics_acp.php
index a5ca4d5..2a2494f 100644
--- a/language/pt/googleanalytics_acp.php
+++ b/language/pt/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” não é um código Google Analytics ID válido.
Ele deve estar na forma “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Ative a Anonimização de IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Ative esta opção se pretender que os dados recolhidos pelo Google Analytics estejam em conformidade com o Regulamento Geral de Proteção de Dados (RGPD) da UE. Note que ativar esta opção pode reduzir ligeiramente a precisão dos relatórios geográficos..',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Divulgação de dados analíticos',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Mostrar na Política de Privacidade informações sobre como o Google Analytics recolhe e processa informações dos utilizadores.',
));
diff --git a/language/pt_br/googleanalytics_acp.php b/language/pt_br/googleanalytics_acp.php
index 5d6874c..b83d79f 100644
--- a/language/pt_br/googleanalytics_acp.php
+++ b/language/pt_br/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” não é um código ID Google Analytics válido.
Deve ser dessa forma “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Ativar anonimização de IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Ative essa opção se quiser que os dados coletados pelo Google Analytics estejam em conformidade com o Regulamento Geral de Proteção de Dados da União Europeia (GDPR). Observe que a ativação dessa opção pode reduzir um pouco a precisão dos relatórios geográficos.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Divulgação de dados analíticos',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Mostrar na Política de Privacidade informações sobre como o Google Analytics coleta e processa informações do usuário.',
));
diff --git a/language/ro/googleanalytics_acp.php b/language/ro/googleanalytics_acp.php
index 478f84f..cabea52 100644
--- a/language/ro/googleanalytics_acp.php
+++ b/language/ro/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” nu este un cod valid de urmarire Google Analytics.
Trebuie sa fie sub forma “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Activați anonimizarea IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Activați această opțiune dacă doriți ca datele colectate de Google Analytics să respecte Regulamentul general al UE privind protecția datelor (GDPR). Rețineți că activarea acestei opțiuni poate reduce ușor precizia rapoartelor geografice.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Informare privind datele analitice',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Afișați în Politica de confidențialitate detalii despre modul în care Google Analytics colectează și procesează informațiile utilizatorilor.',
));
diff --git a/language/ru/googleanalytics_acp.php b/language/ru/googleanalytics_acp.php
index a3be450..c55bb04 100644
--- a/language/ru/googleanalytics_acp.php
+++ b/language/ru/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” является недопустимым Google Analytics ID кодом.
Он должен быть в формате “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Включить анонимизацию IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Включите этот параметр, если хотите, чтобы данные, собираемые Google Analytics, соответствовали Общему регламенту ЕС по защите данных (GDPR). Обратите внимание, что включение этого параметра может немного снизить точность географических отчетов.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Раскрытие информации об аналитике',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Показывать в Политике конфиденциальности сведения о том, как Google Analytics собирает и обрабатывает информацию о пользователях.',
));
diff --git a/language/sk/googleanalytics_acp.php b/language/sk/googleanalytics_acp.php
index b3cc88c..1c77998 100644
--- a/language/sk/googleanalytics_acp.php
+++ b/language/sk/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” nie je platný kód Google Analytics ID.
Mal by mať tvar “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Zapnúť anonymizáciu IP',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Povoľte túto možnosť, ak chcete, aby údaje zhromaždené službou Google Analytics boli v súlade so všeobecným nariadením EÚ o ochrane údajov (GDPR). Upozorňujeme, že povolenie tejto možnosti môže mierne znížiť presnosť geografických hlásení.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Informácie o analytike',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Zobraziť v zásadách ochrany osobných údajov podrobnosti o tom, ako služba Google Analytics zhromažďuje a spracúva informácie o používateľoch.',
));
diff --git a/language/sv/googleanalytics_acp.php b/language/sv/googleanalytics_acp.php
index 7f13f6b..1aed724 100644
--- a/language/sv/googleanalytics_acp.php
+++ b/language/sv/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” är ingen giltig Google Analytics ID kod.
Den bör ha formatet “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'Aktivera IP-anonymisering',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Aktivera det här alternativet om du vill att data som samlas in av Google Analytics ska följa EU:s allmänna dataskyddsförordning (GDPR). Observera att aktivering av detta alternativ kan minska noggrannheten i geografiska rapporter något.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Information om Analytics',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Visa information i sekretesspolicyn om hur Google Analytics samlar in och behandlar användaruppgifter.',
));
diff --git a/language/tr/googleanalytics_acp.php b/language/tr/googleanalytics_acp.php
index 188833b..735b12c 100644
--- a/language/tr/googleanalytics_acp.php
+++ b/language/tr/googleanalytics_acp.php
@@ -44,4 +44,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” geçerli bir Google Analytics ID kodu değil.
Kod şuna benzer şekilde olmalı “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => 'IP Anonimleştirmeyi açın',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => 'Google Analytics tarafından toplanan verilerin AB Genel Veri Koruma Yönetmeliğine (GDPR) uygun olmasını istiyorsanız bu seçeneği etkinleştirin. Bu seçeneğin etkinleştirilmesinin coğrafi raporlamanın doğruluğunu biraz azaltabileceğini unutmayın.',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Analytics açıklaması',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => 'Google Analytics’in kullanıcı bilgilerini nasıl topladığı ve işlediğiyle ilgili ayrıntıları Gizlilik Politikası’nda gösterin.',
));
diff --git a/language/zh_cmn_hant/googleanalytics_acp.php b/language/zh_cmn_hant/googleanalytics_acp.php
index 81b99f7..254a388 100644
--- a/language/zh_cmn_hant/googleanalytics_acp.php
+++ b/language/zh_cmn_hant/googleanalytics_acp.php
@@ -45,4 +45,6 @@
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” 不是有效的 Google Analytics（分析） ID code.
它的格式應該會是像這樣 “G-XXXXXXXXXX”.',
'ACP_GA_ANONYMIZE_IP' => '開啟 IP 匿名化',
'ACP_GA_ANONYMIZE_IP_EXPLAIN' => '如果你希望 Google Analytics 收集的資料符合歐盟一般資料保護規則 (GDPR)，請啟用此選項。請注意，啟用此選項可能會稍微降低地理位置報表的準確度。',
+ 'ACP_GA_SHOW_AGREEMENT' => 'Analytics 資訊揭露',
+ 'ACP_GA_SHOW_AGREEMENT_EXPLAIN' => '在隱私權政策中顯示 Google Analytics 如何收集及處理使用者資訊的詳細資訊。',
));
diff --git a/migrations/v10x/m6_add_privacy_setting.php b/migrations/v10x/m6_add_privacy_setting.php
new file mode 100644
index 0000000..68c12f0
--- /dev/null
+++ b/migrations/v10x/m6_add_privacy_setting.php
@@ -0,0 +1,43 @@
+
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace phpbb\googleanalytics\migrations\v10x;
+
+/**
+ * Migration stage 6: Add setting to show privacy agreement
+ */
+class m6_add_privacy_setting extends \phpbb\db\migration\migration
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function effectively_installed()
+ {
+ return $this->config->offsetExists('googleanalytics_show_agreement');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function depends_on()
+ {
+ return ['\phpbb\googleanalytics\migrations\v10x\m5_clear_legacy_googleanalytics_id'];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function update_data()
+ {
+ return [
+ ['config.add', ['googleanalytics_show_agreement', 1]],
+ ];
+ }
+}
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
index f9c19ee..e237706 100644
--- a/tests/event/listener_test.php
+++ b/tests/event/listener_test.php
@@ -48,6 +48,7 @@ protected function setUp(): void
// Load/Mock classes required by the event listener class
$this->config = new \phpbb\config\config([
'googleanalytics_id' => 'G-A1B2C3D4E5',
+ 'googleanalytics_show_agreement' => 1,
'ga_anonymize_ip' => 0,
'cookie_secure' => 0,
]);
@@ -141,7 +142,7 @@ public function add_googleanalytics_configs_data()
[ // expected config and mode
'settings',
['vars' => ['warnings_expire_days' => []]],
- ['warnings_expire_days', 'legend_googleanalytics', 'googleanalytics_id', 'ga_anonymize_ip'],
+ ['warnings_expire_days', 'legend_googleanalytics', 'googleanalytics_id', 'ga_anonymize_ip', 'googleanalytics_show_agreement'],
],
[ // unexpected mode
'foobar',
@@ -264,10 +265,11 @@ public function test_validate_googleanalytics_id($cfg_array, $expected_error)
public function append_agreement_data()
{
return [
- ['', false, 'PRIVACY', 0], // No analytics ID
- ['G-A1B2C3D4E5', false, 'PRIVACY', 0], // No agreement
- ['G-A1B2C3D4E5', true, 'TERMS', 0], // Wrong title
- ['G-A1B2C3D4E5', true, 'PRIVACY', 1], // Correct conditions
+ [true, '', false, 'PRIVACY', 0], // No analytics ID
+ [true, 'G-A1B2C3D4E5', false, 'PRIVACY', 0], // No agreement
+ [true, 'G-A1B2C3D4E5', true, 'TERMS', 0], // Wrong title
+ [false, 'G-A1B2C3D4E5', true, 'PRIVACY', 0], // Don't display agreement
+ [true, 'G-A1B2C3D4E5', true, 'PRIVACY', 1], // Correct conditions
];
}
@@ -275,13 +277,15 @@ public function append_agreement_data()
* Test the append_agreement method
*
* @dataProvider append_agreement_data
+ * @param bool $show_agreement Whether to display agreement text
* @param string $googleanalytics_id Configured Google Analytics ID
* @param mixed $s_agreement S_AGREEMENT template variable value
* @param mixed $agreement_title AGREEMENT_TITLE template variable value
* @param int $expected_append_calls Expected append_var calls
*/
- public function test_append_agreement($googleanalytics_id, $s_agreement, $agreement_title, $expected_append_calls)
+ public function test_append_agreement($show_agreement, $googleanalytics_id, $s_agreement, $agreement_title, $expected_append_calls)
{
+ $this->config['googleanalytics_show_agreement'] = $show_agreement;
$this->config['googleanalytics_id'] = $googleanalytics_id;
$this->config['sitename'] = 'Test Forum';
$this->user->page['page_name'] = 'ucp.php';
diff --git a/tests/functional/google_analytics_test.php b/tests/functional/google_analytics_test.php
index 59e2676..48b4eaf 100644
--- a/tests/functional/google_analytics_test.php
+++ b/tests/functional/google_analytics_test.php
@@ -69,6 +69,7 @@ public function test_set_acp_settings()
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$values['config[googleanalytics_id]'] = $this->sample_ga_code;
+ $values['config[googleanalytics_show_agreement]'] = 1;
$form->setValues($values);
// Submit form and test success