Merge pull request #886 from matomo-org/PG-3818-textual-changes

Textual changes for Event value and default Matomo tag name, #PG-3818, #PG-3856
matomo-org · Sep 20, 2024 · 961de62 · 961de62
2 parents 6e83cfe + 91aa7b3
commit 961de62
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/API.php b/API.php
@@ -434,7 +434,7 @@ public function createDefaultContainerForSite($idSite)
             'idContainer' => $idContainer,
             'idContainerVersion' => $draftVersion,
             'type' => MatomoTag::ID,
-            'name' => Piwik::translate('TagManager_PageViewTriggerName'),
+            'name' => Piwik::translate('TagManager_MatomoTagName'),
             'fireTriggerIds' => array($idTrigger),
             'parameters' => array(
                 MatomoTag::PARAM_MATOMO_CONFIG => '{{'. Piwik::translate('TagManager_MatomoConfigurationVariableName').'}}'

diff --git a/Template/Tag/MatomoTag.php b/Template/Tag/MatomoTag.php
@@ -192,7 +192,8 @@ public function getParameters()
             $this->makeSetting('eventValue', '', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
                 $field->title = Piwik::translate('TagManager_EventValue');
                 $field->customFieldComponent = self::FIELD_VARIABLE_COMPONENT;
-                $field->description = Piwik::translate('TagManager_EventValueHelp');
+                $field->description = Piwik::translate('TagManager_EventValueDescription');
+                $field->inlineHelp = '<br>' . Piwik::translate('TagManager_EventValueInlineHelp', array('<strong>', '</strong>'));
                 $field->condition = 'trackingType == "event"';
                 $field->validators[] = new CharacterLength(0, 500);
                 $field->validators[] = new Numeric(true, true);

diff --git a/lang/en.json b/lang/en.json
@@ -394,6 +394,8 @@
         "EventNameHelp": "The event's object Name, for example a particular Movie name, or Song name, or File name…",
         "EventValue": "Event Value",
         "EventValueHelp": "The event's value, for example \"50\" as in user has stayed on the website for 50 seconds.",
+        "EventValueDescription": "Specify a value or choose a variable.",
+        "EventValueInlineHelp": "%1$sNote:%2$s The value must be %1$snumeric%2$s. Negative values are allowed but non-numeric values will automatically be replaced with 0.",
         "EventValueException": "The event value can only include numeric values and variables.",
         "Except": "Except",
         "ExportDraft": "Export draft",

diff --git a/tests/System/expected/test___TagManager.exportContainerVersion_site_default_container.xml b/tests/System/expected/test___TagManager.exportContainerVersion_site_default_container.xml
@@ -26,7 +26,7 @@
 		<row>
 			<idtag>31</idtag>
 			<type>Matomo</type>
-			<name>Pageview</name>
+			<name>Matomo Analytics</name>
 			<description />
 			<status>active</status>
 			<parameters>

diff --git a/tests/System/expected/test_webContext__TagManager.getAvailableTagTypesInContext.xml b/tests/System/expected/test_webContext__TagManager.getAvailableTagTypesInContext.xml
@@ -459,8 +459,8 @@
 						<uiControlAttributes>
 						</uiControlAttributes>
 						<availableValues />
-						<description>The event's value, for example &quot;50&quot; as in user has stayed on the website for 50 seconds.</description>
-						<inlineHelp />
+						<description>Specify a value or choose a variable.</description>
+						<inlineHelp>&lt;br&gt;&lt;strong&gt;Note:&lt;/strong&gt; The value must be &lt;strong&gt;numeric&lt;/strong&gt;. Negative values are allowed but non-numeric values will automatically be replaced with 0.</inlineHelp>
 						<introduction />
 						<condition>trackingType == &quot;event&quot;</condition>
 						<fullWidth>0</fullWidth>