From 4b80c897752dd492d89059b4ba825c7eb21427df Mon Sep 17 00:00:00 2001 From: Sven Wappler Date: Wed, 18 Jan 2023 16:44:20 +0100 Subject: [PATCH 01/48] v12 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df22940d..1c4bf2c3 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "require": { "php": "^7.4 || ^8.0", - "typo3/cms-core": "^11.5 || 11.*.x-dev || dev-main" + "typo3/cms-core": "^11.5 || ^12 || dev-main" }, "require-dev": { "browserstack/browserstack-local": "dev-master", From 92a9b13353758ff9ef6bf5313a4eb6d1edb8954c Mon Sep 17 00:00:00 2001 From: Sven Wappler Date: Wed, 18 Jan 2023 19:41:16 +0100 Subject: [PATCH 02/48] v12 compatibility --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 1c4bf2c3..cdd77ab2 100644 --- a/composer.json +++ b/composer.json @@ -44,9 +44,6 @@ "typo3/cms-composer-installers": true } }, - "conflict": { - "typo3/cms-composer-installers": ">=4" - }, "extra": { "branch-alias": { "dev-master": "2.9.x-dev" From e6c2f9847bef71bef66a8ca3ceab2b8baa6d368c Mon Sep 17 00:00:00 2001 From: Sven Wappler Date: Wed, 18 Jan 2023 19:50:00 +0100 Subject: [PATCH 03/48] v12 compatibility --- Configuration/TCA/Overrides/sys_template.php | 2 +- ext_emconf.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php index 3205d851..d85e4a00 100644 --- a/Configuration/TCA/Overrides/sys_template.php +++ b/Configuration/TCA/Overrides/sys_template.php @@ -7,7 +7,7 @@ * LICENSE file that was distributed with this source code. */ -defined('TYPO3_MODE') || die(); +defined('TYPO3') or die(); // static TypoScript (static function () { diff --git a/ext_emconf.php b/ext_emconf.php index d24e3c13..fb8a3850 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -21,7 +21,7 @@ 'version' => '2.13.3', 'constraints' => [ 'depends' => [ - 'typo3' => '11.0.0-11.9.99', + 'typo3' => '12.0.0-12.9.99', ], 'conflicts' => [], 'suggests' => [], From 2af910f29b8df983e245dd6bf6fad797e160abb7 Mon Sep 17 00:00:00 2001 From: Sven Wappler Date: Wed, 18 Jan 2023 21:54:13 +0100 Subject: [PATCH 04/48] v12 compatibility --- Configuration/Services.yaml | 2 ++ Resources/Private/Layouts/PopupLayout.html | 4 +-- .../Private/Partials/TableRowsByGroup.html | 10 +++--- .../bootstrap3-banner/Templates/Popup.html | 32 +++++++++---------- .../bootstrap3-modal/Templates/Popup.html | 30 ++++++++--------- .../bootstrap4-modal/Templates/Popup.html | 30 ++++++++--------- .../bootstrap5-modal/Templates/Popup.html | 30 ++++++++--------- 7 files changed, 70 insertions(+), 68 deletions(-) diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml index 212ce687..2caf0725 100644 --- a/Configuration/Services.yaml +++ b/Configuration/Services.yaml @@ -3,3 +3,5 @@ services: autowire: true autoconfigure: false public: true + Dmind\Cookieman\ViewHelpers\ShownTrackingObjectsViewHelper: + public: true diff --git a/Resources/Private/Layouts/PopupLayout.html b/Resources/Private/Layouts/PopupLayout.html index 144dbe8d..29717c88 100644 --- a/Resources/Private/Layouts/PopupLayout.html +++ b/Resources/Private/Layouts/PopupLayout.html @@ -15,7 +15,7 @@ pageUid: settings.links.dataProtectionDeclarationPid, section: settings.links.dataProtectionDeclarationAnchor )}" - >{f:translate(key: 'dataProtectionDeclaration')} + >{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:dataProtectionDeclaration')} @@ -23,7 +23,7 @@ pageUid: settings.links.imprintPid, section: settings.links.imprintAnchor )}" - >{f:translate(key: 'imprint')} + >{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:imprint')} diff --git a/Resources/Private/Partials/TableRowsByGroup.html b/Resources/Private/Partials/TableRowsByGroup.html index 4ec298b7..89e65fac 100644 --- a/Resources/Private/Partials/TableRowsByGroup.html +++ b/Resources/Private/Partials/TableRowsByGroup.html @@ -6,13 +6,13 @@ {f:translate( - key:'trackingobject.{trackingItemId}', + key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:trackingobject.{trackingItemId}', default: trackingItemId )} {f:translate( - key:'trackingobject.{trackingItemId}.desc', + key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:trackingobject.{trackingItemId}.desc', default: 'missing translation: trackingobject.{trackingItemId}.desc' )} @@ -20,14 +20,14 @@ {trackingItem.duration} {f:translate( - key:'duration.{trackingItem.durationUnit}', + key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:duration.{trackingItem.durationUnit}', default: 'missing translation: duration.{trackingItem.durationUnit}' )} {f:translate( - key:'type.{trackingItem.type}', + key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:type.{trackingItem.type}', default: 'missing translation: type.{trackingItem.type}' )} @@ -35,7 +35,7 @@ {f:translate( - key: trackingItem.provider, + key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:{trackingItem.provider}', default: trackingItem.provider )} diff --git a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html index 5e47dd90..2dea6f7d 100644 --- a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html @@ -8,11 +8,11 @@

- {f:translate(key: 'heading')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:heading')}

{f:translate( - key: 'introText', + key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -23,11 +23,11 @@

+ >{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:settings')} {f:translate( - key: 'settingsText', + key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:settingsText', arguments: {1: "{settingsLink -> f:spaceless()}" }) -> f:format.raw()}

@@ -37,7 +37,7 @@

@@ -49,7 +49,7 @@

data-parent="#cookieman-acco" href="#cookieman-acco-{groupId}" aria-expanded="true" aria-controls="cookieman-acco-{groupId}"> - {f:translate(key: 'group.{groupId}', default: groupId)} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}', default: groupId)}

@@ -62,7 +62,7 @@

{f:if(condition: group.preselected, then: 'checked="checked"')} {f:if(condition: group.disabled, then: 'disabled="disabled"')} - > {f:translate(key: 'group.accept')} + > {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.accept')}

@@ -71,7 +71,7 @@

- {f:translate(key: 'group.{groupId}.desc')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')}

@@ -79,11 +79,11 @@

- - - - - + + + + + @@ -104,19 +104,19 @@

data-cookieman-accept-none data-cookieman-save class="btn btn-primary" > - {f:translate(key: 'deny')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')}
diff --git a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html index 6b159191..ca046519 100644 --- a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html @@ -8,13 +8,13 @@
- {f:translate(key: 'heading')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:heading')}

{f:translate( - key: 'introText', + key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -24,14 +24,14 @@

style="margin-bottom: 1em" type="button" data-toggle="collapse" data-target="#cookieman-settings" aria-expanded="false" aria-controls="cookieman-settings"> - {f:translate(key: 'settings')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:settings')}
@@ -42,7 +42,7 @@

data-parent="#cookieman-acco" href="#cookieman-acco-{groupId}" aria-expanded="true" aria-controls="cookieman-acco-{groupId}"> - {f:translate(key: 'group.{groupId}', default: groupId)} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}', default: groupId)}

@@ -59,23 +59,23 @@

{f:if(condition: group.preselected, then: 'checked="checked"')} {f:if(condition: group.disabled, then: 'disabled="disabled"')} - > {f:translate(key: 'group.accept')} + > {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.accept')}

- {f:translate(key: 'group.{groupId}.desc')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')}

{f:translate(key: 'tableheader.name')}{f:translate(key: 'tableheader.purpose')}{f:translate(key: 'tableheader.duration')}{f:translate(key: 'tableheader.type')}{f:translate(key: 'tableheader.provider')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}
- - - - - + + + + + @@ -99,19 +99,19 @@

data-cookieman-accept-none data-cookieman-save class="btn btn-primary" > - {f:translate(key: 'deny')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} diff --git a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html index ddad8b0b..0bb5c54d 100644 --- a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html @@ -7,12 +7,12 @@

{f:translate( - key: 'introText', + key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -21,13 +21,13 @@

- {f:translate(key: 'group.{groupId}.desc')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')}

{f:translate(key: 'tableheader.name')}{f:translate(key: 'tableheader.purpose')}{f:translate(key: 'tableheader.duration')}{f:translate(key: 'tableheader.type')}{f:translate(key: 'tableheader.provider')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}
- - - - - + + + + + @@ -97,19 +97,19 @@
{f:translate(key: 'tableheader.name')}{f:translate(key: 'tableheader.purpose')}{f:translate(key: 'tableheader.duration')}{f:translate(key: 'tableheader.type')}{f:translate(key: 'tableheader.provider')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}
- - - - - + + + + + @@ -100,19 +100,19 @@

data-cookieman-accept-none data-cookieman-save class="btn btn-secondary" > - {f:translate(key: 'deny')} + {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} From 6424878abc3e0926c384538ef47efa3676f71c0e Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 16:21:57 +0100 Subject: [PATCH 05/48] task: only support T3 v12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f83796b6..a06bffc8 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "require": { "php": "^7.4 || ^8.0", - "typo3/cms-core": "^11.5 || ^12 || dev-main" + "typo3/cms-core": "^12 || dev-main" }, "require-dev": { "browserstack/browserstack-local": "dev-master", From 59f8136496b8bd061ca6e97181a15d34090b8320 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 16:22:32 +0100 Subject: [PATCH 06/48] task: refactor hardwired translations --- Resources/Private/Layouts/PopupLayout.html | 4 +-- .../Private/Partials/TableRowsByGroup.html | 10 +++--- .../bootstrap3-banner/Templates/Popup.html | 32 +++++++++---------- .../bootstrap3-modal/Templates/Popup.html | 30 ++++++++--------- .../bootstrap4-modal/Templates/Popup.html | 30 ++++++++--------- .../bootstrap5-modal/Templates/Popup.html | 30 ++++++++--------- 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Resources/Private/Layouts/PopupLayout.html b/Resources/Private/Layouts/PopupLayout.html index 29717c88..9c1d1b0b 100644 --- a/Resources/Private/Layouts/PopupLayout.html +++ b/Resources/Private/Layouts/PopupLayout.html @@ -15,7 +15,7 @@ pageUid: settings.links.dataProtectionDeclarationPid, section: settings.links.dataProtectionDeclarationAnchor )}" - >{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:dataProtectionDeclaration')} + >{f:translate(key: 'dataProtectionDeclaration', extensionName: 'cookieman')} @@ -23,7 +23,7 @@ pageUid: settings.links.imprintPid, section: settings.links.imprintAnchor )}" - >{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:imprint')} + >{f:translate(key: 'imprint', extensionName: 'cookieman')} diff --git a/Resources/Private/Partials/TableRowsByGroup.html b/Resources/Private/Partials/TableRowsByGroup.html index 89e65fac..bf285785 100644 --- a/Resources/Private/Partials/TableRowsByGroup.html +++ b/Resources/Private/Partials/TableRowsByGroup.html @@ -6,13 +6,13 @@

{f:translate(key: 'tableheader.name')}{f:translate(key: 'tableheader.purpose')}{f:translate(key: 'tableheader.duration')}{f:translate(key: 'tableheader.type')}{f:translate(key: 'tableheader.provider')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}
{f:translate( - key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:trackingobject.{trackingItemId}', + key:'trackingobject.{trackingItemId}', extensionName: 'cookieman', default: trackingItemId )} {f:translate( - key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:trackingobject.{trackingItemId}.desc', + key:'trackingobject.{trackingItemId}.desc', extensionName: 'cookieman', default: 'missing translation: trackingobject.{trackingItemId}.desc' )} @@ -20,14 +20,14 @@ {trackingItem.duration} {f:translate( - key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:duration.{trackingItem.durationUnit}', + key:'duration.{trackingItem.durationUnit}', extensionName: 'cookieman', default: 'missing translation: duration.{trackingItem.durationUnit}' )} {f:translate( - key:'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:type.{trackingItem.type}', + key:'type.{trackingItem.type}', extensionName: 'cookieman', default: 'missing translation: type.{trackingItem.type}' )} @@ -35,7 +35,7 @@ {f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:{trackingItem.provider}', + key: '{trackingItem.provider}', extensionName: 'cookieman', default: trackingItem.provider )} diff --git a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html index cd661490..f0fde792 100644 --- a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html @@ -8,11 +8,11 @@
- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:heading')} + {f:translate(key: 'heading', extensionName: 'cookieman')}

{f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', + key: 'introText', extensionName: 'cookieman', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -23,11 +23,11 @@ + >{f:translate(key: 'settings', extensionName: 'cookieman')} {f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:settingsText', + key: 'settingsText', extensionName: 'cookieman', arguments: {1: "{settingsLink -> f:spaceless()}" }) -> f:format.raw()}

@@ -37,7 +37,7 @@
@@ -49,7 +49,7 @@ data-parent="#cookieman-acco" href="#cookieman-acco-{groupId}" aria-expanded="true" aria-controls="cookieman-acco-{groupId}"> - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}', default: groupId)} + {f:translate(key: 'group.{groupId}', extensionName: 'cookieman', default: groupId)}
@@ -62,7 +62,7 @@ {f:if(condition: group.preselected, then: 'checked="checked"')} {f:if(condition: group.disabled, then: 'disabled="disabled"')} - > {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.accept')} + > {f:translate(key: 'group.accept', extensionName: 'cookieman')}
@@ -71,7 +71,7 @@

- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')} + {f:translate(key: 'group.{groupId}.desc', extensionName: 'cookieman')}

@@ -79,11 +79,11 @@ - - - - - + + + + + @@ -104,19 +104,19 @@ data-cookieman-accept-none data-cookieman-save class="btn btn-primary" > - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} + {f:translate(key: 'deny', extensionName: 'cookieman')}
diff --git a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html index b2f696c4..6f243988 100644 --- a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html @@ -8,13 +8,13 @@
- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:heading')} + {f:translate(key: 'heading', extensionName: 'cookieman')}

{f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', + key: 'introText', extensionName: 'cookieman', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -24,14 +24,14 @@ style="margin-bottom: 1em" type="button" data-toggle="collapse" data-target="#cookieman-settings" aria-expanded="false" aria-controls="cookieman-settings"> - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:settings')} + {f:translate(key: 'settings', extensionName: 'cookieman')}

@@ -42,7 +42,7 @@ data-parent="#cookieman-acco" href="#cookieman-acco-{groupId}" aria-expanded="true" aria-controls="cookieman-acco-{groupId}"> - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}', default: groupId)} + {f:translate(key: 'group.{groupId}', extensionName: 'cookieman', default: groupId)}
@@ -59,23 +59,23 @@ {f:if(condition: group.preselected, then: 'checked="checked"')} {f:if(condition: group.disabled, then: 'disabled="disabled"')} - > {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.accept')} + > {f:translate(key: 'group.accept', extensionName: 'cookieman')}

- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')} + {f:translate(key: 'group.{groupId}.desc', extensionName: 'cookieman')}

{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}{f:translate(key: 'tableheader.name', extensionName: 'cookieman')}{f:translate(key: 'tableheader.purpose', extensionName: 'cookieman')}{f:translate(key: 'tableheader.duration', extensionName: 'cookieman')}{f:translate(key: 'tableheader.type', extensionName: 'cookieman')}{f:translate(key: 'tableheader.provider', extensionName: 'cookieman')}
- - - - - + + + + + @@ -99,19 +99,19 @@ data-cookieman-accept-none data-cookieman-save class="btn btn-primary" > - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} + {f:translate(key: 'deny', extensionName: 'cookieman')} diff --git a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html index 0086bfa9..8cbfa7ea 100644 --- a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html @@ -7,12 +7,12 @@

{f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', + key: 'introText', extensionName: 'cookieman', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -21,13 +21,13 @@

@@ -58,23 +58,23 @@ {f:if(condition: group.disabled, then: 'disabled="disabled"')} >

- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')} + {f:translate(key: 'group.{groupId}.desc', extensionName: 'cookieman')}

{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}{f:translate(key: 'tableheader.name', extensionName: 'cookieman')}{f:translate(key: 'tableheader.purpose', extensionName: 'cookieman')}{f:translate(key: 'tableheader.duration', extensionName: 'cookieman')}{f:translate(key: 'tableheader.type', extensionName: 'cookieman')}{f:translate(key: 'tableheader.provider', extensionName: 'cookieman')}
- - - - - + + + + + @@ -97,19 +97,19 @@ data-cookieman-accept-none data-cookieman-save class="btn btn-primary" > - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} + {f:translate(key: 'deny', extensionName: 'cookieman')} diff --git a/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html index f08bb5c0..048171a8 100644 --- a/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html @@ -8,13 +8,13 @@

{f:translate( - key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:introText', + key: 'introText', extensionName: 'cookieman', arguments: { 1: "{dataProtectionDeclarationLink -> f:spaceless()}", 2: "{imprintLink -> f:spaceless()}" @@ -23,14 +23,14 @@

@@ -39,7 +39,7 @@

- {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:group.{groupId}.desc')} + {f:translate(key: 'group.{groupId}.desc', extensionName: 'cookieman')}

@@ -72,11 +72,11 @@
{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}{f:translate(key: 'tableheader.name', extensionName: 'cookieman')}{f:translate(key: 'tableheader.purpose', extensionName: 'cookieman')}{f:translate(key: 'tableheader.duration', extensionName: 'cookieman')}{f:translate(key: 'tableheader.type', extensionName: 'cookieman')}{f:translate(key: 'tableheader.provider', extensionName: 'cookieman')}
- - - - - + + + + + @@ -100,19 +100,19 @@ data-cookieman-accept-none data-cookieman-save class="btn btn-secondary" > - {f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:deny')} + {f:translate(key: 'deny', extensionName: 'cookieman')} From 9767d8e0123bb3d1b1d683d87621973391c1d13b Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 16:27:49 +0100 Subject: [PATCH 07/48] task: re-add --- Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html | 1 + Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html | 1 + Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html | 1 + Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html | 1 + 4 files changed, 4 insertions(+) diff --git a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html index f0fde792..7f02791f 100644 --- a/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-banner/Templates/Popup.html @@ -123,3 +123,4 @@ + diff --git a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html index 6f243988..dca9fd55 100644 --- a/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap3-modal/Templates/Popup.html @@ -117,3 +117,4 @@ + diff --git a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html index 8cbfa7ea..5064b492 100644 --- a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html @@ -115,3 +115,4 @@ + diff --git a/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html index 048171a8..831c6b29 100644 --- a/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html +++ b/Resources/Private/Themes/bootstrap5-modal/Templates/Popup.html @@ -118,3 +118,4 @@ + From 45e7a22eaae0c3d0a7d48133dd0a0858840ed689 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 18:30:05 +0100 Subject: [PATCH 08/48] task: fix typo --- .../TypoScript/TrackingObjects/MicrosoftStream.typoscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript b/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript index ae3cb462..8e8331d1 100644 --- a/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript +++ b/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript @@ -1,7 +1,7 @@ plugin.tx_cookieman.settings.trackingObjects { MicrosoftStream { inject ( - + ) # example: # inject ( @@ -15,7 +15,7 @@ plugin.tx_cookieman.settings.trackingObjects { type = connection provider = MicrosoftStream } - + Signature_Api { duration = durationUnit = session From 841dc898943851a066016fe21abeb6007900e076 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 18:30:47 +0100 Subject: [PATCH 09/48] task: document extbase.controllerExtensionName misery --- Configuration/TypoScript/setup.typoscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index e3f79a51..1062567c 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -56,7 +56,9 @@ page { 100 = {$plugin.tx_cookieman.settings.resourcesBasePath}/Private/Themes/{$plugin.tx_cookieman.settings.theme}/Layouts/ } - // allows to omit extension name in f:translate ViewHelpers + // @see https://docs.typo3.org/m/typo3/reference-typoscript/12.4/en-us/ContentObjects/Fluidtemplate/Index.html#extbase-controllerextensionname + // should allow to omit extension name in f:translate ViewHelpers + // but does not seem to work in 12LTS @see https://forge.typo3.org/issues/102315 extbase.controllerExtensionName = cookieman # evaluate settings during rendering. With FLUIDTEMPLATE.settings we would prevent overwritability From 15c2933e1a9ca37d6b85a9007267dc96f133349e Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Fri, 3 Nov 2023 18:33:02 +0100 Subject: [PATCH 10/48] =?UTF-8?q?task:=20render=20trackingObjects.?= =?UTF-8?q?=E2=80=B9tracking-object-key=E2=80=BA.inject=20(cObj)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext_typoscript_setup.typoscript | 8 +++++--- .../TypoScriptSettingsProcessor.php | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Build/cookieman_test/ext_typoscript_setup.typoscript b/Build/cookieman_test/ext_typoscript_setup.typoscript index 81befbc8..55b9cde9 100644 --- a/Build/cookieman_test/ext_typoscript_setup.typoscript +++ b/Build/cookieman_test/ext_typoscript_setup.typoscript @@ -10,9 +10,11 @@ plugin.tx_cookieman.settings { trackingObjects { # add the Crowdin translation integration of cookieman as "TrackingObject" - actually a neat way to test if our JS inclusion works ;) Crowdin { - inject ( - - + inject = TEXT + inject.insertData = 1 + inject.value ( + + - - -
-
-
-
- ) + inject { + insertData = 1 + value ( + + + +
+
+
+
+ ) + } show { CrowdinWidget { duration = - diff --git a/Configuration/TypoScript/TrackingObjects/Bing.typoscript b/Configuration/TypoScript/TrackingObjects/Bing.typoscript index 01ae551c..ab44171e 100644 --- a/Configuration/TypoScript/TrackingObjects/Bing.typoscript +++ b/Configuration/TypoScript/TrackingObjects/Bing.typoscript @@ -2,9 +2,13 @@ plugin.tx_cookieman.settings.trackingObjects { Bing { # inline scripts would break Content-Security-Policy: script-src # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # We are planning to support Google Maps out-of-the-box with cookieman. Stay tuned. diff --git a/Configuration/TypoScript/TrackingObjects/GoogleTagManager.typoscript b/Configuration/TypoScript/TrackingObjects/GoogleTagManager.typoscript index 9bfd206d..f32e69a9 100644 --- a/Configuration/TypoScript/TrackingObjects/GoogleTagManager.typoscript +++ b/Configuration/TypoScript/TrackingObjects/GoogleTagManager.typoscript @@ -2,9 +2,13 @@ plugin.tx_cookieman.settings.trackingObjects { GoogleTagManager { # inline scripts would break Content-Security-Policy: script-src # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # diff --git a/Configuration/TypoScript/TrackingObjects/Matomo.typoscript b/Configuration/TypoScript/TrackingObjects/Matomo.typoscript index 54cb299f..22a2d593 100644 --- a/Configuration/TypoScript/TrackingObjects/Matomo.typoscript +++ b/Configuration/TypoScript/TrackingObjects/Matomo.typoscript @@ -2,11 +2,13 @@ # https://matomo.org/faq/general/faq_146/ plugin.tx_cookieman.settings.trackingObjects { Matomo { - # inline scripts would break Content-Security-Policy: script-src - # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # no example available yet. We are happy to receive a pull request if you have one. @@ -15,7 +19,7 @@ plugin.tx_cookieman.settings.trackingObjects { type = cookie_http provider = Microsoft } - + AADNonce\.forms { duration = durationUnit = session diff --git a/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript b/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript index 8e8331d1..9e0aedc3 100644 --- a/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript +++ b/Configuration/TypoScript/TrackingObjects/MicrosoftStream.typoscript @@ -1,8 +1,12 @@ plugin.tx_cookieman.settings.trackingObjects { MicrosoftStream { - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # no example available yet. We are happy to receive a pull request if you have one. diff --git a/Configuration/TypoScript/TrackingObjects/Slideshare.typoscript b/Configuration/TypoScript/TrackingObjects/Slideshare.typoscript index 17e547ef..229c60af 100644 --- a/Configuration/TypoScript/TrackingObjects/Slideshare.typoscript +++ b/Configuration/TypoScript/TrackingObjects/Slideshare.typoscript @@ -1,12 +1,16 @@ plugin.tx_cookieman.settings.trackingObjects { Slideshare { - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( # You would use your own JavaScript to transform your placeholder elements into this: -# +# # ) show { @@ -17,7 +21,7 @@ plugin.tx_cookieman.settings.trackingObjects { type = cookie_http+html provider = Slideshare } - + UIDR { duration = 2 durationUnit = years diff --git a/Configuration/TypoScript/TrackingObjects/Youtube.typoscript b/Configuration/TypoScript/TrackingObjects/Youtube.typoscript index 0705361f..271f4dfa 100644 --- a/Configuration/TypoScript/TrackingObjects/Youtube.typoscript +++ b/Configuration/TypoScript/TrackingObjects/Youtube.typoscript @@ -1,12 +1,16 @@ plugin.tx_cookieman.settings.trackingObjects { YouTube { - inject ( - - ) + inject = TEXT + inject { + insertData = 1 + value ( + + ) + } # example: # inject ( -# We are planning to support Youtube out-of-the-box with cookieman. Stay tuned. -# Until then please add your own logic (e.g. replacing your consent message including a +# We are planning to support Youtube out-of-the-box with cookieman. Stay tuned. +# Until then please add your own logic (e.g. replacing your consent message including a #
should have class="accordion"; due to incompatiblity with bootstrap_package @@ -38,48 +38,48 @@
{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.name')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.purpose')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.duration')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.type')}{f:translate(key: 'LLL:EXT:cookieman/Resources/Private/Language/locallang.xlf:tableheader.provider')}{f:translate(key: 'tableheader.name', extensionName: 'cookieman')}{f:translate(key: 'tableheader.purpose', extensionName: 'cookieman')}{f:translate(key: 'tableheader.duration', extensionName: 'cookieman')}{f:translate(key: 'tableheader.type', extensionName: 'cookieman')}{f:translate(key: 'tableheader.provider', extensionName: 'cookieman')}
- - - - - + + + + + + arguments="{_all}"/>
{f:translate(key: 'tableheader.name')}{f:translate(key: 'tableheader.purpose')}{f:translate(key: 'tableheader.duration')}{f:translate(key: 'tableheader.type')}{f:translate(key: 'tableheader.provider')}{f:translate(key: 'tableheader.name', extensionName: 'cookieman')}{f:translate(key: 'tableheader.purpose', extensionName: 'cookieman')}{f:translate(key: 'tableheader.duration', extensionName: 'cookieman')}{f:translate(key: 'tableheader.type', extensionName: 'cookieman')}{f:translate(key: 'tableheader.provider', extensionName: 'cookieman')}
@@ -97,21 +97,22 @@