Further Piwik.org => Matomo.org replacements (#12415)

* renaming more Piwik mentions

* some more updates

* fix some tests

* support matomo partially as require string

* fix tests

* fix failing system test

* fix tests

* fix system test

* fix test

4 files changed, 4 insertions, 4 deletions

diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php
index c97746330a..9e1c473ebb 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariables.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariables.php
@@ -21,7 +21,7 @@ class GetCustomVariables extends Base
         $this->dimension     = new CustomVariableName();
         $this->name          = Piwik::translate('CustomVariables_CustomVariables');
         $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation',
-                               array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer"  target="_blank">', '</a>'));
+                               array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer"  target="_blank">', '</a>'));
         $this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId';
         $this->order = 10;
 
diff --git a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
index 44c63fd2d5..397aa911a8 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
@@ -20,7 +20,7 @@ class GetCustomVariablesValuesFromNameId extends Base
         $this->dimension     = new CustomVariableValue();
         $this->name          = Piwik::translate('CustomVariables_CustomVariables');
         $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation',
-            array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer"  target="_blank">', '</a>'));
+            array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer"  target="_blank">', '</a>'));
         $this->isSubtableReport = true;
         $this->order = 15;
     }
diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
index 286ec3d064..9c6b184204 100644
--- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
+++ b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
@@ -1,7 +1,7 @@
 <div class="manageCustomVars">
     <div piwik-content-intro>
         <h2 piwik-enriched-headline
-             help-url="https://piwik.org/docs/custom-variables/">
+             help-url="https://matomo.org/docs/custom-variables/">
             {{ 'CustomVariables_CustomVariables'|translate }}
         </h2>
 
diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json
index 1ecccedc5a..39c22ba1e2 100644
--- a/plugins/CustomVariables/lang/en.json
+++ b/plugins/CustomVariables/lang/en.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Custom Variable value",
         "CustomVariables": "Custom Variables",
         "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s",
-        "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!",
+        "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://matomo.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!",
         "ScopePage": "scope page",
         "ScopeVisit": "scope visit",
         "ScopeConversion": "scope conversion",