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, 9 insertions, 9 deletions

diff --git a/plugins/Marketplace/Widgets/GetNewPlugins.php b/plugins/Marketplace/Widgets/GetNewPlugins.php
index 0d973943cc..4f814a6d7e 100644
--- a/plugins/Marketplace/Widgets/GetNewPlugins.php
+++ b/plugins/Marketplace/Widgets/GetNewPlugins.php
@@ -29,7 +29,7 @@ class GetNewPlugins extends Widget
 
     public static function configure(WidgetConfig $config)
     {
-        $config->setCategoryId('About Piwik');
+        $config->setCategoryId('About Matomo');
         $config->setName('Latest Marketplace Updates');
         $config->setOrder(19);
     }
diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
index 5d13a83803..a928be6067 100644
--- a/plugins/Marketplace/Widgets/GetPremiumFeatures.php
+++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
@@ -31,7 +31,7 @@ class GetPremiumFeatures extends Widget
 
     public static function configure(WidgetConfig $config)
     {
-        $config->setCategoryId('About Piwik');
+        $config->setCategoryId('About Matomo');
         $config->setName(Piwik::translate('Marketplace_PaidPlugins'));
         $config->setOrder(20);
     }
diff --git a/plugins/Marketplace/templates/licenseform.twig b/plugins/Marketplace/templates/licenseform.twig
index 17cc2d2a52..ffa6da07e6 100644
--- a/plugins/Marketplace/templates/licenseform.twig
+++ b/plugins/Marketplace/templates/licenseform.twig
@@ -49,7 +49,7 @@
 
     {% else %}
         {% if isSuperUser %}
-            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
+            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/recommends/premium-plugins/'>", "</a>")|raw }}
 
             <br/>
 
@@ -60,7 +60,7 @@
             <div piwik-activity-indicator loading="licenseController.isUpdating"></div>
 
         {% else %}
-            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
+            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/recommends/premium-plugins/'>", "</a>")|raw }}
         {% endif %}
 
     {% endif %}
diff --git a/plugins/Marketplace/templates/overview.twig b/plugins/Marketplace/templates/overview.twig
index 4d20b79bd2..7237fdb914 100644
--- a/plugins/Marketplace/templates/overview.twig
+++ b/plugins/Marketplace/templates/overview.twig
@@ -70,14 +70,14 @@
         {% include '@Marketplace/plugin-list.twig' %}
 
         <div class="footer-message center">
-            {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.piwik.org/develop" target="_blank">', '</a>')|raw }}
+            {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.matomo.org/develop" target="_blank">', '</a>')|raw }}
             <br />
             <br />
             <br />
-            <a rel="noreferrer" href="https://shop.piwik.org/faq/" target="_blank">FAQ</a> |
-            <a rel="noreferrer" href="https://shop.piwik.org/terms-conditions/" target="_blank">Terms</a> |
-            <a rel="noreferrer" href="https://piwik.org/privacy-policy/" target="_blank">Privacy</a> |
-            <a rel="noreferrer" href="https://piwik.org/contact/" target="_blank">Contact</a>
+            <a rel="noreferrer" href="https://shop.matomo.org/faq/" target="_blank">FAQ</a> |
+            <a rel="noreferrer" href="https://shop.matomo.org/terms-conditions/" target="_blank">Terms</a> |
+            <a rel="noreferrer" href="https://matomo.org/privacy-policy/" target="_blank">Privacy</a> |
+            <a rel="noreferrer" href="https://matomo.org/contact/" target="_blank">Contact</a>
         </div>
 
     </div>