diff options
Diffstat (limited to 'plugins')
116 files changed, 247 insertions, 241 deletions
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index 9801005795..50f149347e 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -52,7 +52,7 @@ class Controller extends \Piwik\Plugin\Controller Piwik::checkUserHasSomeViewAccess(); $ApiDocumentation = new DocumentationGenerator(); - $prefixUrls = Common::getRequestVar('prefixUrl', 'http://demo.piwik.org/', 'string'); + $prefixUrls = Common::getRequestVar('prefixUrl', 'https://demo.matomo.org/', 'string'); if (!UrlHelper::isLookLikeUrl($prefixUrls) || strpos($prefixUrls, 'http') !== 0) { $prefixUrls = ''; } diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php index 0d031304a5..6202af89f5 100644 --- a/plugins/API/Menu.php +++ b/plugins/API/Menu.php @@ -56,7 +56,7 @@ class Menu extends \Piwik\Plugin\Menu if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) { - $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://piwik.org/mobile/')); + $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://matomo.org/mobile/')); if ($url) { $menu->addItem('Piwik Mobile App', null, $url, 4); diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 7c5a700404..4c7e9f4794 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -14,7 +14,7 @@ <p>{{ 'API_PluginDescription'|translate }}</p> <p> - {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api/reference'>","</a>")|raw }} + {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/analytics-api/reference'>","</a>")|raw }} </p> </div> <div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}"> diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php index 555e3f6bcd..826bc1262d 100644 --- a/plugins/API/tests/Integration/RssRendererTest.php +++ b/plugins/API/tests/Integration/RssRendererTest.php @@ -151,11 +151,11 @@ class RssRendererTest extends IntegrationTestCase $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?> <rss version="2.0"> <channel> - <title>piwik statistics - RSS</title> - <link>http://piwik.org</link> - <description>Piwik RSS feed</description> + <title>matomo statistics - RSS</title> + <link>https://matomo.org</link> + <description>Matomo RSS feed</description> - <generator>piwik</generator> + <generator>matomo</generator> <language>en</language> </channel> </rss>', $response); diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php index 53a2acfea6..a314ccb421 100644 --- a/plugins/Actions/Reports/GetSiteSearchKeywords.php +++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php @@ -24,7 +24,7 @@ class GetSiteSearchKeywords extends SiteSearchBase $this->dimension = new Keyword(); $this->name = Piwik::translate('Actions_WidgetSearchKeywords'); $this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>' - . '<a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; + . '<a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; $this->metrics = array('nb_visits', 'nb_pages_per_search'); $this->processedMetrics = array( new AverageTimeOnPage(), diff --git a/plugins/CoreAdminHome/javascripts/protocolCheck.js b/plugins/CoreAdminHome/javascripts/protocolCheck.js index 5bd4148e10..b1331f2162 100644 --- a/plugins/CoreAdminHome/javascripts/protocolCheck.js +++ b/plugins/CoreAdminHome/javascripts/protocolCheck.js @@ -32,7 +32,7 @@ $(document).ready(function () { '"config/config.ini.php"', '"assume_secure_protocol=1"', '"[General]"', - '<a href="?module=Proxy&action=redirect&url=https://piwik.org/faq/how-to-install/faq_98/" target="_blank">', + '<a href="?module=Proxy&action=redirect&url=https://matomo.org/faq/how-to-install/faq_98/" target="_blank">', '</a>' ]; var message = _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectly') + " " + _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectlySolution', params); diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 625b553003..18f88f25d6 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -34,14 +34,14 @@ <label for="enableBrowserTriggerArchiving2"> {{ 'General_No'|translate }} - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> + <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> </label> </p> </div><div class="col s12 m6"> <div class="form-help"> {{ 'General_ArchivingInlineHelp'|translate }} <br/> - {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} + {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} </div> </div> </div> diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index bd4cbfffa5..1ea4a0f744 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -14,7 +14,7 @@ <div piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="https://piwik.org/docs/tracking-api/" + help-url="https://matomo.org/docs/tracking-api/" rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}"> <div id="js-code-options" ng-controller="JsTrackingCodeController as jsTrackingCode"> @@ -22,11 +22,11 @@ <p> {{ 'CoreAdminHome_JSTrackingIntro1'|translate }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} <br/><br/> {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/javascript-tracking/">','</a>')|raw }} </p> <div piwik-field uicontrol="site" name="js-tracker-website" @@ -42,7 +42,7 @@ {# track across all subdomains #} <div id="jsTrackAllSubdomainsInlineHelp" class="inline-help-node"> {{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'></span>","y.<span class='current-site-host'></span>")|raw }} - {{ 'General_LearnMore'|translate(' (<a href="https://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} + {{ 'General_LearnMore'|translate(' (<a href="https://developer.matomo.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} </div> <div piwik-field uicontrol="checkbox" name="javascript-tracking-all-subdomains" @@ -185,7 +185,7 @@ {# custom campaign name/keyword query params #} <div id="jsTrackCampaignParamsInlineHelp" class="inline-help-node"> - {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://matomo.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} </div> <div piwik-field uicontrol="checkbox" name="custom-campaign-query-params-check" @@ -247,7 +247,7 @@ {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<code><noscript></noscript></code>")|raw }} </p> <p> - {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://matomo.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> {# website #} @@ -316,7 +316,7 @@ <div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}"> <p> - {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> </div> {% endblock %} diff --git a/plugins/CoreConsole/Commands/GenerateAngularComponent.php b/plugins/CoreConsole/Commands/GenerateAngularComponent.php index 6342b78240..081da16b00 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularComponent.php +++ b/plugins/CoreConsole/Commands/GenerateAngularComponent.php @@ -68,7 +68,7 @@ class GenerateAngularComponent extends GenerateAngularConstructBase sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName), sprintf('<comment>%1$s%2$s</comment>', $pluginPath, $js1), sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1), - 'If you are not familiar with this have a look at <comment>http://developer.piwik.org/guides/working-with-piwiks-ui</comment>' + 'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>' )); } }
\ No newline at end of file diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php index 27fb7a65e0..c5c0a767c7 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php +++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php @@ -72,7 +72,7 @@ class GenerateAngularDirective extends GenerateAngularConstructBase sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName), sprintf('<comment>%1$s%2$s</comment>, <comment>%1$s%3$s</comment>', $pluginPath, $js1, $js2), sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1), - 'If you are not familiar with this have a look at <comment>https://developer.piwik.org/guides/working-with-piwiks-ui</comment>' + 'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>' )); } } diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 17d1795db5..a214a40a5f 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -84,13 +84,13 @@ class GeneratePlugin extends GeneratePluginBase if ($isTheme) { $this->writeSuccessMessage($output, array( sprintf('Theme %s %s generated.', $pluginName, $version), - 'If you have not done yet check out our Theming guide <comment>https://developer.piwik.org/guides/theming</comment>', + 'If you have not done yet check out our Theming guide <comment>https://developer.matomo.org/guides/theming</comment>', 'Enjoy!' )); } else { $this->writeSuccessMessage($output, array( sprintf('Plugin %s %s generated.', $pluginName, $version), - 'Our developer guides will help you developing this plugin, check out <comment>https://developer.piwik.org/guides</comment>', + 'Our developer guides will help you developing this plugin, check out <comment>https://developer.matomo.org/guides</comment>', 'To see a list of available generators execute <comment>./console list generate</comment>', 'Enjoy!' )); diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php index c04c30cd55..2b603aa1fa 100644 --- a/plugins/CoreConsole/Commands/GenerateWidget.php +++ b/plugins/CoreConsole/Commands/GenerateWidget.php @@ -49,7 +49,7 @@ class GenerateWidget extends GeneratePluginBase $replace = array('ExamplePlugin' => $pluginName, 'MyExampleWidget' => $widgetClass, 'Example Widget Name' => $this->makeTranslationIfPossible($pluginName, $widgetName), - 'About Piwik' => $category); + 'About Matomo' => $category); $whitelistFiles = array('/Widgets', '/Widgets/MyExampleWidget.php'); $this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles); diff --git a/plugins/CoreHome/Widgets/GetDonateForm.php b/plugins/CoreHome/Widgets/GetDonateForm.php index 044a6897c3..f8188596f2 100644 --- a/plugins/CoreHome/Widgets/GetDonateForm.php +++ b/plugins/CoreHome/Widgets/GetDonateForm.php @@ -29,7 +29,7 @@ class GetDonateForm extends Widget public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('CoreHome_SupportPiwik'); $config->setOrder(5); } diff --git a/plugins/CoreHome/Widgets/GetPromoVideo.php b/plugins/CoreHome/Widgets/GetPromoVideo.php index 5ceef91f84..63e4c776d0 100644 --- a/plugins/CoreHome/Widgets/GetPromoVideo.php +++ b/plugins/CoreHome/Widgets/GetPromoVideo.php @@ -27,7 +27,7 @@ class GetPromoVideo extends Widget public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('Installation_Welcome'); $config->setOrder(10); } diff --git a/plugins/CoreHome/Widgets/GetSystemSummary.php b/plugins/CoreHome/Widgets/GetSystemSummary.php index a90d7b0586..a4c1a4d128 100644 --- a/plugins/CoreHome/Widgets/GetSystemSummary.php +++ b/plugins/CoreHome/Widgets/GetSystemSummary.php @@ -38,7 +38,7 @@ class GetSystemSummary extends Widget public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('CoreHome_SystemSummaryWidget'); $config->setOrder(15); $config->setIsEnabled(Piwik::hasUserSuperUserAccess()); diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 2bc8361875..c31b8b1e8c 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1847,7 +1847,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { }, handleSummaryRow: function (domElem) { - var details = _pk_translate('General_LearnMore', [' (<a href="https://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); + var details = _pk_translate('General_LearnMore', [' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); domElem.find('tr.summaryRow').each(function () { var labelSpan = $(this).find('.label .value'); diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig index 47b06c7cc3..67c9c2aab8 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig @@ -6,7 +6,7 @@ <p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'> {{'General_PoweredBy'|translate}} - <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> <br /> {{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }} </p> diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index fff06f2cc1..3d0c428e8e 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -5,7 +5,7 @@ {% else %} <p>{{ 'CoreHome_DonateCall1'|translate }}</p> <p><strong>{{ 'CoreHome_DonateCall2'|translate }}</strong></p> - <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://piwik.org/recommends/premium-plugins/"><strong>', '</strong></a>')|raw }}</p> + <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://matomo.org/recommends/premium-plugins/"><strong>', '</strong></a>')|raw }}</p> {% endif %} </div> diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 323383ad55..b14cc6ea0a 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -1,7 +1,7 @@ {# testing, remove test_ from var names #} {% set test_latest_version_available="4.0.0" %} -{% set test_piwikUrl='http://demo.piwik.org/' %} -{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/' }}{% endset %} +{% set test_piwikUrl='https://demo.matomo.org/' %} +{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/' }}{% endset %} {% set updateCheck %} <span id="updateCheckLinkContainer"> @@ -30,14 +30,14 @@ <div class="dropdown positionInViewport"> {% if latest_version_available and isSuperUser %} {% if isMultiServerEnvironment %} - {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} + {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://matomo.org/changelog/' target='_blank'>","</a>")|raw }} {% endif %} <br /> {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %} {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} <br /> {% endif %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index 1caf03b791..86d1247967 100644 --- a/plugins/CoreHome/templates/_warningInvalidHost.twig +++ b/plugins/CoreHome/templates/_warningInvalidHost.twig @@ -1,7 +1,7 @@ {# untrusted host warning #} {% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %} {% set invalidHostText %} - <a class="btn btn-link" style="float:right;" href="https://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> + <a class="btn btn-link" style="float:right;" href="https://matomo.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> <span class="icon-help"></span> {{ 'General_Help'|translate }} </a> diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index 3b911b63ed..8da27c773a 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -8,7 +8,7 @@ </div> </div> - <a id="piwik-promo-videos-link" href="https://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> + <a id="piwik-promo-videos-link" href="https://matomo.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> {{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }} </a> diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index b3ceafe741..f7c9dc7785 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -145,7 +145,9 @@ {% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [ 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/', - 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/' + 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/', + 'http://matomo.org', 'http://www.matomo.org', 'http://matomo.org/', 'http://www.matomo.org/', + 'https://matomo.org', 'https://www.matomo.org', 'https://matomo.org/', 'https://www.matomo.org/' ] %} <span class="plugin-homepage"> <a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': ' '})|raw }})</a> diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 6caf7cafc9..7f6e062a66 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -74,7 +74,7 @@ class CoreUpdater extends \Piwik\Plugin if ($updater->getComponentUpdates() !== null) { if (FrontController::shouldRethrowException()) { throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n" . - "--> Please run the update process first. See documentation: https://piwik.org/docs/update/ \n"); + "--> Please run the update process first. See documentation: https://matomo.org/docs/update/ \n"); } elseif ($module === 'API') { $outputFormat = strtolower(Common::getRequestVar('format', 'xml', 'string', $_GET + $_POST)); diff --git a/plugins/CoreUpdater/ReleaseChannel.php b/plugins/CoreUpdater/ReleaseChannel.php index 23c84971a4..815438ff08 100644 --- a/plugins/CoreUpdater/ReleaseChannel.php +++ b/plugins/CoreUpdater/ReleaseChannel.php @@ -40,6 +40,6 @@ abstract class ReleaseChannel extends BaseReleaseChannel public function getDownloadUrlWithoutScheme($version) { - return sprintf('://builds.piwik.org/piwik-%s.zip', $version); + return sprintf('://builds.matomo.org/piwik-%s.zip', $version); } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/ReleaseChannel/LatestStable.php b/plugins/CoreUpdater/ReleaseChannel/LatestStable.php index 1a7088ab10..935da67da7 100644 --- a/plugins/CoreUpdater/ReleaseChannel/LatestStable.php +++ b/plugins/CoreUpdater/ReleaseChannel/LatestStable.php @@ -30,7 +30,7 @@ class LatestStable extends ReleaseChannel public function getDownloadUrlWithoutScheme($version) { - return '://builds.piwik.org/piwik.zip'; + return '://builds.matomo.org/piwik.zip'; } public function getOrder() diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php index f8db4e1d49..604c0c6e9e 100644 --- a/plugins/CoreUpdater/SystemSettings.php +++ b/plugins/CoreUpdater/SystemSettings.php @@ -84,11 +84,11 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings }; $field->inlineHelp = Piwik::translate('CoreAdminHome_DevelopmentProcess', - array("<a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>", "</a>")) . Piwik::translate('<br/>') . Piwik::translate('CoreAdminHome_StableReleases', - array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", "</a>")) . Piwik::translate('<br />') . Piwik::translate('CoreAdminHome_LtsReleases'); diff --git a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php index 13b2422be5..f26cec94de 100644 --- a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php +++ b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php @@ -50,7 +50,7 @@ class ReleaseChannelTest extends IntegrationTestCase public function test_getDownloadUrlWithoutScheme_shouldReturnUrlWithVersionNumberButWithoutScheme() { - $this->assertSame('://builds.piwik.org/piwik-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5')); + $this->assertSame('://builds.matomo.org/piwik-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5')); } public function test_getUrlToCheckForLatestAvailableVersion() @@ -62,7 +62,7 @@ class ReleaseChannelTest extends IntegrationTestCase $urlToCheck = $this->channel->getUrlToCheckForLatestAvailableVersion(); - $this->assertStringStartsWith("http://api.piwik.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck); + $this->assertStringStartsWith("http://api.matomo.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck); } public function test_doesPreferStable() diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php index 34870e4f2f..b031538134 100644 --- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php @@ -77,12 +77,12 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable CoreUpdater_ViewVersionChangelog -https://piwik.org/changelog/piwik-33-0-0/ +https://matomo.org/changelog/piwik-33-0-0/ CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -https://piwik.org/contact/"; +https://matomo.org/contact/"; $this->assertEmailForVersion('33.0.0', $message); } @@ -100,7 +100,7 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -https://piwik.org/contact/"; +https://matomo.org/contact/"; $this->assertEmailForVersion('33.0.0-b1', $message); } diff --git a/plugins/CoreUpdater/Test/Mock/UpdaterMock.php b/plugins/CoreUpdater/Test/Mock/UpdaterMock.php index c72510e006..d0089e08fb 100644 --- a/plugins/CoreUpdater/Test/Mock/UpdaterMock.php +++ b/plugins/CoreUpdater/Test/Mock/UpdaterMock.php @@ -36,7 +36,7 @@ class UpdaterMock extends Updater public function getArchiveUrl($version, $https = true) { - return 'http://builds.piwik.org/piwik.zip'; + return 'http://builds.matomo.org/piwik.zip'; } public function updatePiwik($https = true) diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index def5f97a2a..35b0971a7b 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -87,7 +87,7 @@ class UpdateCommunication $message .= "\n\n"; $message .= Piwik::translate('CoreUpdater_FeedbackRequest'); $message .= "\n"; - $message .= 'https://piwik.org/contact/'; + $message .= 'https://matomo.org/contact/'; $this->sendEmailNotification($subject, $message); } @@ -96,7 +96,7 @@ class UpdateCommunication { $version = str_replace('.', '-', $version); - $link = sprintf('https://piwik.org/changelog/piwik-%s/', $version); + $link = sprintf('https://matomo.org/changelog/piwik-%s/', $version); return $link; } diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 4afc51ac17..0d9f608822 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -1,6 +1,6 @@ {% extends '@CoreUpdater/layout.twig' %} {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% block content %} @@ -24,7 +24,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/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 679b56e254..64155b0372 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -11,7 +11,7 @@ <div class="content" style="text-align:left;"> {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% if coreError %} @@ -61,7 +61,7 @@ {% endif %} <h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2> - <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://piwik.org/support/upgrading-piwik/'>", "</a>")|raw }}</p> + <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p> <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2> <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p> diff --git a/plugins/CoreUpdater/templates/updateHttpError.twig b/plugins/CoreUpdater/templates/updateHttpError.twig index 74f1d4ff7c..7666bb3d52 100644 --- a/plugins/CoreUpdater/templates/updateHttpError.twig +++ b/plugins/CoreUpdater/templates/updateHttpError.twig @@ -18,7 +18,7 @@ </div> <p> - {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/update/'>","</a>")|raw }} + {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/update/'>","</a>")|raw }} </p> </div> diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig index d1897777d9..7642cd54f8 100644 --- a/plugins/CoreUpdater/templates/updateSuccess.twig +++ b/plugins/CoreUpdater/templates/updateSuccess.twig @@ -24,7 +24,7 @@ <div class="row"> <div class="col s5 offset-s1"> - <a href="https://piwik.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a> + <a href="https://matomo.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a> </div> <div class="col s5"> <a href="https://www.innocraft.cloud/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a> diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 097b3454fdf99554a5ba1bca102c0a2de728e90 +Subproject baa5d8e2e7fa7f600861a9e01e5f10b8c2997ce 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", diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 08b900ecf1..a3f9e80897 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -9,7 +9,7 @@ </h2> <p> {{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/> - {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} + {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>Matomo Auto Archiving</a>")|raw }} </p> </div> diff --git a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php index 15bf5d83df..1064cf9d3d 100644 --- a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php +++ b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php @@ -78,7 +78,7 @@ class LoadDataInfileCheck implements Diagnostic '<br/><strong>%s:</strong> %s<br/>%s', $this->translator->translate('General_Error'), $errorMessage, - 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>' + 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/troubleshooting/%23faq_194">FAQ on matomo.org</a>' ); } diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json index 544965416e..11fe754447 100644 --- a/plugins/ExampleAPI/plugin.json +++ b/plugins/ExampleAPI/plugin.json @@ -1,15 +1,15 @@ { "name": "ExampleAPI", - "description": "Piwik Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.", + "description": "Matomo Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.", "version": "1.0", "keywords": ["example", "api"], - "homepage": "https://piwik.org", + "homepage": "https://matomo.org", "license": "GPL v3+", "authors": [ { - "name": "Piwik", - "email": "hello@piwik.org", - "homepage": "https://piwik.org" + "name": "Matomo", + "email": "hello@matomo.org", + "homepage": "https://matomo.org" } ] }
\ No newline at end of file diff --git a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php index 2ca69752d8..4d055cd0b6 100644 --- a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php +++ b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php @@ -26,7 +26,7 @@ class MyExampleWidget extends Widget * Set the category the widget belongs to. You can reuse any existing widget category or define * your own category. */ - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); /** * Set the subcategory the widget belongs to. If a subcategory is set, the widget will be shown in the UI. diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json index 1fa9d6c281..7b9a922708 100644 --- a/plugins/ExampleVisualization/plugin.json +++ b/plugins/ExampleVisualization/plugin.json @@ -1,16 +1,16 @@ { "name": "ExampleVisualization", "version": "0.1.0", - "description": "Piwik Platform showcase: how to create a new custom data visualization.", + "description": "Matomo Platform showcase: how to create a new custom data visualization.", "theme": false, "license": "GPL v3+", "keywords": ["SimpleTable"], - "homepage": "https://piwik.org", + "homepage": "https://matomo.org", "authors": [ { - "name": "The Piwik Team", - "email": "hello@piwik.org", - "homepage": "https://piwik.org" + "name": "The Matomo Team", + "email": "hello@matomo.org", + "homepage": "https://matomo.org" } ] }
\ No newline at end of file diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig index d90c1caebe..1399052957 100644 --- a/plugins/Feedback/templates/index.twig +++ b/plugins/Feedback/templates/index.twig @@ -1,7 +1,7 @@ {% extends 'dashboard.twig' %} -{% set test_piwikUrl='http://demo.piwik.org/' %} -{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/'}}{% endset %} +{% set test_piwikUrl='http://demo.matomo.org/' %} +{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/'}}{% endset %} {% set headline %}{{ 'General_AboutPiwikX'|translate(piwikVersion) }}{% endset %} @@ -12,22 +12,22 @@ content-title="{{ headline|e('html_attr') }}" feature="{{ 'General_Help'|translate|e('html_attr') }}"> <p>{{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate( - "<a href='?module=Proxy&action=redirect&url=https://piwik.org' target='_blank'>", + "<a href='?module=Proxy&action=redirect&url=https://matomo.org' target='_blank'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/get-involved/'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/get-involved/'>", "</a>", "<a href='#donate'>", "</a>", - "<a href='?module=Proxy&action=redirect&url=https://piwik.org/team/' target='_blank'>", + "<a href='?module=Proxy&action=redirect&url=https://matomo.org/team/' target='_blank'>", "</a>" )|raw }} </p> </div> <div piwik-content-block content-title="{{ 'Feedback_CommunityHelp'|translate|e('html_attr') }}"> - <p> • {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/'>","</a>")|raw }}.</p> - <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/faq/'>","</a>")|raw }}.</p> - <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://forum.piwik.org/'>","</a>")|raw }}.</p> + <p> • {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/'>","</a>")|raw }}.</p> + <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/faq/'>","</a>")|raw }}.</p> + <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://forum.matomo.org/'>","</a>")|raw }}.</p> <p> • {{ 'API_LearnAboutCommonlyUsedTerms'|translate( '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#metrics">' ~ 'General_Metrics'|translate ~ '</a>', '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw @@ -42,11 +42,11 @@ <p> • {{ 'Feedback_ProfessionalServicesOptimizationMaintenance'|translate }}</p> <p> • {{ 'Feedback_ProfessionalServicesPhoneEmailSupport'|translate }}</p> <p> • {{ 'Feedback_ProfessionalServicesTraining'|translate }}</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/premium-plugins'>{{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</a></p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/premium-plugins'>{{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</a></p> <p> • {{ 'Feedback_ProfessionalServicesCustomDevelopment'|translate }}</p> <p> • {{ 'Feedback_ProfessionalServicesAnalystConsulting'|translate }}</p> - <form target="_blank" action="https://piwik.org/support/"> + <form target="_blank" action="https://matomo.org/support/"> <input type="hidden" name="pk_campaign" value="App_Help"> <input type="hidden" name="pk_source" value="Piwik_App"> <input type="hidden" name="pk_medium" value="App_ContactUs_button"> @@ -57,27 +57,27 @@ <div piwik-content-block content-title="Premium products"> <p>Grow your business, understand your audience better and increase your sales and conversions with a premium plugin: - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/users-flow/'>Users Flow</a>: a visual representation of the most popular paths your users take through your website or app.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/ab-testing-learn-more/'>A/B Testing</a>: compare different versions of your websites or apps and detect the winning variation.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/conversion-funnels'>Funnels</a>: identify and understand where your visitors drop off in your conversion funnels.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/form-analytics/'>Form Analytics</a>: increase conversions and get better leads from your website forms.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/media-analytics-website/'>Video and Audio Analytics</a>: powerful insights into how your audience watches your videos and listens to your audio.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/roll-up-reporting/'>Roll-Up Reporting</a>: aggregate data from multiple websites, apps and shops into a Roll-Up site to gain new insights.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/search-keywords-performance/'>Search Keywords Performance</a>: all keywords searched by your users on Google+Bing+Yahoo into your Piwik reports.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/activity-log/'>Audit log</a>: better security and problem diagnostic with a detailed audit log of Piwik user activities.</p> - <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/white-label/'>White Label</a>: give your clients access to their analytics reports where all Piwik-branded widgets are removed.</p> - <p> • <strong><a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/premium-plugins'>All premium plugins.</a></strong></p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/users-flow/'>Users Flow</a>: a visual representation of the most popular paths your users take through your website or app.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/ab-testing-learn-more/'>A/B Testing</a>: compare different versions of your websites or apps and detect the winning variation.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/conversion-funnels'>Funnels</a>: identify and understand where your visitors drop off in your conversion funnels.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/form-analytics/'>Form Analytics</a>: increase conversions and get better leads from your website forms.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/media-analytics-website/'>Video and Audio Analytics</a>: powerful insights into how your audience watches your videos and listens to your audio.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/roll-up-reporting/'>Roll-Up Reporting</a>: aggregate data from multiple websites, apps and shops into a Roll-Up site to gain new insights.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/search-keywords-performance/'>Search Keywords Performance</a>: all keywords searched by your users on Google+Bing+Yahoo into your Piwik reports.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/activity-log/'>Audit log</a>: better security and problem diagnostic with a detailed audit log of Piwik user activities.</p> + <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/white-label/'>White Label</a>: give your clients access to their analytics reports where all Piwik-branded widgets are removed.</p> + <p> • <strong><a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/premium-plugins'>All premium plugins.</a></strong></p> </div> <div piwik-content-block content-title="{{ 'Feedback_DoYouHaveBugReportOrFeatureRequest'|translate|e('html_attr') }}"> <p>{{ 'Feedback_HowToCreateTicket'|translate( - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/core-team-workflow%23submitting-a-bug-report'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/core-team-workflow%23submitting-a-bug-report'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/core-team-workflow%23submitting-a-feature-request'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/core-team-workflow%23submitting-a-feature-request'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/new'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues/new'>", "</a>" )|raw }}</p> </div> @@ -85,35 +85,35 @@ <div class="footer"> <ul class="social"> <li> - <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/newsletter/"><img class="icon" src="plugins/Feedback/images/newsletter.png"></a> - <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/newsletter/">Newsletter</a> + <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/newsletter/"><img class="icon" src="plugins/Feedback/images/newsletter.png"></a> + <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/newsletter/">Newsletter</a> </li> <li> - <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Piwik"><img class="icon" src="plugins/Feedback/images/facebook.png"></a> - <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Piwik">Facebook</a> + <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Matomo.org"><img class="icon" src="plugins/Feedback/images/facebook.png"></a> + <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Matomo.org">Facebook</a> </li> <li> - <a rel="noreferrer" target="_blank" href="https://twitter.com/piwik"><img class="icon" src="plugins/Feedback/images/twitter.png"></a> - <a rel="noreferrer" target="_blank" href="https://twitter.com/piwik">Twitter</a> + <a rel="noreferrer" target="_blank" href="https://twitter.com/matomo_org"><img class="icon" src="plugins/Feedback/images/twitter.png"></a> + <a rel="noreferrer" target="_blank" href="https://twitter.com/matomo_org">Twitter</a> </li> <li> <a rel="noreferrer" target="_blank" href="https://www.linkedin.com/groups?gid=867857"><img class="icon" src="plugins/Feedback/images/linkedin.png"></a> <a rel="noreferrer" target="_blank" href="https://www.linkedin.com/groups?gid=867857">Linkedin</a> </li> <li> - <a rel="noreferrer" target="_blank" href="https://github.com/piwik/piwik"><img class="icon" src="plugins/Feedback/images/github.png"></a> - <a rel="noreferrer" target="_blank" href="https://github.com/piwik/piwik">GitHub</a> + <a rel="noreferrer" target="_blank" href="https://github.com/matomo-org/piwik"><img class="icon" src="plugins/Feedback/images/github.png"></a> + <a rel="noreferrer" target="_blank" href="https://github.com/matomo-org/piwik">GitHub</a> </li> </ul> <ul class="menu"> - <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/blog/">Blog</a></li> - <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/about/sponsors/">Sponsors</a></li> - <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org">Developers</a></li> - <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://plugins.piwik.org">Marketplace</a></li> - <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/thank-you-all/">Credits</a></li> + <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/blog/">Blog</a></li> + <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/about/sponsors/">Sponsors</a></li> + <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.matomo.org">Developers</a></li> + <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://plugins.matomo.org">Marketplace</a></li> + <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/thank-you-all/">Credits</a></li> </ul> <p class="claim"><small>{{ 'Feedback_PrivacyClaim'|translate( - "<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/privacy/'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/privacy/'>", "</a>" )|raw}}</small></p> </div> diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index b6a3e573ac..36af135dc6 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -48,7 +48,7 @@ class Goals extends HtmlTable if (1 == Common::getRequestVar('documentationForGoalsPage', 0, 'int')) { // TODO: should not use query parameter $this->config->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation', - array('<br />', '<br />', '<a href="https://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<br />', '<a href="https://matomo.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); } parent::beforeRender(); diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index b0c68aaf87..94703f0588 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -37,7 +37,7 @@ </div> <div class="col s12 m6"> <div piwik-alert="info" ng-show="manageGoals.goal.triggerType == 'manually'"> - {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} + {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} </div> <div piwik-field uicontrol="radio" name="match_attribute" diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig index 6fab4baec8..bd65be9f71 100644 --- a/plugins/Goals/templates/_listGoalEdit.twig +++ b/plugins/Goals/templates/_listGoalEdit.twig @@ -6,7 +6,7 @@ <div piwik-activity-indicator loading="manageGoals.isLoading"></div> <div class="contentHelp"> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} {% if not ecommerceEnabled %} <br /><br/> @@ -14,7 +14,7 @@ <a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a> {% endset %} {% set ecommerceReportText %} - <a href="https://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> + <a href="https://matomo.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> {% endset %} {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }} {% endif %} diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig index 5ce89449d6..29b8766864 100644 --- a/plugins/Goals/templates/addNewGoal.twig +++ b/plugins/Goals/templates/addNewGoal.twig @@ -1,7 +1,7 @@ {% if userCanEditGoals %} {% set addNewGoalIntro %} <p>{{ 'Goals_NewGoalIntro'|translate }}</p> - <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> + <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> {% endset %} {% include "@Goals/_addEditGoal.twig" %} @@ -14,7 +14,7 @@ {{ 'Goals_NoGoalsNeedAccess'|translate|raw }} </p> <p> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} </p> </div> {{ postEvent("Template.afterGoalCannotAddNewGoal") }} 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 }} › {{ 'Installation_Installation'|translate }}</title> + <title>Matomo {{ piwikVersion }} › {{ '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 %} diff --git a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html index f7f87f4479..42674c174a 100644 --- a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html +++ b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html @@ -2,7 +2,7 @@ <p> This page helps you to find existing translations that you can reuse in your Plugin. - If you want to know more about translations have a look at our <a href="https://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. + If you want to know more about translations have a look at our <a href="https://developer.matomo.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. Enter a search term to find translations and their corresponding keys: </p> diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig index 5265bf24c5..94b84413df 100644 --- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig +++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig @@ -3,7 +3,7 @@ menu-title="{{ currentLanguageName|e('html_attr') }}" piwik-menudropdown> <a class="item" - href="?module=Proxy&action=redirect&url=https://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> + href="?module=Proxy&action=redirect&url=https://matomo.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> {% for language in languages %} <a class="item {% if language.code == currentLanguageCode %}active{% endif %}" value="{{ language.code }}" diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index 77fe92a742..0ba189c3ac 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -8,7 +8,7 @@ tabindex="0"> <div class="visitor-profile-options"> <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a> - <a href="https://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" + <a href="https://matomo.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"> </a> diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index a32eeb5e9a..50545fc719 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -215,7 +215,7 @@ class Controller extends \Piwik\Plugin\Controller protected function getMessageExceptionNoAccess() { - $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); + $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://matomo.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); $message .= $this->getMessageExceptionNoAccessWhenInsecureConnectionMayBeUsed(); @@ -234,7 +234,7 @@ class Controller extends \Piwik\Plugin\Controller if(Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) { $message = '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured', array( - '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://piwik.org/faq/how-to/faq_91/">') . '">', + '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://matomo.org/faq/how-to/faq_91/">') . '">', '</a>', 'config/config.ini.php', '<pre>force_ssl=1</pre>', diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index c7375b773e..638328515e 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -30,7 +30,7 @@ <span id="logo" class="brand-logo center"> {% if isCustomLogo == false %} - <a href="https://piwik.org" title="{{ linkTitle }}"> + <a href="https://matomo.org" title="{{ linkTitle }}"> {% endif %} {% if hasSVGLogo %} <img src='{{ logoSVG }}' class="{% if not isCustomLogo %}default-piwik-logo{% endif %}" title="{{ linkTitle }}" alt="Piwik"/> @@ -114,7 +114,7 @@ {% if isCustomLogo %} <p id="piwik"> - <i><a href="https://piwik.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i> + <i><a href="https://matomo.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i> </p> {% endif %} 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> diff --git a/plugins/MobileAppMeasurable/Type.php b/plugins/MobileAppMeasurable/Type.php index 2c6de23b66..fd687a37a7 100644 --- a/plugins/MobileAppMeasurable/Type.php +++ b/plugins/MobileAppMeasurable/Type.php @@ -14,7 +14,7 @@ class Type extends \Piwik\Measurable\Type protected $name = 'MobileAppMeasurable_MobileApp'; protected $namePlural = 'MobileAppMeasurable_MobileApps'; protected $description = 'MobileAppMeasurable_MobileAppDescription'; - protected $howToSetupUrl = 'https://developer.piwik.org/guides/tracking-api-clients#mobile-sdks'; + protected $howToSetupUrl = 'https://developer.matomo.org/guides/tracking-api-clients#mobile-sdks'; } diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index b526ae8b19..d4a7dc9576 100644 --- a/plugins/Morpheus/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -26,12 +26,12 @@ <br /><br /> {{ 'General_NeedMoreHelp'|translate }} - <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://matomo.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – + <a rel="noreferrer" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> {%- if areAdsForProfessionalServicesEnabled %} – - {% set supportUrl = 'https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %} + {% set supportUrl = 'https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %} <a rel="noreferrer" target="_blank" href="{{ supportUrl|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a> {%- endif %}. </div> diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig index 5c2fdae95a..a0d16d638c 100644 --- a/plugins/Morpheus/templates/demo.twig +++ b/plugins/Morpheus/templates/demo.twig @@ -571,12 +571,12 @@ <h2>Content blocks</h2> <div class="demo"> - <div piwik-content-block content-title="My title" help-url="https://piwik.org"> + <div piwik-content-block content-title="My title" help-url="https://matomo.org"> <p>My text goes is in here</p> </div> </div> <div class="demo-code"> - <pre><div piwik-content-block content-title="My title" help-url="https://piwik.org"> + <pre><div piwik-content-block content-title="My title" help-url="https://matomo.org"> <p>My text goes is in here</p> </div></pre> </div> @@ -584,7 +584,7 @@ <h3>Content Table</h3> <div class="demo"> - <div piwik-content-block content-title="My title" help-url="https://piwik.org"> + <div piwik-content-block content-title="My title" help-url="https://matomo.org"> <p>My intro text is here</p> <table piwik-content-table> <thead><tr><th>Column 1</th><th>Column 2</th></tr></thead> @@ -596,7 +596,7 @@ </div> </div> <div class="demo-code"> - <pre><div piwik-content-block content-title="My title" help-url="https://piwik.org"> + <pre><div piwik-content-block content-title="My title" help-url="https://matomo.org"> <p>My intro text is here</p> <table piwik-content-table> <thead><tr><th>Column 1</th><th>Column 2</th></tr></thead> diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl index 2a6b281fe3..9d2cccab8f 100644 --- a/plugins/Morpheus/templates/maintenance.tpl +++ b/plugins/Morpheus/templates/maintenance.tpl @@ -3,22 +3,22 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <title>Piwik is undergoing maintenance</title> + <title>Matomo is undergoing maintenance</title> <link rel="shortcut icon" href="%faviconUrl%" /> <link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/simple_structure.css" /> </head> <body id="simple"> <div class="logo"> - <img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%" /> + <img title="Matomo" alt="Matomo" style="height: 40px;" src="%logoUrl%" /> <br/> - <a href='https://piwik.org/'>%piwikTitle%</a> + <a href='https://matomo.org/'>%piwikTitle%</a> </div> <div class="box"> <div class="header"> - <h1>Piwik is undergoing maintenance</h1> + <h1>Matomo is undergoing maintenance</h1> </div> <div class="content"> diff --git a/plugins/Morpheus/templates/simpleLayoutFooter.tpl b/plugins/Morpheus/templates/simpleLayoutFooter.tpl index f308a692e8..2c976ae9c3 100644 --- a/plugins/Morpheus/templates/simpleLayoutFooter.tpl +++ b/plugins/Morpheus/templates/simpleLayoutFooter.tpl @@ -1,7 +1,7 @@ </div> <div class="footer"> - <a href="index.php">« Back to Piwik</a> + <a href="index.php">« Back to Matomo</a> </div> </div> diff --git a/plugins/Morpheus/templates/simpleLayoutHeader.tpl b/plugins/Morpheus/templates/simpleLayoutHeader.tpl index 8244492ad8..26bdd72462 100644 --- a/plugins/Morpheus/templates/simpleLayoutHeader.tpl +++ b/plugins/Morpheus/templates/simpleLayoutHeader.tpl @@ -10,7 +10,7 @@ <body id="simple"> <div class="logo"> - <img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%"/> + <img title="Matomo" alt="Matomo" style="height: 40px;" src="%logoUrl%"/> </div> <div class="box"> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index 25e57c802e..d48293da5b 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -1,7 +1,7 @@ <div> <h2 piwik-enriched-headline class="card-title" - help-url="https://piwik.org/docs/manage-websites/#all-websites-dashboard" + help-url="https://matomo.org/docs/manage-websites/#all-websites-dashboard" feature-name="{{ 'General_AllWebsitesDashboard'|translate }}"> {{ 'General_AllWebsitesDashboard'|translate }} <span class='smallTitle' @@ -63,11 +63,11 @@ <br /><br /> {{ 'General_NeedMoreHelp'|translate }} - <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://matomo.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> <span ng-show="areAdsForProfessionalServicesEnabled"> – </span> - <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. + <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. </div> </td> </tr> diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 1d4ed41db2..8d51270764 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -8,7 +8,7 @@ {% block content %} <div class="overlay-sidebar-container"> - <a id="overlayTitle" href="https://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank"> + <a id="overlayTitle" href="https://matomo.org/docs/page-overlay/" rel="noreferrer" target="_blank"> {{ 'Overlay_Overlay'|translate }} <span class="icon-info2"></span> </a> @@ -37,7 +37,7 @@ </p> <p> - <a href="https://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> + <a href="https://matomo.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> {{ 'Overlay_ErrorNotLoadingLink'|translate }} </a> </p> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 056ac36065..fe0e63ec7a 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -7,10 +7,10 @@ {% if isSuperUser %} <div piwik-content-intro> - <h2 piwik-enriched-headline help-url="https://piwik.org/docs/privacy/">{{ title }}</h2> + <h2 piwik-enriched-headline help-url="https://matomo.org/docs/privacy/">{{ title }}</h2> <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }} - {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://matomo.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> </div> <div piwik-content-block @@ -94,7 +94,7 @@ <div class="alert alert-warning" style="width: 50%;"> {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }} - <a href="https://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> + <a href="https://matomo.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> {{ 'General_ClickHere'|translate }} </a> </div> diff --git a/plugins/ProfessionalServices/Promo.php b/plugins/ProfessionalServices/Promo.php index ee480776f6..d1aed844f3 100644 --- a/plugins/ProfessionalServices/Promo.php +++ b/plugins/ProfessionalServices/Promo.php @@ -23,13 +23,13 @@ class Promo array( 'campaignContent' => 'abTesting', 'title' => 'A/B Testing', - 'url' => 'https://piwik.org/recommends/ab-testing-learn-more', + 'url' => 'https://matomo.org/recommends/ab-testing-learn-more', 'text' => 'Ever wondered what A/B testing is and why it is so important? Check out how you can increase conversions and sales on your website and app.' ), array( 'campaignContent' => 'abTesting', 'title' => 'A/B Testing', - 'url' => ' https://piwik.org/recommends/ab-testing-website', + 'url' => ' https://matomo.org/recommends/ab-testing-website', 'text' => 'Increase revenue and conversions by comparing different versions of your websites or apps, ad detect the winning variation that will grow your business!' ), @@ -37,13 +37,13 @@ class Promo array( 'campaignContent' => 'mediaAnalytics', 'title' => 'Media Analytics', - 'url' => 'https://piwik.org/recommends/media-analytics-website', + 'url' => 'https://matomo.org/recommends/media-analytics-website', 'text' => 'Ever wondered how people interact and engage with videos or audios on your website? Well now you can, and it integrates perfectly into your Piwik.', ), array( 'campaignContent' => 'mediaAnalytics', 'title' => 'Media Analytics', - 'url' => 'https://piwik.org/recommends/media-analytics', + 'url' => 'https://matomo.org/recommends/media-analytics', 'text' => 'Get powerful insights into how your audience watches your videos and listens to your audio. Media Analytics is now available on the Marketplace.', ), @@ -51,7 +51,7 @@ class Promo array( 'campaignContent' => 'formAnalytics', 'title' => 'Form Analytics', - 'url' => 'https://piwik.org/recommends/form-analytics', + 'url' => 'https://matomo.org/recommends/form-analytics', 'text' => 'Increase the conversions on your online forms, by learning everything about your users behavior and their pain points on your forms', ), @@ -59,7 +59,7 @@ class Promo array( 'campaignContent' => 'funnels', 'title' => 'Funnels', - 'url' => 'https://piwik.org/recommends/conversion-funnels', + 'url' => 'https://matomo.org/recommends/conversion-funnels', 'text' => 'Increase your conversions, sales and revenue by understanding your conversion funnels and where your visitors drop off with Funnels for Piwik.' ), @@ -67,47 +67,47 @@ class Promo array( 'campaignContent' => 'userTraining', 'title' => 'Training', - 'url' => 'https://piwik.org/training/?pk_campaign=' . Advertising::CAMPAIGN_NAME_PROFESSIONAL_SERVICES . '&pk_source=Piwik_App', + 'url' => 'https://matomo.org/training/?pk_campaign=' . Advertising::CAMPAIGN_NAME_PROFESSIONAL_SERVICES . '&pk_source=Piwik_App', 'text' => 'Want to know how to use all the exciting features in Piwik? Try a User training to be up to speed with working with Piwik.' ), // Keywords performance array( 'campaignContent' => 'searchKeywords', 'title' => 'Search Keywords', - 'url' => 'https://piwik.org/recommends/search-keywords-performance/', + 'url' => 'https://matomo.org/recommends/search-keywords-performance/', 'text' => 'Which queries caused your website to appear in search results? Improve your SEO efforts and monitor your position and performance for each Keyword directly in your Piwik reports.', ), // Roll-Up Reporting array( 'campaignContent' => 'rollUp', 'title' => 'Roll-Up Reporting', - 'url' => 'https://piwik.org/recommends/roll-up-reporting/', + 'url' => 'https://matomo.org/recommends/roll-up-reporting/', 'text' => 'Did you know you can aggregate the collected data across hundreds of sites and display it in a single dashboard?', ), // White label array( 'campaignContent' => 'whiteLabel', 'title' => 'White Label', - 'url' => 'https://piwik.org/recommends/white-label/', + 'url' => 'https://matomo.org/recommends/white-label/', 'text' => 'Did you know you can give your clients access to their analytics reports where all Piwik-branded widgets are removed? Try the White Label product!', ), // Enterprise array( 'campaignContent' => 'bringEnterpriseLevel', 'title' => 'Enterprise', - 'url' => 'https://piwik.org/recommends/enterprise/', + 'url' => 'https://matomo.org/recommends/enterprise/', 'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from experts.' ), array( 'campaignContent' => 'slowingDown', 'title' => 'Enterprise', - 'url' => 'https://piwik.org/recommends/enterprise/', + 'url' => 'https://matomo.org/recommends/enterprise/', 'text' => 'Is your Piwik slowing down? Piwik experts can help with your server setup!' ), array( 'campaignContent' => 'discoverPower', 'title' => 'Enterprise', - 'url' => 'https://piwik.org/recommends/enterprise/', + 'url' => 'https://matomo.org/recommends/enterprise/', 'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.' ), ); diff --git a/plugins/ProfessionalServices/Widgets/PromoServices.php b/plugins/ProfessionalServices/Widgets/PromoServices.php index 35eca8d35a..26a2939515 100644 --- a/plugins/ProfessionalServices/Widgets/PromoServices.php +++ b/plugins/ProfessionalServices/Widgets/PromoServices.php @@ -34,7 +34,7 @@ class PromoServices extends \Piwik\Widget\Widget public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('ProfessionalServices_WidgetPremiumServicesForPiwik'); $advertising = StaticContainer::get('Piwik\ProfessionalServices\Advertising'); diff --git a/plugins/ProfessionalServices/Widgets/Rss.php b/plugins/ProfessionalServices/Widgets/Rss.php index 41d98f3dc8..3786360ec6 100644 --- a/plugins/ProfessionalServices/Widgets/Rss.php +++ b/plugins/ProfessionalServices/Widgets/Rss.php @@ -14,7 +14,7 @@ class Rss extends \Piwik\Widget\Widget { public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setIsEnabled(false); } diff --git a/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig index f929642bd5..2b9efc0bf3 100644 --- a/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig +++ b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig @@ -1,7 +1,7 @@ <p style="margin-top:3em" class=" alert-info alert">Did you know? - <br/> <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">Campaign tracking</a> lets you measure the effectiveness of your marketing campaigns such as emails marketing, paid search, banner ads, affiliates links, etc. - Use the <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">URL Builder tool</a> to create your links with new URL campaign parameters. + <br/> <a target="_blank" rel="noreferrer" href="https://matomo.org/docs/tracking-campaigns/">Campaign tracking</a> lets you measure the effectiveness of your marketing campaigns such as emails marketing, paid search, banner ads, affiliates links, etc. + Use the <a target="_blank" rel="noreferrer" href="https://matomo.org/docs/tracking-campaigns/">URL Builder tool</a> to create your links with new URL campaign parameters. {% if displayMarketingCampaignsReportingAd %} - <br/> Install our <a target="_blank" rel="noreferrer" href="https://plugins.piwik.org/MarketingCampaignsReporting">Marketing Campaigns Reporting plugin</a> to get even more campaigns reports and new segments for up to five marketing channels (campaign, source, medium, keyword, content). + <br/> Install our <a target="_blank" rel="noreferrer" href="https://plugins.matomo.org/MarketingCampaignsReporting">Marketing Campaigns Reporting plugin</a> to get even more campaigns reports and new segments for up to five marketing channels (campaign, source, medium, keyword, content). {% endif %} </p>
\ No newline at end of file diff --git a/plugins/ProfessionalServices/templates/promoBelowEvents.twig b/plugins/ProfessionalServices/templates/promoBelowEvents.twig index ef7d95bb67..ae2af80dde 100644 --- a/plugins/ProfessionalServices/templates/promoBelowEvents.twig +++ b/plugins/ProfessionalServices/templates/promoBelowEvents.twig @@ -1,7 +1,7 @@ <p style="margin-top:3em" class=" alert-info alert">Did you know? - <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/docs/event-tracking/">Learn more</a>. - <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. + <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/docs/event-tracking/">Learn more</a>. + <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. {% if displayMediaAnalyticsAd %} - <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music. + <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music. {% endif %} </p>
\ No newline at end of file diff --git a/plugins/ProfessionalServices/templates/promoExperiments.twig b/plugins/ProfessionalServices/templates/promoExperiments.twig index cfef975e0c..1d5ab7a39a 100644 --- a/plugins/ProfessionalServices/templates/promoExperiments.twig +++ b/plugins/ProfessionalServices/templates/promoExperiments.twig @@ -1,3 +1,3 @@ <p style="margin-top:3em" class=" alert-info alert">Did you know? - With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business. + With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business. </p>
\ No newline at end of file diff --git a/plugins/ProfessionalServices/templates/promoFunnel.twig b/plugins/ProfessionalServices/templates/promoFunnel.twig index 4e1118a0ef..85c78a14fc 100644 --- a/plugins/ProfessionalServices/templates/promoFunnel.twig +++ b/plugins/ProfessionalServices/templates/promoFunnel.twig @@ -1,5 +1,5 @@ <p style="margin-top:3em;margin-bottom:3em" class="alert-info alert">Did you know? A Funnel defines a series of actions that you expect your visitors to take on their way to converting a goal. - <br/>With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/conversion-funnel/">Funnels for Piwik</a>, + <br/>With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/conversion-funnel/">Funnels for Piwik</a>, you can easily determine your funnel and see where your visitors drop off and how to focus efforts to increase your conversions. </p>
\ No newline at end of file diff --git a/plugins/ProfessionalServices/templates/promoHeatmaps.twig b/plugins/ProfessionalServices/templates/promoHeatmaps.twig index 7aab5fe6c5..9d49010480 100644 --- a/plugins/ProfessionalServices/templates/promoHeatmaps.twig +++ b/plugins/ProfessionalServices/templates/promoHeatmaps.twig @@ -1,3 +1,3 @@ <p style="margin-top:24px;font-size:13px;" class="alert-info alert">Did you know? - With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you understand your visitors much better. See where your visitors click, move the mouse, scroll, type, and more. + With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you understand your visitors much better. See where your visitors click, move the mouse, scroll, type, and more. </p> diff --git a/plugins/ProfessionalServices/templates/promoSearchKeywords.twig b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig index aaa283b68f..6829c0f9ec 100644 --- a/plugins/ProfessionalServices/templates/promoSearchKeywords.twig +++ b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig @@ -1,5 +1,5 @@ <p style="margin-top:3em;margin-bottom:3em" class=" alert-info alert">Did you know?<br/> - Use <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/search-keywords-performance/">Search Keywords Performance</a> + Use <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/search-keywords-performance/">Search Keywords Performance</a> to see all keywords behind 'keyword not defined'. All keywords searched by your users on Google, Bing and other search engines will be listed and you can even monitor the SEO position of your website in their search results. diff --git a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig index 17e350f0fd..4646ff6632 100644 --- a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig +++ b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig @@ -1,3 +1,3 @@ <p class="alert-info alert">Did you know? - With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you can record all clicks, mouse movements, scrolls and form interactions of your visitors and replay them in a video to truly understand your visitors. + With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you can record all clicks, mouse movements, scrolls and form interactions of your visitors and replay them in a video to truly understand your visitors. </p>
\ No newline at end of file diff --git a/plugins/Provider/Reports/GetProvider.php b/plugins/Provider/Reports/GetProvider.php index a5ff778f0a..ad2858a6ba 100644 --- a/plugins/Provider/Reports/GetProvider.php +++ b/plugins/Provider/Reports/GetProvider.php @@ -44,7 +44,7 @@ class GetProvider extends Report if (! Common::getRequestVar('disableLink', 0, 'int')) { $message .= ' ' . Piwik::translate( 'General_SeeThisFaq', - array('<a href="https://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') + array('<a href="https://matomo.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') ); } $view->config->show_footer_message = $message; diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 550078e2d7..03d48ba267 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -119,6 +119,10 @@ class Controller extends \Piwik\Plugin\Controller return true; } + if (preg_match('~^http://(qa\.|demo\.|dev\.|forum\.)?matomo.org([#?/]|$)~', $url)) { + return true; + } + // Allow clockworksms domain if (strpos($url, 'http://www.clockworksms.com/') === 0) { return true; diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject a30f808fe5fa399114bfc268639dd033a2512dd +Subproject b6b3ab7640e8ff1904258750ee18d24ff17c9df diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php index 36df4fead4..da3e0edfdb 100644 --- a/plugins/Referrers/Reports/GetCampaigns.php +++ b/plugins/Referrers/Reports/GetCampaigns.php @@ -21,7 +21,7 @@ class GetCampaigns extends Base $this->dimension = new Campaign(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->actionToLoadSubTables = 'getKeywordsFromCampaignId'; $this->hasGoalMetrics = true; $this->order = 9; diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php index d3f2fd1784..7885bd0940 100644 --- a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php +++ b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php @@ -20,7 +20,7 @@ class GetKeywordsFromCampaignId extends Base $this->dimension = new Keyword(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->isSubtableReport = true; $this->order = 10; } diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php index 02e4338d95..431c72c87f 100644 --- a/plugins/Referrers/SearchEngine.php +++ b/plugins/Referrers/SearchEngine.php @@ -485,7 +485,7 @@ class SearchEngine extends Singleton public function getBackLinkFromUrlAndKeyword($url, $keyword) { if ($keyword === API::LABEL_KEYWORD_NOT_DEFINED) { - return 'https://piwik.org/faq/general/#faq_144'; + return 'https://matomo.org/faq/general/#faq_144'; } $keyword = urlencode($keyword); $keyword = str_replace(urlencode('+'), urlencode(' '), $keyword); diff --git a/plugins/RssWidget/Widgets/RssChangelog.php b/plugins/RssWidget/Widgets/RssChangelog.php index bdd02843ef..73a269aa0a 100644 --- a/plugins/RssWidget/Widgets/RssChangelog.php +++ b/plugins/RssWidget/Widgets/RssChangelog.php @@ -16,7 +16,7 @@ class RssChangelog extends \Piwik\Widget\Widget { public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('Piwik Changelog'); } diff --git a/plugins/RssWidget/Widgets/RssPiwik.php b/plugins/RssWidget/Widgets/RssPiwik.php index 41ee915292..f0fd500f8a 100644 --- a/plugins/RssWidget/Widgets/RssPiwik.php +++ b/plugins/RssWidget/Widgets/RssPiwik.php @@ -16,7 +16,7 @@ class RssPiwik extends \Piwik\Widget\Widget { public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Piwik'); + $config->setCategoryId('About Matomo'); $config->setName('Piwik.org Blog'); } diff --git a/plugins/RssWidget/plugin.json b/plugins/RssWidget/plugin.json index a9a6472345..630f3dddd3 100644 --- a/plugins/RssWidget/plugin.json +++ b/plugins/RssWidget/plugin.json @@ -1,15 +1,15 @@ { "name": "RssWidget", - "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.", + "description": "Matomo Platform showcase: how to create a new widget that displays a user submitted RSS feed.", "version": "1.0", "keywords": ["example", "feed", "widget"], - "homepage": "https://piwik.org", + "homepage": "https://matomo.org", "license": "GPL v3+", "authors": [ { - "name": "Piwik", - "email": "hello@piwik.org", - "homepage": "https://piwik.org" + "name": "Matomo", + "email": "hello@matomo.org", + "homepage": "https://matomo.org" } ] }
\ No newline at end of file diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig index ffbeeeb564..030803810d 100644 --- a/plugins/ScheduledReports/templates/_listReports.twig +++ b/plugins/ScheduledReports/templates/_listReports.twig @@ -1,7 +1,7 @@ <div id='entityEditContainer' class="entityTableContainer" piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="https://piwik.org/docs/email-reports/" + help-url="https://matomo.org/docs/email-reports/" feature="true" ng-show="manageScheduledReport.showReportsList"> 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 "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index f26470e0b3..7a75945543 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -188,7 +188,7 @@ Piwik_Transitions.prototype.showPopover = function () { var self = this; this.popover = Piwik_Popover.showLoading('Transitions', self.actionName, 550); - Piwik_Popover.addHelpButton('https://piwik.org/docs/transitions'); + Piwik_Popover.addHelpButton('https://matomo.org/docs/transitions'); var bothLoaded = function () { Piwik_Popover.setContent(Piwik_Transitions.popoverHtml); diff --git a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php index 432d57d444..5a7ce0a69a 100644 --- a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php +++ b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php @@ -50,12 +50,12 @@ class GeolocationDiagnostic implements Diagnostic if ($isProviderInstalled) { $comment = $this->translator->translate('UserCountry_GeoIpLocationProviderNotRecomnended') . ' '; $comment .= $this->translator->translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array( - '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://matomo.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } else { $comment = $this->translator->translate('UserCountry_DefaultLocationProviderDesc1') . ' '; $comment .= $this->translator->translate('UserCountry_DefaultLocationProviderDesc2', array( - '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://matomo.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } diff --git a/plugins/UserCountry/LocationProvider/DefaultProvider.php b/plugins/UserCountry/LocationProvider/DefaultProvider.php index 6a0cf82f17..b5b32ec8c2 100755 --- a/plugins/UserCountry/LocationProvider/DefaultProvider.php +++ b/plugins/UserCountry/LocationProvider/DefaultProvider.php @@ -104,7 +104,7 @@ class DefaultProvider extends LocationProvider $desc = Piwik::translate('UserCountry_DefaultLocationProviderDesc1') . ' ' . Piwik::translate('UserCountry_DefaultLocationProviderDesc2', array('<strong>', '', '', '</strong>')) - . '<p><a href="https://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' + . '<p><a href="https://matomo.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a></p>'; return array('id' => self::ID, 'title' => self::TITLE, 'description' => $desc, 'order' => 1); diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index 965740824f..ed83a69755 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -217,7 +217,7 @@ class Pecl extends GeoIp { $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl2'); - $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_164">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_164">' . Piwik::translate('UserCountry_HowToInstallGeoIpPecl') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index 35c505f7b9..a0bdc15ae2 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -324,7 +324,7 @@ class Php extends GeoIp $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php2', array('<strong>', '</strong>', '<strong>', '</strong>')); - $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_163">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_163">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index fe27a5dd2e..a30c5f0400 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -223,10 +223,10 @@ class ServerBased extends GeoIp . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array('<strong>', '</strong>', '<strong>', '</strong>')); $installDocs = - '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_165">' + '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_165">' . Piwik::translate('UserCountry_HowToInstallApacheModule') . '</a><br/>' - . '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_166">' + . '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_166">' . Piwik::translate('UserCountry_HowToInstallNginxModule') . '</a>'; diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php index a1ec96e427..7a6166dec4 100644 --- a/plugins/UserCountry/Reports/Base.php +++ b/plugins/UserCountry/Reports/Base.php @@ -54,7 +54,7 @@ abstract class Base extends \Piwik\Plugin\Report '</a>')); } else { $footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits', - array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_167">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_167">', '</a>')); } $view->config->show_footer_message = $footerMessage; diff --git a/plugins/UserCountry/Reports/GetCountry.php b/plugins/UserCountry/Reports/GetCountry.php index 9e5c7faae1..f3e8f2fcd3 100644 --- a/plugins/UserCountry/Reports/GetCountry.php +++ b/plugins/UserCountry/Reports/GetCountry.php @@ -39,7 +39,7 @@ class GetCountry extends Base // if we're using the default location provider, add a note explaining how it works $footerMessage = Piwik::translate("General_Note") . ': ' . Piwik::translate('UserCountry_DefaultLocationProviderExplanation', - array('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/geo-locate/">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/geo-locate/">', '</a>')); $view->config->show_footer_message = $footerMessage; } diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 0e45d899f6..2cca082a8a 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -7,7 +7,7 @@ <div piwik-content-intro> <h2 piwik-enriched-headline - help-url="https://piwik.org/docs/geo-locate/" + help-url="https://matomo.org/docs/geo-locate/" id="location-providers">{{ title }}</h2> <p>{{ 'UserCountry_GeolocationPageDesc'|translate }}</p> </div> diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index 902b95e24d..0f92717998 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -8,7 +8,7 @@ content-title="{{ title|e('html_attr') }}" feature="true" style="width:800px;" - help-url="https://piwik.org/docs/manage-users/" + help-url="https://matomo.org/docs/manage-users/" > <div ng-controller="ManageUserAccessController as manageUserAccess"> <div id="sites" class="usersManager"> @@ -54,8 +54,8 @@ <th class='first'>{{ 'UsersManager_User'|translate }}</th> <th>{{ 'UsersManager_Alias'|translate }}</th> <th>{{ 'UsersManager_PrivNone'|translate }}</th> - <th>{{ 'UsersManager_PrivView'|translate }} <a href="https://piwik.org/faq/general/faq_70/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> - <th>{{ 'UsersManager_PrivAdmin'|translate }} <a href="https://piwik.org/faq/general/faq_69/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> + <th>{{ 'UsersManager_PrivView'|translate }} <a href="https://matomo.org/faq/general/faq_70/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> + <th>{{ 'UsersManager_PrivAdmin'|translate }} <a href="https://matomo.org/faq/general/faq_69/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> </tr> </thead> @@ -268,7 +268,7 @@ <tr> <th class='first'>{{ 'UsersManager_User'|translate }}</th> <th>{{ 'UsersManager_Alias'|translate }}</th> - <th>{{ 'Installation_SuperUser'|translate }} <a href="https://piwik.org/faq/general/faq_35/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> + <th>{{ 'Installation_SuperUser'|translate }} <a href="https://matomo.org/faq/general/faq_35/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th> </tr> </thead> diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 2217ce28ae..da76435406 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -35,7 +35,7 @@ </div> <div id="languageHelp" class="inline-help-node"> - <a href="?module=Proxy&action=redirect&url=https://piwik.org/translations/" target="_blank"> + <a href="?module=Proxy&action=redirect&url=https://matomo.org/translations/" target="_blank"> {{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> </div> diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 76606885db..0a53a0aff2 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -146,7 +146,7 @@ class API extends \Piwik\Plugin\API if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) { throw new \Exception( "The metric " . $metric . " is not enabled for the requested period. " . - "Please see this FAQ: https://piwik.org/faq/how-to/faq_113/" + "Please see this FAQ: https://matomo.org/faq/how-to/faq_113/" ); } } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index fc15828149..0f51480296 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -77,7 +77,7 @@ class Controller extends \Piwik\Plugin\Controller . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />' . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> ' - . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/user-id/">User ID</a>)<br />' + . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/user-id/">User ID</a>)<br />' . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> ' . $this->translator->translate('General_ColumnActionsPerVisitDocumentation'); diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index a0e696a842..7f3b5ce9c2 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -334,7 +334,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $field->inlineHelp = Piwik::translate('SitesManager_EcommerceHelp') . '<br />' . Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics', - array("<a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); + array("<a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); $field->uiControl = FieldConfig::UI_CONTROL_SINGLE_SELECT; $field->availableValues = array( 0 => Piwik::translate('SitesManager_NotAnEcommerceSite'), |