diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-01-11 02:23:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-11 02:23:40 +0300 |
commit | 07adf0ac04dfb8f35be41d9add1855b6e646f8db (patch) | |
tree | 5c3b3d0db2ef82c663d34551394a9ede03167e82 /core | |
parent | 62e3c3f89a4c8bb29f710901de7d62e6576e03cd (diff) |
Show Matomo instead of Piwik in the user interface in more places (#12421)
* Replace all occurences of Piwik in english translations of Actions plugin
* translation update
* Replace all occurences of Piwik in english translations of API plugin
* translation update
* Replace all occurences of Piwik in english translations of core
* replace Piwik occurrences
* Rename widget piwik.org blog => matomo.org blog
* fix widget name
* replaced some more piwik mentions
* Renamed to Matomo a few strings
* Replaced more strings to Matomo in JSON files, twig templates
* Replaced more strings to Matomo in INI file
* Replaced more strings to Matomo in API docs, error messages, feedback forms
* introduce API.getMatomoVersion and ExampleAPI.getMatomoVersion API + deprecate old ones
Diffstat (limited to 'core')
-rw-r--r-- | core/DataTable/Row.php | 2 | ||||
-rw-r--r-- | core/Http.php | 2 | ||||
-rw-r--r-- | core/Plugin/API.php | 2 | ||||
-rw-r--r-- | core/Plugin/MetadataLoader.php | 2 | ||||
-rw-r--r-- | core/Tracker/Cache.php | 2 | ||||
-rw-r--r-- | core/Tracker/TableLogAction.php | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 4077d6cd43..b98e2cc711 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -54,7 +54,7 @@ class Row extends \ArrayObject * @param array $row An array with the following structure: * * array( - * Row::COLUMNS => array('label' => 'Piwik', + * Row::COLUMNS => array('label' => 'Matomo', * 'column1' => 42, * 'visits' => 657, * 'time_spent' => 155744), diff --git a/core/Http.php b/core/Http.php index 59628852ab..608a4c2f51 100644 --- a/core/Http.php +++ b/core/Http.php @@ -655,7 +655,7 @@ class Http /** * Downloads the next chunk of a specific file. The next chunk's byte range * is determined by the existing file's size and the expected file size, which - * is stored in the piwik_option table before starting a download. The expected + * is stored in the option table before starting a download. The expected * file size is obtained through a `HEAD` HTTP request. * * _Note: this function uses the **Range** HTTP header to accomplish downloading in diff --git a/core/Plugin/API.php b/core/Plugin/API.php index 0f48816af3..a7e2e2f788 100644 --- a/core/Plugin/API.php +++ b/core/Plugin/API.php @@ -17,7 +17,7 @@ use Psr\Log\LoggerInterface; * * Plugins that want to expose functionality through the Reporting API should create a class * that extends this one. Every public method in that class that is not annotated with **@ignore** - * will be callable through Piwik's Web API. + * will be callable through Matomo's Web API. * * _Note: If your plugin calculates and stores reports, they should be made available through the API._ * diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index d1218b51b0..80eae18a80 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -83,7 +83,7 @@ class MetadataLoader return array( 'description' => $descriptionKey, 'homepage' => 'https://matomo.org/', - 'authors' => array(array('name' => 'Piwik', 'homepage' => 'https://matomo.org/')), + 'authors' => array(array('name' => 'Matomo', 'homepage' => 'https://matomo.org/')), 'license' => 'GPL v3+', 'version' => Version::VERSION, 'theme' => false, diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php index b18003aaa9..17a0b1700d 100644 --- a/core/Tracker/Cache.php +++ b/core/Tracker/Cache.php @@ -145,7 +145,7 @@ class Cache * * Data that is used during tracking but is expensive to compute/query should be * cached to keep tracking efficient. One example of such data are options - * that are stored in the piwik_option table. Querying data for each tracking + * that are stored in the option table. Querying data for each tracking * request means an extra unnecessary database query for each visitor action. Using * a cache solves this problem. * diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php index 40f25f7e41..b43c481664 100644 --- a/core/Tracker/TableLogAction.php +++ b/core/Tracker/TableLogAction.php @@ -24,7 +24,7 @@ use Piwik\Segment\SegmentExpression; class TableLogAction { /** - * This function will find the idaction from the lookup table piwik_log_action, + * This function will find the idaction from the lookup table log_action, * given an Action name, type, and an optional URL Prefix. * * This is used to record Page URLs, Page Titles, Ecommerce items SKUs, item names, item categories |