Merged with 5.x-dev

matomo-org · Dec 20, 2024 · dffd7e9 · dffd7e9
2 parents e6a9920 + 23fc15f
commit dffd7e9
Show file tree

Hide file tree

Showing 46 changed files with 742 additions and 219 deletions.
diff --git a/Context/BaseContext.php b/Context/BaseContext.php
@@ -87,7 +87,10 @@ protected function generatePublicContainer($container, $release)
 
         $idSite = $container['idsite'];
         $idContainer = $container['idcontainer'];
-        $isTagFireLimitAllowedInPreviewMode = $container['isTagFireLimitAllowedInPreviewMode'] ? 1 : 0;
+        $isTagFireLimitAllowedInPreviewMode = 0;
+        if (isset($container['isTagFireLimitAllowedInPreviewMode'])) {
+            $isTagFireLimitAllowedInPreviewMode = $container['isTagFireLimitAllowedInPreviewMode'] ? 1 : 0;
+        }
         $idContainerVersion = $release['idcontainerversion'];
         $container['idcontainerversion'] = $idContainerVersion;
         $environment = $release['environment'];

diff --git a/TagManager.php b/TagManager.php
@@ -955,6 +955,7 @@ public function getClientSideTranslationKeys(&$result)
         $result[] = 'TagManager_TriggerLowercase';
         $result[] = 'TagManager_VariableLowercase';
         $result[] = 'TagManager_LearnMoreFullStop';
+        $result[] = 'TagManager_CustomHTMLTagNameInlineHelpText';
     }
 
     public function getStylesheetFiles(&$stylesheets)

diff --git a/Template/Tag/EtrackerTag.php b/Template/Tag/EtrackerTag.php
@@ -19,12 +19,6 @@ class EtrackerTag extends BaseTag
 {
     public const PARAM_ETRACKER_CONFIG = 'etrackerConfig';
 
-    public function getDescription()
-    {
-        return Piwik::translate('TagManager_EtrackerTagDescriptionNew');
-    }
-
-
     public function getIcon()
     {
         return 'plugins/TagManager/images/icons/etracker.svg';

diff --git a/Template/Variable/EtrackerConfigurationVariable.php b/Template/Variable/EtrackerConfigurationVariable.php
@@ -22,6 +22,11 @@ public function getId()
         return self::ID;
     }
 
+    public function getDescription()
+    {
+        return Piwik::translate('TagManager_EtrackerMainVariableDescription');
+    }
+
     public function getCategory()
     {
         return self::CATEGORY_OTHERS;

diff --git a/Template/Variable/PreConfigured/FormElement.php b/Template/Variable/PreConfigured/FormElement.php
@@ -13,7 +13,7 @@ class FormElement extends BaseDataLayerVariable
 {
     public function getCategory()
     {
-        return self::CATEGORY_CLICKS;
+        return self::CATEGORY_FORMS;
     }
 
     protected function getDataLayerVariableName()

diff --git a/lang/el.json b/lang/el.json
@@ -400,6 +400,7 @@
         "EtrackerConfigurationVariableTValTitle": "Μεταβλητή et_tval",
         "EtrackerConfigurationVariableTargetTitle": "Μεταβλητή et_target",
         "EtrackerConfigurationVariableTonrTitle": "Μεταβλητή et_tonr",
+        "EtrackerMainVariableDescription": "Καθορίζει την παραμετροποίηση για το eTracker Analytics για την βελτιστοποίηση της συλλογής δεδομένων.",
         "EtrackerTagAddToCartNumberDescription": "Αριθμός προϊόντων που προστέθηκαν στο καλάθι",
         "EtrackerTagAddToCartNumberTitle": "Αριθμός",
         "EtrackerTagAddToCartProductDescription": "αντικείμενο dataLayer του προϊόντος - σύμφωνα με την παραπομπή etracker",

diff --git a/lang/en.json b/lang/en.json
@@ -391,7 +391,8 @@
         "ErrorXNotWhitelisted": "The value for \"%1$s\" is not allowed, use one of: %2$s.",
         "ErrorXTooLong": "\"%1$s\" is too long, max %2$s characters are allowed.",
         "EtrackerTagName": "etracker web analysis",
-        "EtrackerTagDescriptionNew": "Defines the configuration for eTracker Analytics to optimise data collection.",
+        "EtrackerTagDescription": "etracker is a web analytics system, you can choose to send a pageview or an event.",
+        "EtrackerMainVariableDescription": "Defines the configuration for eTracker Analytics to optimise data collection.",
         "EtrackerTagHelp": "The etracker tag tracks and sends data on user interactions for pageviews or specific events.",
         "EventActionHelp": "The event's action, for example Play, Pause, Duration, Add Playlist, Downloaded, Clicked…",
         "EventCategoryHelp": "The event's category, for example Videos, Music, Games…",
@@ -1113,6 +1114,7 @@
         "CopyXDescription": "To duplicate this %1$s, select the website and container you’d like to add the %1$s to. This will create an exact copy of all settings of the %1$s.",
         "CopyXSuccess": "A copy was successfully created. %1$sNavigate to the new %2$s now%3$s.",
         "LearnMoreFullStop": "%1$sLearn more%2$s.",
+	"CustomHTMLTagNameInlineHelpText": "%1$sNote:%2$s If you are targeting users in Europe, be aware that triggering retargeting tags like Google Ads Remarketing requires user consent under GDPR. %3$sLearn more%4$s.",
         "MatomoConfigurationMatomoCustomDataTitle": "Custom Data",
         "MatomoConfigurationMatomoCustomDataDescription": "Optionally set custom data in your tracking request.",
         "MatomoConfigurationMatomoSetDownloadExtensionsTitle": "Set Download Extensions",