From 82a9b1b0a01dc20928d50134233e167f0116472d Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Thu, 11 Jan 2018 07:45:20 +1300
Subject: 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
---
 plugins/SitesManager/templates/_displayJavascriptCode.twig        | 8 ++++----
 plugins/SitesManager/templates/siteWithoutData.twig               | 6 +++---
 plugins/SitesManager/templates/sites-manager-header.html          | 2 +-
 .../expected/test_SitesManager__SitesManager.getSiteSettings.xml  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/SitesManager')

diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 6425e1fc41..aad6523a4b 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -3,7 +3,7 @@
 <div class='trackingHelp'>
     <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
 
-    <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+    <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
 
     <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
 
@@ -11,7 +11,7 @@
 
     <pre piwik-select-on-focus>{{ jsTag|raw }}</pre>
 
-    <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p>
+    <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/javascript-tracking/">','</a>')|raw }}</p>
 
     {% if isInstall is defined %}
         <p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p>
@@ -21,11 +21,11 @@
 
     <h3>{{ 'SitesManager_LogAnalytics'|translate }}</h3>
 
-    <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">', '</a>')|raw }}</p>
+    <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer" target="_blank">', '</a>')|raw }}</p>
 
     <h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3>
 
-    <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://piwik.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+    <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
     <p></p>
 
 </div>
\ No newline at end of file
diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig
index a767fb3c04..2200d0900c 100644
--- a/plugins/SitesManager/templates/siteWithoutData.twig
+++ b/plugins/SitesManager/templates/siteWithoutData.twig
@@ -42,9 +42,9 @@
                 'module': 'Goals',
                 'action': 'manage',
             }) ~ '">', "</a>",
-            '<a href="https://piwik.org/features/" rel="noreferrer" target="_blank">', "</a>",
-            '<a href="https://piwik.org/docs/" rel="noreferrer" target="_blank">', "</a>",
-            '<a href="https://piwik.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }}
+            '<a href="https://matomo.org/features/" rel="noreferrer" target="_blank">', "</a>",
+            '<a href="https://matomo.org/docs/" rel="noreferrer" target="_blank">', "</a>",
+            '<a href="https://matomo.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }}
 
             <br />
             <br />
diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html
index a677cc1968..e031e4f08f 100644
--- a/plugins/SitesManager/templates/sites-manager-header.html
+++ b/plugins/SitesManager/templates/sites-manager-header.html
@@ -2,7 +2,7 @@
     <h2
             ng-show="availableTypes"
             piwik-enriched-headline
-            help-url="https://piwik.org/docs/manage-websites/"
+            help-url="https://matomo.org/docs/manage-websites/"
             feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}">
         {{ 'SitesManager_XManagement'|translate:(availableTypes.length > 1 ? ('General_Measurables'|translate) : ('SitesManager_Sites'|translate)) }}
     </h2>
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
index a0aa7be1ac..a19da6ec04 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -210,7 +210,7 @@
 					<row>Ecommerce enabled</row>
 				</availableValues>
 				<description />
-				<inlineHelp>When enabled, the &quot;Goals&quot; report will have a new &quot;Ecommerce&quot; section.&lt;br /&gt;Piwik allows for advanced Ecommerce Analytics tracking &amp; reporting. Learn more about &lt;a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'&gt; Ecommerce Analytics&lt;/a&gt;.</inlineHelp>
+				<inlineHelp>When enabled, the &quot;Goals&quot; report will have a new &quot;Ecommerce&quot; section.&lt;br /&gt;Piwik allows for advanced Ecommerce Analytics tracking &amp; reporting. Learn more about &lt;a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'&gt; Ecommerce Analytics&lt;/a&gt;.</inlineHelp>
 				<templateFile />
 				<introduction />
 				<condition />
-- 
cgit v1.2.3