From b7a4e825455ecf802feba5cd62c7d01a772be4d3 Mon Sep 17 00:00:00 2001 From: petarpetkovic Date: Mon, 13 Aug 2018 19:07:14 +0200 Subject: [PATCH] Fix some of the common typos * supress -> suppress (Except in backup_LogTest.php) * recomend -> recommend * becuase -> because * accross -> across Bug: T201491 Change-Id: I8faa4e6cc688b3ee204b3f79ab55eb7b65cc1fdd --- HISTORY | 6 +++--- includes/MediaWiki.php | 2 +- includes/deferred/WANCacheReapUpdate.php | 2 +- includes/libs/rdbms/database/Database.php | 2 +- includes/libs/rdbms/lbfactory/ILBFactory.php | 2 +- includes/media/BitmapMetadataHandler.php | 2 +- includes/revisiondelete/RevDelList.php | 2 +- includes/utils/UIDGenerator.php | 2 +- maintenance/Maintenance.php | 2 +- resources/src/jquery/jquery.tabIndex.js | 2 +- resources/src/mediawiki.special.preferences.ooui/tabs.js | 2 +- tests/phpunit/includes/user/UserTest.php | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/HISTORY b/HISTORY index 2dc94ba850..bc74a6b700 100644 --- a/HISTORY +++ b/HISTORY @@ -5808,7 +5808,7 @@ This is a security and maintenance release of the MediaWiki 1.20 branch. * Localisation updates from http://translatewiki.net. * mwdocgen.php: Implement --version option. * Remove svnstat stuff used in Doxygen generation -* (bug 43594) Correctly supress warnings that were missed after the upstream +* (bug 43594) Correctly suppress warnings that were missed after the upstream * PHP change to E_STRICT being included in E_ALL. == MediaWiki 1.20.4 == @@ -11905,7 +11905,7 @@ it from source control: https://www.mediawiki.org/wiki/Download_from_SVN * (bug 11082) Fix check for fully-specced table names in Database::tableName * (bug 11067) Fix regression in upload conflict thumbnail display * (bug 10985) Resolved cached entries on Special:DoubleRedirects were being - supressed, breaking paging - now strikes out "fixed" results + suppressed, breaking paging - now strikes out "fixed" results * (bug 8393) and need to be preserved (without attributes) for entries in the table of contents * (bug 11114) Fix regression in read-only mode error display during editing @@ -16315,7 +16315,7 @@ pages for purposes of page relevancy ranking. * (bug 1241) Don't show 'cont.' for first entry of the category list * (bug 1240) Special:Preferences was broken in Slovenian locale when $wgUseDynamicDates is enabled -* Added magic word MAG_NOCONTENTCONVERT to supress the conversion of the +* Added magic word MAG_NOCONTENTCONVERT to suppress the conversion of the content of an article. Useful in zh: * write-lock for updating the zh conversion tables in memcache * recursively parse subpages of MediaWiki:Zhconversiontable diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 36200476df..2a84556586 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -866,7 +866,7 @@ class MediaWiki { $this->performRequest(); // GUI-ify and stash the page output in MediaWiki::doPreOutputCommit() while - // ChronologyProtector synchronizes DB positions or replicas accross all datacenters. + // ChronologyProtector synchronizes DB positions or replicas across all datacenters. $buffer = null; $outputWork = function () use ( $output, &$buffer ) { if ( $buffer === null ) { diff --git a/includes/deferred/WANCacheReapUpdate.php b/includes/deferred/WANCacheReapUpdate.php index 74da0827de..604f2052c4 100644 --- a/includes/deferred/WANCacheReapUpdate.php +++ b/includes/deferred/WANCacheReapUpdate.php @@ -11,7 +11,7 @@ use Wikimedia\Rdbms\IDatabase; * recentchanges table as a reliable stream to make certain keys reach consistency * as soon as the underlying replica database catches up. These means that critical * keys will not escape getting purged simply due to brief hiccups in the network, - * which are more prone to happen accross datacenters. + * which are more prone to happen across datacenters. * * ---- * "I was trying to cheat death. I was only trying to surmount for a little while the diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 2673b2c001..d3b1ba80ed 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -4590,7 +4590,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware */ public function __clone() { $this->connLogger->warning( - "Cloning " . static::class . " is not recomended; forking connection:\n" . + "Cloning " . static::class . " is not recommended; forking connection:\n" . ( new RuntimeException() )->getTraceAsString() ); diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php index 222d7d1c96..23699c7a88 100644 --- a/includes/libs/rdbms/lbfactory/ILBFactory.php +++ b/includes/libs/rdbms/lbfactory/ILBFactory.php @@ -338,7 +338,7 @@ interface ILBFactory { /** * Append ?cpPosIndex parameter to a URL for ChronologyProtector purposes if needed * - * Note that unlike cookies, this works accross domains + * Note that unlike cookies, this works across domains * * @param string $url * @param int $index Write counter index diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index c0dfa3a074..81c63db2e6 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -123,7 +123,7 @@ class BitmapMetadataHandler { */ function getMetadataArray() { // this seems a bit ugly... This is all so its merged in right order - // based on the MWG recomendation. + // based on the MWG recommendation. $temp = []; krsort( $this->metaPriority ); foreach ( $this->metaPriority as $pri ) { diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index cf895bae89..c5cffea505 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -207,7 +207,7 @@ abstract class RevDelList extends RevisionListBase { if ( $ok ) { $idsForLog[] = $item->getId(); - // If any item field was suppressed or unsupressed + // If any item field was suppressed or unsuppressed if ( ( $oldBits | $newBits ) & $this->getSuppressBit() ) { $logType = 'suppress'; } diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php index d184e92034..52740c9952 100644 --- a/includes/utils/UIDGenerator.php +++ b/includes/utils/UIDGenerator.php @@ -365,7 +365,7 @@ class UIDGenerator { $counter = null; // post-increment persistent counter value // Use APC/etc if requested, available, and not in CLI mode; - // Counter values would not survive accross script instances in CLI mode. + // Counter values would not survive across script instances in CLI mode. $cache = null; if ( ( $flags & self::QUICK_VOLATILE ) && !wfIsCLI() ) { $cache = MediaWikiServices::getInstance()->getLocalServerObjectCache(); diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 286bd8f1d6..63777343d5 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -533,7 +533,7 @@ abstract class Maintenance { # Generic (non script dependant) options: $this->addOption( 'help', 'Display this help message', false, false, 'h' ); - $this->addOption( 'quiet', 'Whether to supress non-error output', false, false, 'q' ); + $this->addOption( 'quiet', 'Whether to suppress non-error output', false, false, 'q' ); $this->addOption( 'conf', 'Location of LocalSettings.php, if not default', false, true ); $this->addOption( 'wiki', 'For specifying the wiki ID', false, true ); $this->addOption( 'globals', 'Output globals at the end of processing for debugging' ); diff --git a/resources/src/jquery/jquery.tabIndex.js b/resources/src/jquery/jquery.tabIndex.js index ed37aa1ea3..5fb28aa34b 100644 --- a/resources/src/jquery/jquery.tabIndex.js +++ b/resources/src/jquery/jquery.tabIndex.js @@ -13,7 +13,7 @@ $( this ).find( '[tabindex]' ).each( function () { var tabIndex = parseInt( $( this ).prop( 'tabindex' ), 10 ); // In IE6/IE7 the above jQuery selector returns all elements, - // becuase it has a default value for tabIndex in IE6/IE7 of 0 + // because it has a default value for tabIndex in IE6/IE7 of 0 // (rather than null/undefined). Therefore check "> 0" as well. // Under IE7 under Windows NT 5.2 is also capable of returning NaN. if ( tabIndex > 0 && !isNaN( tabIndex ) ) { diff --git a/resources/src/mediawiki.special.preferences.ooui/tabs.js b/resources/src/mediawiki.special.preferences.ooui/tabs.js index 11ed425415..194f74ce7a 100644 --- a/resources/src/mediawiki.special.preferences.ooui/tabs.js +++ b/resources/src/mediawiki.special.preferences.ooui/tabs.js @@ -73,7 +73,7 @@ * @ignore * @param {string} name the name of a tab without the prefix ("mw-prefsection-") * @param {string} [mode] A hash will be set according to the current - * open section. Set mode 'noHash' to supress this. + * open section. Set mode 'noHash' to suppress this. */ function switchPrefTab( name, mode ) { if ( mode === 'noHash' ) { diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 2ac91d5b1e..3b8e71015d 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -634,7 +634,7 @@ class UserTest extends MediaWikiTestCase { $this->assertTrue( $user2->isBlocked() ); // Non-strict type-check. $this->assertEquals( true, $user2->getBlock()->isAutoblocking(), 'Autoblock does not work' ); - // Can't directly compare the objects becuase of member type differences. + // Can't directly compare the objects because of member type differences. // One day this will work: $this->assertEquals( $block, $user2->getBlock() ); $this->assertEquals( $block->getId(), $user2->getBlock()->getId() ); $this->assertEquals( $block->getExpiry(), $user2->getBlock()->getExpiry() ); -- 2.20.1