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

11 files changed, 19 insertions, 19 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 47b33fe9d4..a99ee07929 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -403,7 +403,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $form = new FormDefaultSettings();
 
         /**
-         * Triggered on initialization of the form to customize default Piwik settings (at the end of the installation process).
+         * Triggered on initialization of the form to customize default Matomo settings (at the end of the installation process).
          *
          * @param \Piwik\Plugins\Installation\FormDefaultSettings $form
          */
@@ -414,7 +414,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         if ($form->validate()) {
             try {
                 /**
-                 * Triggered on submission of the form to customize default Piwik settings (at the end of the installation process).
+                 * Triggered on submission of the form to customize default Matomo settings (at the end of the installation process).
                  *
                  * @param \Piwik\Plugins\Installation\FormDefaultSettings $form
                  */
@@ -451,7 +451,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     /**
      * This controller action renders an admin tab that runs the installation
      * system check, so people can see if there are any issues w/ their running
-     * Piwik installation.
+     * Matomo installation.
      *
      * This admin tab is only viewable by the Super User.
      */
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 8d04cf0481..9364f49870 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -153,7 +153,7 @@ class FormDatabaseSetup extends QuickForm2
 /**
  * Validation rule that checks that the supplied DB user has enough privileges.
  *
- * The following privileges are required for Piwik to run:
+ * The following privileges are required for Matomo to run:
  * - CREATE
  * - ALTER
  * - SELECT
@@ -229,7 +229,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule
     }
 
     /**
-     * Returns an array describing the database privileges required for Piwik to run. The
+     * Returns an array describing the database privileges required for Matomo to run. The
      * array maps privilege names with one or more SQL queries that can be used to test
      * if the current user has the privilege.
      *
@@ -262,7 +262,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule
     }
 
     /**
-     * Returns a string description of the database privileges required for Piwik to run.
+     * Returns a string description of the database privileges required for Matomo to run.
      *
      * @return string
      */
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index b6be3f4f92..9793af9a56 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -59,7 +59,7 @@ class FormSuperUser extends QuickForm2
             ));
 
         $professionalServicesNewsletter = Piwik::translate('Installation_ProfessionalServicesNewsletter',
-            array("<a href='https://piwik.org/support/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
+            array("<a href='https://matomo.org/support/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
         );
 
         $currentLanguage = StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage();
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 758d0dc0f6..a9e19b38d2 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -64,7 +64,7 @@ class Installation extends \Piwik\Plugin
         $general = Config::getInstance()->General;
 
         if (!SettingsPiwik::isPiwikInstalled() && !$general['enable_installer']) {
-            throw new \Exception('Piwik is not set up yet');
+            throw new \Exception('Matomo is not set up yet');
         }
 
         if (empty($general['installation_in_progress'])) {
diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php
index 1207024bfd..9118894efb 100644
--- a/plugins/Installation/ServerFilesGenerator.php
+++ b/plugins/Installation/ServerFilesGenerator.php
@@ -89,7 +89,7 @@ class ServerFilesGenerator
     {
         $file = $path . '/.htaccess';
 
-        $content = "# This file is auto generated by Piwik, do not edit directly\n# Please report any issue or improvement directly to the Piwik team.\n\n" . $content;
+        $content = "# This file is auto generated by Matomo, do not edit directly\n# Please report any issue or improvement directly to the Matomo team.\n\n" . $content;
         if ($overwrite || !file_exists($file)) {
             @file_put_contents($file, $content);
         }
@@ -279,7 +279,7 @@ HTACCESS_ALLOW;
     }
 
     /**
-     * Deletes all existing .htaccess files and web.config files that Piwik may have created,
+     * Deletes all existing .htaccess files and web.config files that Matomo may have created,
      */
     public static function deleteHtAccessFiles()
     {
diff --git a/plugins/Installation/Widgets/GetSystemCheck.php b/plugins/Installation/Widgets/GetSystemCheck.php
index a3a4cd60be..8dd73aaae7 100644
--- a/plugins/Installation/Widgets/GetSystemCheck.php
+++ b/plugins/Installation/Widgets/GetSystemCheck.php
@@ -30,7 +30,7 @@ class GetSystemCheck extends Widget
 
     public static function configure(WidgetConfig $config)
     {
-        $config->setCategoryId('About Piwik');
+        $config->setCategoryId('About Matomo');
         $config->setName('Installation_SystemCheck');
         $config->setOrder(16);
 
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 59191eff1e..1be63b10b1 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -11,8 +11,8 @@
         {{ 'Installation_CollaborativeProject'|translate }}
     </p>
     <p>
-        {{ 'Installation_GetInvolved'|translate('<a  rel="noreferrer"  target="_blank" href="https://piwik.org/get-involved/">','</a>')|raw }}
-        {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://piwik.org/translations/\'>","<\/a>")|raw }}
+        {{ 'Installation_GetInvolved'|translate('<a  rel="noreferrer"  target="_blank" href="https://matomo.org/get-involved/">','</a>')|raw }}
+        {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://matomo.org/translations/\'>","<\/a>")|raw }}
     </p>
     <p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p>
     <p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p>
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index df9e7a538f..ff227761df 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="robots" content="noindex,nofollow">
-    <title>Piwik {{ piwikVersion }} &rsaquo; {{ 'Installation_Installation'|translate }}</title>
+    <title>Matomo {{ piwikVersion }} &rsaquo; {{ 'Installation_Installation'|translate }}</title>
 
     <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getInstallationCss"/>
     <script type="text/javascript" src="index.php?module=Installation&action=getInstallationJs"></script>
@@ -16,7 +16,7 @@
 
     <div class="header">
         <div class="logo">
-            <img title="Piwik {{ piwikVersion }} - {{ 'General_OpenSourceWebAnalytics'|translate|escape('html_attr') }}" src="plugins/Morpheus/images/logo.png"/>
+            <img title="Matomo {{ piwikVersion }} - {{ 'General_OpenSourceWebAnalytics'|translate|escape('html_attr') }}" src="plugins/Morpheus/images/logo.png"/>
             <p>{{ 'General_OpenSourceWebAnalytics'|translate }}</p>
         </div>
         <div class="language-selector">
diff --git a/plugins/Installation/templates/reuseTables.twig b/plugins/Installation/templates/reuseTables.twig
index 3e90d026fb..28ac5d0e11 100644
--- a/plugins/Installation/templates/reuseTables.twig
+++ b/plugins/Installation/templates/reuseTables.twig
@@ -25,7 +25,7 @@
             <ul>
                 <li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
                 <li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
-                <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
+                <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
                 <li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
                 <li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
             </ul>
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index acdb965a81..d7b5c4b9a9 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -23,7 +23,7 @@
     {% if not showNextStep %}
         <p>
             <span class="icon-export"></span>
-            <a href="?module=Proxy&action=redirect&url=https://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
+            <a href="?module=Proxy&action=redirect&url=https://matomo.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
         </p>
         {% include "@Installation/_systemCheckLegend.twig" %}
     {% endif %}
diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig
index f51f74383a..e3ecf9db16 100644
--- a/plugins/Installation/templates/trackingCode.twig
+++ b/plugins/Installation/templates/trackingCode.twig
@@ -12,10 +12,10 @@
 
     <h3>{{ 'Installation_LargePiwikInstances'|translate }}</h3>
     <p>
-        {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }}
+        {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/setup-auto-archiving/">','</a>')|raw }}
     </p>
     <p>
-        {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/optimize/">','</a>')|raw }}
+        {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/optimize/">','</a>')|raw }}
     </p>
 
 {% endblock %}