diff options
| author | Lukas Winkler <git@lw1.at> | 2020-04-08 13:30:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 13:30:16 +0300 |
| commit | 2c5c72e2da4c015efa78069c9c1b407fc55a6483 (patch) | |
| tree | fecec8638249689fb02b93a883517cc7c64f52d6 /plugins | |
| parent | bb4cad6d756e119f92f397a8dd4574d0d1bf539c (diff) | |
many typo fixes in the code thanks to codespell (#15730)
* many typo fixes in the code thanks to codespell
* reset submodules
I really need to stop using `git commit -a`
* reset change in library
* rebuilt piwik.js
* fix test
* updates expected UI file
Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins')
42 files changed, 62 insertions, 62 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index 29eceadaea..dfc484e9a6 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -329,7 +329,7 @@ class API extends \Piwik\Plugin\API $idSite = $idSites; } } elseif (empty($idSite) && empty($idSites)) { - throw new \Exception('Calling API.getReportMetadata without any idSite is no longer supported since Matomo 3.0.0. Please specifiy at least one idSite via the "idSite" parameter.'); + throw new \Exception('Calling API.getReportMetadata without any idSite is no longer supported since Matomo 3.0.0. Please specify at least one idSite via the "idSite" parameter.'); } Piwik::checkUserHasViewAccess($idSite); diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 6e963ec416..61d1699bc1 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -134,7 +134,7 @@ class ProcessedReport } /** - * Translates the given metric in case the report exists and in case the metric acutally belongs to the report. + * Translates the given metric in case the report exists and in case the metric actually belongs to the report. * * @param string $metric For example 'nb_visits' * @param int $idSite diff --git a/plugins/API/WidgetMetadata.php b/plugins/API/WidgetMetadata.php index ef1c6e51d2..bf0962e5f6 100644 --- a/plugins/API/WidgetMetadata.php +++ b/plugins/API/WidgetMetadata.php @@ -124,7 +124,7 @@ class WidgetMetadata $item['layout'] = $widget->getLayout(); $item['isContainer'] = true; - // we do not want to create categories to the inital categoryList. Otherwise we'd maybe display more pages + // we do not want to create categories to the initial categoryList. Otherwise we'd maybe display more pages // etc. $subCategoryList = new CategoryList(); $this->createMissingCategoriesAndSubcategories($subCategoryList, $widget->getWidgetConfigs()); @@ -316,4 +316,4 @@ class WidgetMetadata return $ca; } -}
\ No newline at end of file +} diff --git a/plugins/Actions/Columns/ActionType.php b/plugins/Actions/Columns/ActionType.php index f862faf80b..00e55e2cad 100644 --- a/plugins/Actions/Columns/ActionType.php +++ b/plugins/Actions/Columns/ActionType.php @@ -75,7 +75,7 @@ class ActionType extends ActionDimension public function configureMetrics(MetricsList $metricsList, DimensionMetricFactory $dimensionMetricFactory) { - // do not genereate any metric for this + // do not generate any metric for this } } diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index 988690e9ea..901eb64012 100644 --- a/plugins/Annotations/javascripts/annotations.js +++ b/plugins/Annotations/javascripts/annotations.js @@ -444,7 +444,7 @@ /** * Shows an annotation manager under a report for a specific site & date range. * - * @param {Element} domElem The element of the report to show the annotation manger + * @param {Element} domElem The element of the report to show the annotation manager * under. * @param {int} idSite The ID of the site to show the annotations of. * @param {string} date The start date of the period. diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index a6f12a139a..d343a1fadb 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -201,7 +201,7 @@ class Controller extends \Piwik\Plugin\Controller // -------------------------------------------------------- // ROW EVOLUTION // The following methods render the popover that shows the - // evolution of a singe or multiple rows in a data table + // evolution of a single or multiple rows in a data table // -------------------------------------------------------- /** Render the entire row evolution popover for a single row */ diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index bb73f9bb87..59d342274e 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -24,7 +24,7 @@ use Piwik\ViewDataTable\Factory; /** * ROW EVOLUTION - * The class handles the popover that shows the evolution of a singe row in a data table + * The class handles the popover that shows the evolution of a single row in a data table */ class RowEvolution { diff --git a/plugins/CoreHome/angularjs/common/directives/focusif.js b/plugins/CoreHome/angularjs/common/directives/focusif.js index 56940808b1..669e3e7ff5 100644 --- a/plugins/CoreHome/angularjs/common/directives/focusif.js +++ b/plugins/CoreHome/angularjs/common/directives/focusif.js @@ -6,7 +6,7 @@ */ /** - * If the given expression evaluates to true the element will be focussed + * If the given expression evaluates to true the element will be focused * * Example: * <input type="text" piwik-focus-if="view.editName"> @@ -30,4 +30,4 @@ } }; } -})();
\ No newline at end of file +})(); diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js index 916c5b73e1..e30ea0746e 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js @@ -251,7 +251,7 @@ $httpBackend.flush(); }); - it("shuld correctly handle errors in a bulk request response, regardless of error location", function (done) { + it("should correctly handle errors in a bulk request response, regardless of error location", function (done) { piwikApi.bulkFetch([ { method: "SomeOtherPlugin.whatever" @@ -270,4 +270,4 @@ $httpBackend.flush(); }); }); -})();
\ No newline at end of file +})(); diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 073781f369..d786f880d4 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -639,7 +639,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { var normalOverlapBecauseTableIsFullWidth = showScrollbarIfMoreThanThisPxOverlap || 51; if (tableWidth > widthToCheckElementIsActuallyThere && dataTableWidth > widthToCheckElementIsActuallyThere && (dataTableWidth - tableWidth) > normalOverlapBecauseTableIsFullWidth) { - // when after adjusting the columns the widget/report is sitll wider than the actual dataTable, we need + // when after adjusting the columns the widget/report is still wider than the actual dataTable, we need // to make it scrollable otherwise reports overlap each other $domNodeToSetOverflow.css('overflow-y', 'scroll'); @@ -1494,7 +1494,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { } }); - // higlight all columns on hover + // highlight all columns on hover $(domElem).on('mouseenter', 'td', function (e) { e.stopPropagation(); var $this = $(e.target); diff --git a/plugins/CoreHome/javascripts/donate.js b/plugins/CoreHome/javascripts/donate.js index e403f18497..f377796d6c 100644 --- a/plugins/CoreHome/javascripts/donate.js +++ b/plugins/CoreHome/javascripts/donate.js @@ -133,7 +133,7 @@ } }); - // event for programatically changing the position + // event for programmatically changing the position $('body').on('piwik:changePosition', '.piwik-donate-slider', function (e, data) { moveSliderPosition(this, data.position); }); diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index c53cdcb493..b6fd479e49 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -1016,7 +1016,7 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () { ctx.restore(); } - // tigger the event jqplotPiwikTickOver when the mosue enters + // trigger the event jqplotPiwikTickOver when the mosue enters // and new tick. this is used for tooltips. function handleMouseMove(ev, gridpos, datapos, neighbor, plot) { var c = plot.plugins.piwikTicks; diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index 6d31318866..638ce56d0c 100644 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -142,7 +142,7 @@ class MySQLMetadataProvider } /** - * Retruns table statuses for every admin table. + * Returns table statuses for every admin table. * * @return array An array of status arrays. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. */ @@ -347,4 +347,4 @@ class MySQLMetadataProvider { $this->tableStatuses = null; } -}
\ No newline at end of file +} diff --git a/plugins/Dashboard/javascripts/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js index 4f0e1a2553..b2d5175a5b 100644 --- a/plugins/Dashboard/javascripts/dashboardObject.js +++ b/plugins/Dashboard/javascripts/dashboardObject.js @@ -29,7 +29,7 @@ */ var dashboardElement = null; /** - * Boolean indicating wether the layout config has been changed or not + * Boolean indicating weather the layout config has been changed or not * @type {boolean} */ var dashboardChanged = false; diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js index 9d10183b19..7d920c9053 100644 --- a/plugins/Dashboard/javascripts/dashboardWidget.js +++ b/plugins/Dashboard/javascripts/dashboardWidget.js @@ -9,7 +9,7 @@ $.widget('piwik.dashboardWidget', { /** - * Boolean indicating wether the widget is currently maximised + * Boolean indicating weather the widget is currently maximised * @type {Boolean} */ isMaximised: false, diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index a04af1b929..dcaefc7a1c 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -164,7 +164,7 @@ class API extends \Piwik\Plugin\API * * Unlike DevicesDetection plugin now, the UserSettings plugin did not store archives holding the os and browser data without * their version number. The "version-less" reports were always generated out of the "version-containing" archives . - * For big archives (month/year) that ment that some of the data was truncated, due to the datatable entry limit. + * For big archives (month/year) that meant that some of the data was truncated, due to the datatable entry limit. * To avoid that data loss / inaccuracy in the future, DevicesDetection plugin will also store archives without the version. * For data archived before DevicesDetection plugin was enabled, those archives do not exist, so we try to calculate * them here from the "version-containing" reports if possible. diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 5399309477..814b7c1e00 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -323,7 +323,7 @@ function getOsLogo($short) */ function getBrowserEngineName($engineName) { /* - * Map leagcy types to engines + * Map legacy types to engines */ $oldTypeMapping = array( 'ie' => 'Trident', diff --git a/plugins/Ecommerce/Reports/BaseItem.php b/plugins/Ecommerce/Reports/BaseItem.php index 13190fedc5..b9e5ac6b17 100644 --- a/plugins/Ecommerce/Reports/BaseItem.php +++ b/plugins/Ecommerce/Reports/BaseItem.php @@ -49,7 +49,7 @@ abstract class BaseItem extends Base public function getMetricsDocumentation() { - // we do not check whether it is abondon carts if not set re performance improvements + // we do not check whether it is abandon carts if not set re performance improvements if ($this->isAbandonedCart($fetchIfNotSet = false)) { return array( 'revenue' => Piwik::translate('Goals_ColumnRevenueDocumentation', diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index 9a13f3abad..cfaffdcc45 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -66,7 +66,7 @@ class API extends \Piwik\Plugin\API /** * Sums two floats and returns the result. - * The paramaters are set automatically from the GET request + * The parameters are set automatically from the GET request * when the API function is called. You can also use default values * as shown in this example. * diff --git a/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php b/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php index 49be8fd1f5..2d5af784a6 100644 --- a/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php +++ b/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php @@ -87,7 +87,7 @@ class ConvertRegionCodesToIso extends ConsoleCommand $activationTime = Option::get(GeoIp2::SWITCH_TO_ISO_REGIONS_OPTION_NAME); $activationDateTime = date('Y-m-d H:i:s', $activationTime); - // fix country and region of tibet so it wil be updated correctly afterwards + // fix country and region of tibet so it will be updated correctly afterwards $tibetFixQuery = 'UPDATE %s SET location_country = "cn", location_region = "14" WHERE location_country = "ti"'; // replace invalid country codes used by GeoIP Legacy diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index c494afd0b8..1cab17715c 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -315,7 +315,7 @@ class Archiver extends \Piwik\Plugin\Archiver } if ($row['ecommerceType'] == GoalManager::IDGOAL_CART) { - // abandoned carts are the numner of visits with an abandoned cart + // abandoned carts are the number of visits with an abandoned cart $row[Metrics::INDEX_ECOMMERCE_ORDERS] = $row[Metrics::INDEX_NB_VISITS]; } diff --git a/plugins/ImageGraph/StaticGraph/GridGraph.php b/plugins/ImageGraph/StaticGraph/GridGraph.php index 05ced42693..d06ddd07c5 100644 --- a/plugins/ImageGraph/StaticGraph/GridGraph.php +++ b/plugins/ImageGraph/StaticGraph/GridGraph.php @@ -196,7 +196,7 @@ abstract class GridGraph extends StaticGraph // Caution : // - pChart will silently add some value (see $paddingAddedByPChart) to $legendTopLeftYValue depending on multiple criteria // - pChart will not take into account the size of the text. Setting $legendTopLeftYValue = 0 will crop the legend's labels - // The following section of code determines the value of $legendTopLeftYValue while taking into account the following paremeters : + // The following section of code determines the value of $legendTopLeftYValue while taking into account the following parameters : // - whether legend items have icons // - whether icons are bigger than the legend's labels // - how much colored shadow padding is required diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index d2341f2d09..88c9d44199 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -185,7 +185,7 @@ class API extends \Piwik\Plugin\API /** * Return array of available languages * - * @return array Arry of array, each containing its ISO language code and name of the language + * @return array Array of array, each containing its ISO language code and name of the language */ public function getAvailableLanguageNames() { diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php index 03159542ce..3458016cc4 100644 --- a/plugins/LanguagesManager/Commands/CreatePull.php +++ b/plugins/LanguagesManager/Commands/CreatePull.php @@ -37,7 +37,7 @@ class CreatePull extends TranslationBase if (!empty($changes)) { - $output->writeln("You have uncommited changes. Creating pull request is only available with a clean working directory"); + $output->writeln("You have uncommitted changes. Creating pull request is only available with a clean working directory"); return; } diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php index 2914beaff9..3c3717607f 100644 --- a/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php +++ b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php @@ -42,7 +42,7 @@ class UnnecassaryWhitespaces extends FilterAbstract // remove excessive line breaks (and leading/trailing whitespace) from translations $stringNoLineBreak = trim($translation); - $stringNoLineBreak = str_replace("\r", "", $stringNoLineBreak); # remove useless carrige renturns + $stringNoLineBreak = str_replace("\r", "", $stringNoLineBreak); # remove useless carriage returns $stringNoLineBreak = preg_replace('/(\n[ ]+)/', "\n", $stringNoLineBreak); # remove useless white spaces after line breaks $stringNoLineBreak = preg_replace('/([\n]{2,})/', "\n\n", $stringNoLineBreak); # remove excessive line breaks if (empty($baseTranslation) || !substr_count($baseTranslation, "\n")) { diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php index e4800e7a93..0c12a92065 100644 --- a/plugins/Login/PasswordResetter.php +++ b/plugins/Login/PasswordResetter.php @@ -98,7 +98,7 @@ class PasswordResetter /** * The from email to use in the confirm password reset email. * - * Deafults to the `[General] login_password_recovery_email_address` INI config option. + * Defaults to the `[General] login_password_recovery_email_address` INI config option. * * @var */ diff --git a/plugins/Morpheus/fonts/README.md b/plugins/Morpheus/fonts/README.md index d40014a490..51cc41cd4f 100644 --- a/plugins/Morpheus/fonts/README.md +++ b/plugins/Morpheus/fonts/README.md @@ -6,7 +6,7 @@ them in `LEGALNOTICE`. WOFF2 is a font format that allows higher compression than WOFF and is already supported by [all major browsers](https://caniuse.com/#feat=woff2). -Unfortunatly icomoon doesn't create WOFF2 files, but as WOFF2 is just a container for ttf fonts, they can be easily converted. +Unfortunately icomoon doesn't create WOFF2 files, but as WOFF2 is just a container for ttf fonts, they can be easily converted. ### Steps diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index fc4a5e34ae..4aef392f07 100644 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -66,7 +66,7 @@ class API extends \Piwik\Plugin\API * well as the evolution of these values, of all existing sites over a * specified period of time. * - * If the specified period is not a 'range', this function will calculcate + * If the specified period is not a 'range', this function will calculate * evolution metrics. Evolution metrics are metrics that display the * percent increase/decrease of another metric since the last period. * @@ -455,7 +455,7 @@ class API extends \Piwik\Plugin\API } /** - * Sets the number of total visits in tha pastTable on the dataTable as metadata. + * Sets the number of total visits in the pastTable on the dataTable as metadata. * * @param DataTable $dataTable * @param DataTable $pastTable diff --git a/plugins/PrivacyManager/Commands/AnonymizeRawData.php b/plugins/PrivacyManager/Commands/AnonymizeRawData.php index 0a2a0beaab..c59b73307c 100644 --- a/plugins/PrivacyManager/Commands/AnonymizeRawData.php +++ b/plugins/PrivacyManager/Commands/AnonymizeRawData.php @@ -26,8 +26,8 @@ class AnonymizeRawData extends ConsoleCommand $this->setName('privacymanager:anonymize-some-raw-data'); $this->setDescription('Anonymize some of the stored raw data (logs). The reason it only anonymizes "some" data is that personal data can be present in many various data collection points, for example some of your page URLs or page titles may include personal data and these will not be anonymized by this command as it is not possible to detect personal data for example in a URL automatically.'); $this->addOption('date', null, InputOption::VALUE_REQUIRED, 'Date or date range to invalidate raw data for (UTC). Either a date like "2015-01-03" or a range like "2015-01-05,2015-02-12". By default, all data including today will be anonymized.', $defaultDate); - $this->addOption('unset-visit-columns', null, InputOption::VALUE_REQUIRED, 'Comma seperated list of log_visit columns that you want to unset. Each value for that column will be set to its default value. If the same column exists in "log_conversion" table as well, the column will be unset there as well. This action cannot be undone.', ''); - $this->addOption('unset-link-visit-action-columns', null, InputOption::VALUE_REQUIRED, 'Comma seperated list of log_link_visit_action columns that you want to unset. Each value for that column will be set to its default value. This action cannot be undone.', ''); + $this->addOption('unset-visit-columns', null, InputOption::VALUE_REQUIRED, 'Comma separated list of log_visit columns that you want to unset. Each value for that column will be set to its default value. If the same column exists in "log_conversion" table as well, the column will be unset there as well. This action cannot be undone.', ''); + $this->addOption('unset-link-visit-action-columns', null, InputOption::VALUE_REQUIRED, 'Comma separated list of log_link_visit_action columns that you want to unset. Each value for that column will be set to its default value. This action cannot be undone.', ''); $this->addOption('anonymize-ip', null, InputOption::VALUE_NONE, 'If set, the IP will be anonymized with a mask of at least 2. This action cannot be undone.'); $this->addOption('anonymize-location', null, InputOption::VALUE_NONE, 'If set, the location will be re-evaluated based on the anonymized IP. This action cannot be undone.'); $this->addOption('anonymize-userid', null, InputOption::VALUE_NONE, 'If set, any set user-id will be anonymized. This action cannot be undone.'); diff --git a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php index e5311a5057..36eb75554e 100644 --- a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php +++ b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php @@ -49,7 +49,7 @@ class DoNotTrackHeaderChecker // /.well-known/dnt // per Tracking Preference Expression - //Tracking Perference Expression has been updated to require Tk: N rather than Tk: 1 + //Tracking Preference Expression has been updated to require Tk: N rather than Tk: 1 Common::sendHeader('Tk: N'); } } diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php index 5ed877cd2f..c8e7ccd8ab 100644 --- a/plugins/PrivacyManager/LogDataPurger.php +++ b/plugins/PrivacyManager/LogDataPurger.php @@ -58,7 +58,7 @@ class LogDataPurger * - log_conversion_item * - log_action * - * @param int $deleteLogsOlderThan The number of days after which log entires are considered old. + * @param int $deleteLogsOlderThan The number of days after which log entries are considered old. * Visits and related data whose age is greater than this number * will be purged. * @param bool $deleteUnusedLogActions Whether to delete unused log actions or not @@ -91,7 +91,7 @@ class LogDataPurger * } * * @param \Piwik\Date $dateUpperLimit A date where visits that occur before this time should be deleted. - * @param int $deleteLogsOlderThan The number of days after which log entires are considered old. + * @param int $deleteLogsOlderThan The number of days after which log entries are considered old. * Visits and related data whose age is greater than this number will be purged. */ Piwik::postEvent('PrivacyManager.deleteLogsOlderThan', array($dateUpperLimit, $deleteLogsOlderThan)); @@ -106,7 +106,7 @@ class LogDataPurger * This function returns an array that maps table names with the number of rows * that will be deleted. * - * @param int $deleteLogsOlderThan The number of days after which log entires are considered old. + * @param int $deleteLogsOlderThan The number of days after which log entries are considered old. * Visits and related data whose age is greater than this number * will be purged. * @return array diff --git a/plugins/Referrers/Social.php b/plugins/Referrers/Social.php index c0c792bc86..52ac670e21 100644 --- a/plugins/Referrers/Social.php +++ b/plugins/Referrers/Social.php @@ -119,7 +119,7 @@ class Social extends Singleton /** - * Get's social network name from URL. + * Gets social network name from URL. * * @param string $url * @return string diff --git a/plugins/SEO/Metric/Bing.php b/plugins/SEO/Metric/Bing.php index d570d15ed7..5529a65ddd 100644 --- a/plugins/SEO/Metric/Bing.php +++ b/plugins/SEO/Metric/Bing.php @@ -35,7 +35,7 @@ class Bing implements MetricsProvider try { $response = str_replace(' ', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT'])); - $response = str_replace(' ', '', $response); // number uses nbsp as thousand seperator + $response = str_replace(' ', '', $response); // number uses nbsp as thousand separator if (preg_match('#([0-9,\.]+) results#i', $response, $p)) { $pageCount = NumberFormatter::getInstance()->formatNumber((int)str_replace(array(',', '.'), '', $p[1])); diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index 4288a28f49..b4946c15ad 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -711,7 +711,7 @@ class API extends \Piwik\Plugin\API * event to list the available report parameters for their transport medium. * * @param array $availableParameters The list of available parameters for this report type. - * This is an array that maps paramater IDs with a boolean + * This is an array that maps parameter IDs with a boolean * that indicates whether the parameter is mandatory or not. * @param string $reportType A string ID describing how the report is sent, eg, * `'sms'` or `'email'`. diff --git a/plugins/ScheduledReports/config/tcpdf_config.php b/plugins/ScheduledReports/config/tcpdf_config.php index 97f0b9d286..8172076ca9 100644 --- a/plugins/ScheduledReports/config/tcpdf_config.php +++ b/plugins/ScheduledReports/config/tcpdf_config.php @@ -211,7 +211,7 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { define('HEAD_MAGNIFICATION', 1.1); /** - * height of cell repect font height + * height of cell respect font height */ define('K_CELL_HEIGHT_RATIO', 1.25); diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js index 8b6efbce62..51d5d6508e 100644 --- a/plugins/SegmentEditor/javascripts/Segmentation.js +++ b/plugins/SegmentEditor/javascripts/Segmentation.js @@ -834,7 +834,7 @@ Segmentation = (function($) { this.content = this.target.find(".segmentationContainer"); } - // assign content to object attribute to make it easil accesible through all widget methods + // assign content to object attribute to make it easily accessible through all widget methods this.markCurrentSegment(); setTimeout(function () { self.markComparedSegments(); diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json index 5713dfbd78..7d98806741 100644 --- a/plugins/SegmentEditor/lang/en.json +++ b/plugins/SegmentEditor/lang/en.json @@ -47,7 +47,7 @@ "UnprocessedSegmentApiError3": "Then after a few hours your segment data should become available through the API. (If it does not, there may be a problem.)", "CustomUnprocessedSegmentApiError1": "The Segment you requested has not yet been created in the Segment Editor and so the report data has not been pre-processed.", "CustomUnprocessedSegmentApiError2": "To see data for this segment, you must go to Matomo and create this segment manually in the Segment Editor.", - "CustomUnprocessedSegmentApiError3": "(Alternatively, you can create a new segment programatically using the SegmentEditor.add API method).", + "CustomUnprocessedSegmentApiError3": "(Alternatively, you can create a new segment programmatically using the SegmentEditor.add API method).", "CustomUnprocessedSegmentApiError4": "Once created the segment in the editor (or via API), this error message will disappear and within a few hours you will see your segmented report data, after the segment data has been pre-processed. (If it does not, there may be a problem.)", "CustomUnprocessedSegmentApiError5": "Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API.", "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.", @@ -58,4 +58,4 @@ "CompareThisSegment": "Compare this segment with the selected segment and period.", "Test": "Test" } -}
\ No newline at end of file +} diff --git a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentUnprocessed.xml b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentUnprocessed.xml index ed4fec1ebd..dcffffeaea 100644 --- a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentUnprocessed.xml +++ b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentUnprocessed.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <error message="The Segment you requested has not yet been created in the Segment Editor and so the report data has not been pre-processed. To see data for this segment, you must go to Matomo and create this segment manually in the Segment Editor. (Alternatively, you can create a new segment programatically using the SegmentEditor.add API method). Once created the segment in the editor (or via API), this error message will disappear and within a few hours you will see your segmented report data, after the segment data has been pre-processed. (If it does not, there may be a problem.) Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API. When using this API method, you will see which users and actions were matched by your &segment= parameter. This can help you confirm your Segment matches the users and actions you expect it to." /> + <error message="The Segment you requested has not yet been created in the Segment Editor and so the report data has not been pre-processed. To see data for this segment, you must go to Matomo and create this segment manually in the Segment Editor. (Alternatively, you can create a new segment programmatically using the SegmentEditor.add API method). Once created the segment in the editor (or via API), this error message will disappear and within a few hours you will see your segmented report data, after the segment data has been pre-processed. (If it does not, there may be a problem.) Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API. When using this API method, you will see which users and actions were matched by your &segment= parameter. This can help you confirm your Segment matches the users and actions you expect it to." /> </result>
\ No newline at end of file diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index 2f42048818..adf7553a02 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -408,7 +408,7 @@ $('#realTimeMapNoVisitsInfo').toggle(!report.length); } - // check wether we got any geolocated visits left + // check whether we got any geolocated visits left if (!report.length) { $('.realTimeMap_overlay .showing_visits_of').hide(); $('.realTimeMap_overlay .no_data').show(); diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index d04efc19f7..4b7b584cd8 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -1036,7 +1036,7 @@ class API extends \Piwik\Plugin\API $capabilities = array(); if (is_array($access)) { - // we require one role, and optionally multiple capabilties + // we require one role, and optionally multiple capabilities list($roles, $capabilities) = $this->getRoleAndCapabilitiesFromAccess($access); if (count($roles) < 1) { diff --git a/plugins/UsersManager/tests/Integration/UserAccessFilterTest.php b/plugins/UsersManager/tests/Integration/UserAccessFilterTest.php index 06b05a618b..b3dd4159c9 100644 --- a/plugins/UsersManager/tests/Integration/UserAccessFilterTest.php +++ b/plugins/UsersManager/tests/Integration/UserAccessFilterTest.php @@ -73,7 +73,7 @@ class UserAccessFilterTest extends IntegrationTestCase public function test_filterUser_WithSuperUserAccess_ShouldAlwaysReturnTrue() { - $this->configureAcccessForLogin('login1'); + $this->configureAccessForLogin('login1'); foreach ($this->getAllLogins() as $login) { $this->assertSame(array('login' => $login), $this->filter->filterUser(array('login' => $login))); } @@ -82,7 +82,7 @@ class UserAccessFilterTest extends IntegrationTestCase public function test_filterUser_WithViewUserAccess_ShouldOnlyReturnUserForOwnLogin() { $identity = 'login4'; - $this->configureAcccessForLogin($identity); + $this->configureAccessForLogin($identity); $this->assertSame(array('login' => $identity), $this->filter->filterUser(array('login' => $identity))); foreach ($this->getAllLogins() as $login) { if ($login !== $identity) { @@ -96,7 +96,7 @@ class UserAccessFilterTest extends IntegrationTestCase */ public function test_filterUser_WithAdminAccess_ShouldOnlyReturnUserForOwnLogin($expectedAllowed, $loginToSee) { - $this->configureAcccessForLogin('login2'); + $this->configureAccessForLogin('login2'); if ($expectedAllowed) { $this->assertSame(array('login' => $loginToSee), $this->filter->filterUser(array('login' => $loginToSee))); } else { @@ -109,7 +109,7 @@ class UserAccessFilterTest extends IntegrationTestCase */ public function test_isNonSuperUserAllowedToSeeThisLogin_WithAdminAccess_IsAllowedToSeeAnyUserHavingAccessToSameAdminSites($expectedAllowed, $loginToSee) { - $this->configureAcccessForLogin('login2'); + $this->configureAccessForLogin('login2'); $this->assertSame($expectedAllowed, $this->filter->isNonSuperUserAllowedToSeeThisLogin($loginToSee)); } @@ -129,7 +129,7 @@ class UserAccessFilterTest extends IntegrationTestCase public function test_isNonSuperUserAllowedToSeeThisLogin_WithAdminAccess_IsAllowedToSeeAnyUserHavingAccessToSameAdminSites_UserHasAccessToOnlyOneAdminSite() { - $this->configureAcccessForLogin('login5'); + $this->configureAccessForLogin('login5'); $this->assertTrue($this->filter->isNonSuperUserAllowedToSeeThisLogin('login2')); $this->assertTrue($this->filter->isNonSuperUserAllowedToSeeThisLogin('login5')); @@ -144,7 +144,7 @@ class UserAccessFilterTest extends IntegrationTestCase public function test_isNonSuperUserAllowedToSeeThisLogin_WithOnlyViewAccess_IsAllowedToSeeOnlyOwnUser() { - $this->configureAcccessForLogin('login7'); + $this->configureAccessForLogin('login7'); $this->assertTrue($this->filter->isNonSuperUserAllowedToSeeThisLogin('login7')); // a view user is allowed to see itself $this->assertFalse($this->filter->isNonSuperUserAllowedToSeeThisLogin('login1')); // a user having view access only is not allowed to see any other user @@ -158,7 +158,7 @@ class UserAccessFilterTest extends IntegrationTestCase public function test_isNonSuperUserAllowedToSeeThisLogin_WithNoAccess_IsStillAllowedToSeeAnyUser() { - $this->configureAcccessForLogin('login3'); + $this->configureAccessForLogin('login3'); $this->assertTrue($this->filter->isNonSuperUserAllowedToSeeThisLogin('login3')); // a view user is allowed to see itself $this->assertFalse($this->filter->isNonSuperUserAllowedToSeeThisLogin('login1')); @@ -175,7 +175,7 @@ class UserAccessFilterTest extends IntegrationTestCase */ public function test_filterLogins($expectedLogins, $loginIdentity, $logins) { - $this->configureAcccessForLogin($loginIdentity); + $this->configureAccessForLogin($loginIdentity); $this->assertSame($expectedLogins, $this->filter->filterLogins($logins)); // a view user is allowed to see itself } @@ -184,7 +184,7 @@ class UserAccessFilterTest extends IntegrationTestCase */ public function test_filterUsers($expectedLogins, $loginIdentity, $logins) { - $this->configureAcccessForLogin($loginIdentity); + $this->configureAccessForLogin($loginIdentity); $users = array(); $expectedUsers = array(); @@ -206,7 +206,7 @@ class UserAccessFilterTest extends IntegrationTestCase */ public function test_filterLoginIndexedArray($expectedLogins, $loginIdentity, $logins) { - $this->configureAcccessForLogin($loginIdentity); + $this->configureAccessForLogin($loginIdentity); $testArray = array(); $expectedTestArray = array(); @@ -303,7 +303,7 @@ class UserAccessFilterTest extends IntegrationTestCase } } - private function configureAcccessForLogin($login) + private function configureAccessForLogin($login) { $hasSuperUser = false; $idSitesAdmin = array(); diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php index 5aac364007..067ee2214a 100644 --- a/plugins/UsersManager/tests/Integration/UsersManagerTest.php +++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php @@ -663,7 +663,7 @@ class UsersManagerTest extends IntegrationTestCase } /** - * normal case, set different acccess to different websites for one user + * normal case, set different access to different websites for one user */ public function testSetUserAccessMultipleCallDistinctAccessSameUser() { |