Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/global.ini.php4
-rw-r--r--core/Archive/DataTableFactory.php2
-rw-r--r--core/CliMulti/Process.php4
-rw-r--r--core/CronArchive.php4
-rw-r--r--core/DataTable/Filter/ExcludeLowPopulation.php2
-rw-r--r--core/DataTable/Filter/PatternRecursive.php2
-rw-r--r--core/DataTable/Map.php2
-rw-r--r--core/DataTable/Renderer/Csv.php4
-rw-r--r--core/DeviceDetectorCache.php2
-rw-r--r--core/IP.php2
-rw-r--r--core/Metrics/Formatter.php2
-rw-r--r--core/Piwik.php2
-rw-r--r--core/PiwikPro/Advertising.php2
-rw-r--r--core/Plugin/Report.php2
-rw-r--r--core/Plugin/Tasks.php4
-rw-r--r--core/Plugin/ViewDataTable.php2
-rw-r--r--core/Theme.php2
-rw-r--r--core/Tracker/Db/Mysqli.php2
-rw-r--r--core/Tracker/Db/Pdo/Mysql.php2
-rw-r--r--core/Tracker/RequestSet.php2
-rw-r--r--core/UpdateCheck/ReleaseChannel.php2
-rw-r--r--core/Updates.php2
-rw-r--r--core/Updates/2.15.0-b17.php2
-rw-r--r--core/Updates/2.15.0-b20.php2
-rw-r--r--lang/README.md2
25 files changed, 30 insertions, 30 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index 463c166a4c..49af421534 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -304,7 +304,7 @@ minimum_mysql_version = 4.1
; PostgreSQL minimum required version
minimum_pgsql_version = 8.3
-; Minimum adviced memory limit in php.ini file (see memory_limit value)
+; Minimum advised memory limit in php.ini file (see memory_limit value)
minimum_memory_limit = 128
; Minimum memory limit enforced when archived via ./console core:archive
@@ -516,7 +516,7 @@ overlay_disable_framed_mode = 0
enable_custom_logo_check = 1
; If php is running in a chroot environment, when trying to import CSV files with createTableFromCSVFile(),
-; Mysql will try to load the chrooted path (which is imcomplete). To prevent an error, here you can specify the
+; Mysql will try to load the chrooted path (which is incomplete). To prevent an error, here you can specify the
; absolute path to the chroot environment. eg. '/path/to/piwik/chrooted/'
absolute_chroot_path =
diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php
index e8b17b6731..babaf63108 100644
--- a/core/Archive/DataTableFactory.php
+++ b/core/Archive/DataTableFactory.php
@@ -401,7 +401,7 @@ class DataTableFactory
$this->setSubtables($subtable, $blobRow, $treeLevel + 1);
// we edit the subtable ID so that it matches the newly table created in memory
- // NB: we dont overwrite the datatableid in the case we are displaying the table expanded.
+ // NB: we don't overwrite the datatableid in the case we are displaying the table expanded.
if ($this->addMetadataSubtableId) {
// this will be written back to the column 'idsubdatatable' just before rendering,
// see Renderer/Php.php
diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php
index e1d702fdf1..db2d5b2cd0 100644
--- a/core/CliMulti/Process.php
+++ b/core/CliMulti/Process.php
@@ -14,7 +14,7 @@ use Piwik\SettingsServer;
/**
* There are three different states
* - PID file exists with empty content: Process is created but not started
- * - PID file exists with the actual process PID as content: Process is runnning
+ * - PID file exists with the actual process PID as content: Process is running
* - PID file does not exist: Process is marked as finished
*
* Class Process
@@ -235,7 +235,7 @@ class Process
return true;
}
// Testing if /proc is a resource with @fopen fails on systems with open_basedir set.
- // by using stat we not only test the existance of /proc but also confirm it's a 'proc' filesystem
+ // by using stat we not only test the existence of /proc but also confirm it's a 'proc' filesystem
$type = @shell_exec('stat -f -c "%T" /proc 2>/dev/null');
return strpos($type, 'proc') === 0;
}
diff --git a/core/CronArchive.php b/core/CronArchive.php
index 1ca869fc7e..77c9614877 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -650,7 +650,7 @@ class CronArchive
*/
$success = $this->processArchiveForPeriods($idSite, $lastTimestampWebsiteProcessedPeriods);
- // Record succesful run of this website's periods archiving
+ // Record successful run of this website's periods archiving
if ($success) {
Option::set($this->lastRunKey($idSite, "periods"), time());
}
@@ -795,7 +795,7 @@ class CronArchive
|| !is_array($daysResponse)
|| count($daysResponse) == 0
) {
- // cancel the succesful run flag
+ // cancel the successful run flag
Option::set($this->lastRunKey($idSite, "day"), 0);
// cancel marking the site as reprocessed
diff --git a/core/DataTable/Filter/ExcludeLowPopulation.php b/core/DataTable/Filter/ExcludeLowPopulation.php
index e6a423ef50..1555cc3279 100644
--- a/core/DataTable/Filter/ExcludeLowPopulation.php
+++ b/core/DataTable/Filter/ExcludeLowPopulation.php
@@ -55,7 +55,7 @@ class ExcludeLowPopulation extends BaseFilter
* `$minimumPercentageThreshold` is used.
* @param bool|float $minimumPercentageThreshold If supplied, column values must be a greater
* percentage of the sum of all column values than
- * this precentage.
+ * this percentage.
*/
public function __construct($table, $columnToFilter, $minimumValue, $minimumPercentageThreshold = false)
{
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 62a8b26bd9..616c37289e 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -56,7 +56,7 @@ class PatternRecursive extends BaseFilter
foreach ($rows as $key => $row) {
// A row is deleted if
- // 1 - its label doesnt contain the pattern
+ // 1 - its label doesn't contain the pattern
// AND 2 - the label is not found in the children
$patternNotFoundInChildren = false;
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index 8f9d259f10..e7bc510194 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -28,7 +28,7 @@ use Piwik\DataTable\Renderer\Console;
class Map implements DataTableInterface
{
/**
- * Array containing the DataTable withing this Set
+ * Array containing the DataTable within this Set
*
* @var DataTable[]
*/
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index d7b58783ee..441890bff8 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -148,7 +148,7 @@ class Csv extends Renderer
// get rid of the columns names
$returned = array_slice($returned, 1);
- // case empty datatable we dont print anything in the CSV export
+ // case empty datatable we don't print anything in the CSV export
// when in xml we would output <result date="2008-01-15" />
if (!empty($returned)) {
foreach ($returned as &$row) {
@@ -417,7 +417,7 @@ class Csv extends Renderer
if ($name == 'idsubdatatable_in_db') {
continue;
}
- //if a metadata and a column have the same name make sure they dont overwrite
+ //if a metadata and a column have the same name make sure they don't overwrite
if ($this->translateColumnNames) {
$name = Piwik::translate('General_Metadata') . ': ' . $name;
} else {
diff --git a/core/DeviceDetectorCache.php b/core/DeviceDetectorCache.php
index 543769fc54..e2cd998808 100644
--- a/core/DeviceDetectorCache.php
+++ b/core/DeviceDetectorCache.php
@@ -59,7 +59,7 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\Cache
* @param string $id The cache entry ID
* @param array $content The cache content
* @throws \Exception
- * @return bool True if the entry was succesfully stored
+ * @return bool True if the entry was successfully stored
*/
public function save($id, $content, $ttl=0)
{
diff --git a/core/IP.php b/core/IP.php
index 670c674544..919e548353 100644
--- a/core/IP.php
+++ b/core/IP.php
@@ -38,7 +38,7 @@ use Piwik\Network\IPUtils;
class IP
{
/**
- * Returns the most accurate IP address availble for the current user, in
+ * Returns the most accurate IP address available for the current user, in
* IPv4 format. This could be the proxy client's IP address.
*
* @return string IP address in presentation format.
diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php
index 078edb2339..9ce179d769 100644
--- a/core/Metrics/Formatter.php
+++ b/core/Metrics/Formatter.php
@@ -143,7 +143,7 @@ class Formatter
}
/**
- * Returns a pretty formated monetary value using the currency associated with a site.
+ * Returns a pretty formatted monetary value using the currency associated with a site.
*
* @param int|string $value The monetary value to format.
* @param int $idSite The ID of the site whose currency will be used.
diff --git a/core/Piwik.php b/core/Piwik.php
index 71817cb196..7d2193d485 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -722,7 +722,7 @@ class Piwik
/**
* Returns an internationalized string using a translation token. If a translation
- * cannot be found for the toke, the token is returned.
+ * cannot be found for the token, the token is returned.
*
* @param string $translationId Translation ID, eg, `'General_Date'`.
* @param array|string|int $args `sprintf` arguments to be applied to the internationalized
diff --git a/core/PiwikPro/Advertising.php b/core/PiwikPro/Advertising.php
index deea4fa9f3..f2c47f58c2 100644
--- a/core/PiwikPro/Advertising.php
+++ b/core/PiwikPro/Advertising.php
@@ -12,7 +12,7 @@ use Piwik\Config;
/**
* Piwik PRO Advertising related methods. Lets you for example check whether advertising is enabled, generate
- * links for differnt landing pages etc.
+ * links for different landing pages etc.
*
* @api
* @since 2.16.0
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index 5ab8583a5a..053760d2d2 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -151,7 +151,7 @@ class Report
protected $isSubtableReport = false;
/**
- * Some reports may require additonal URL parameters that need to be sent when a report is requested. For instance
+ * Some reports may require additional URL parameters that need to be sent when a report is requested. For instance
* a "goal" report might need a "goalId": `array('idgoal' => 5)`.
* @var null|array
* @api
diff --git a/core/Plugin/Tasks.php b/core/Plugin/Tasks.php
index 19f9e5bb39..a34206c451 100644
--- a/core/Plugin/Tasks.php
+++ b/core/Plugin/Tasks.php
@@ -14,7 +14,7 @@ use Piwik\Scheduler\Task;
/**
* Base class for all Tasks declarations.
- * Tasks are usually meant as scheduled tasks that are executed regularily by Piwik in the background. For instance
+ * Tasks are usually meant as scheduled tasks that are executed regularly by Piwik in the background. For instance
* once every hour or every day. This could be for instance checking for updates, sending email reports, etc.
* Please don't mix up tasks with console commands which can be executed on the CLI.
*/
@@ -33,7 +33,7 @@ class Tasks
/**
* This method is called to collect all schedule tasks. Register all your tasks here that should be executed
- * regularily such as daily or monthly.
+ * regularly such as daily or monthly.
*/
public function schedule()
{
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index 6e190388b6..48ed462f1b 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -260,7 +260,7 @@ abstract class ViewDataTable implements ViewInterface
$this->config->show_footer_icons = (false == $this->requestConfig->idSubtable);
// the exclude low population threshold value is sometimes obtained by requesting data.
- // to avoid issuing unecessary requests when display properties are determined by metadata,
+ // to avoid issuing unnecessary requests when display properties are determined by metadata,
// we allow it to be a closure.
if (isset($this->requestConfig->filter_excludelowpop_value)
&& $this->requestConfig->filter_excludelowpop_value instanceof \Closure
diff --git a/core/Theme.php b/core/Theme.php
index 8965a2687c..ed6261334c 100644
--- a/core/Theme.php
+++ b/core/Theme.php
@@ -105,7 +105,7 @@ class Theme
$source = $src[0];
$pathAsset = $src[2];
- // Basic health check, we dont replace if not starting with plugins/
+ // Basic health check, we don't replace if not starting with plugins/
$posPluginsInPath = strpos($pathAsset, 'plugins');
if ($posPluginsInPath !== 0) {
return $source;
diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php
index 2f024103e1..a4e5fcb696 100644
--- a/core/Tracker/Db/Mysqli.php
+++ b/core/Tracker/Db/Mysqli.php
@@ -113,7 +113,7 @@ class Mysqli extends Db
* @param string $query Query
* @param array $parameters Parameters to bind
* @return array
- * @throws Exception|DbException if an exception occured
+ * @throws Exception|DbException if an exception occurred
*/
public function fetchAll($query, $parameters = array())
{
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index 7e4f7458db..711f760c44 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -184,7 +184,7 @@ class Mysql extends Db
* @param string $query Query
* @param array|string $parameters Parameters to bind array('idsite'=> 1)
* @return PDOStatement|bool PDOStatement or false if failed
- * @throws DbException if an exception occured
+ * @throws DbException if an exception occurred
*/
public function query($query, $parameters = array())
{
diff --git a/core/Tracker/RequestSet.php b/core/Tracker/RequestSet.php
index 3d3c626e17..f7ac3e3a4f 100644
--- a/core/Tracker/RequestSet.php
+++ b/core/Tracker/RequestSet.php
@@ -145,7 +145,7 @@ class RequestSet
return array_values(array_unique($siteIds));
}
- // TODO maybe move to reponse? or somewhere else? not sure where!
+ // TODO maybe move to response? or somewhere else? not sure where!
public function shouldPerformRedirectToUrl()
{
if (!$this->hasRedirectUrl()) {
diff --git a/core/UpdateCheck/ReleaseChannel.php b/core/UpdateCheck/ReleaseChannel.php
index 5f2040747e..b398ea22c3 100644
--- a/core/UpdateCheck/ReleaseChannel.php
+++ b/core/UpdateCheck/ReleaseChannel.php
@@ -14,7 +14,7 @@ namespace Piwik\UpdateCheck;
* nightly builds, to manage updates for clients via a central server, to package a special Piwik version for clients
* with custom plugins etc.
*
- * This is not a public API and it may change without any anouncement.
+ * This is not a public API and it may change without any announcement.
*
* @package Piwik\UpdateCheck
*/
diff --git a/core/Updates.php b/core/Updates.php
index 4c5f7d69ac..049c48f3d8 100644
--- a/core/Updates.php
+++ b/core/Updates.php
@@ -71,7 +71,7 @@ abstract class Updates
/**
* Perform the incremental version update.
*
- * This method should preform all updating logic. If you define queries in an overridden `getMigrationQueries()`
+ * This method should perform all updating logic. If you define queries in an overridden `getMigrationQueries()`
* method, you must call {@link Updater::executeMigrationQueries()} here.
*
* See {@link Updates} for an example.
diff --git a/core/Updates/2.15.0-b17.php b/core/Updates/2.15.0-b17.php
index 86e3decf20..f9c468a54c 100644
--- a/core/Updates/2.15.0-b17.php
+++ b/core/Updates/2.15.0-b17.php
@@ -21,7 +21,7 @@ class Updates_2_15_0_b17 extends Updates
/**
* Perform the incremental version update.
*
- * This method should preform all updating logic. If you define queries in an overridden `getMigrationQueries()`
+ * This method should perform all updating logic. If you define queries in an overridden `getMigrationQueries()`
* method, you must call {@link Updater::executeMigrationQueries()} here.
*
* See {@link Updates} for an example.
diff --git a/core/Updates/2.15.0-b20.php b/core/Updates/2.15.0-b20.php
index 79b4703f1b..f710175192 100644
--- a/core/Updates/2.15.0-b20.php
+++ b/core/Updates/2.15.0-b20.php
@@ -22,7 +22,7 @@ class Updates_2_15_0_b20 extends Updates
/**
* Perform the incremental version update.
*
- * This method should preform all updating logic. If you define queries in an overridden `getMigrationQueries()`
+ * This method should perform all updating logic. If you define queries in an overridden `getMigrationQueries()`
* method, you must call {@link Updater::executeMigrationQueries()} here.
*
* See {@link Updates} for an example.
diff --git a/lang/README.md b/lang/README.md
index 5683ccccda..7e66de76eb 100644
--- a/lang/README.md
+++ b/lang/README.md
@@ -2,6 +2,6 @@
If you want to improve an existing Piwik translation or contribute a new translation, please have a look at our [Transifex project](http://translations.piwik.org).
-We cannot accept pull requests for translations on Github since we manage all translations in this separate system. Translations will automatically be transfered to GitHub from time to time!
+We cannot accept pull requests for translations on GitHub since we manage all translations in this separate system. Translations will automatically be transferred to GitHub from time to time!
If you have any questions feel free to contact the team at translations@piwik.org.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 11:06:18 +0300