Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix common typos in code

Browse source 
Bug: T201491
Change-Id: Id962b79f2590c51380cb977e727b7548abc11d33
This commit is contained in:
Zoranzoki21 2018-08-31 21:08:08 +00:00 committed by Umherirrender
parent e5ded68cf0
commit 1f2e9c1b54
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/EditPage.php
View file

@ -3786,7 +3786,7 @@ ERROR;
/**
* Get the last log record of this page being deleted, if ever. This is
* used to detect whether a delete occured during editing.
* used to detect whether a delete occurred during editing.
* @return bool|stdClass
*/
protected function getLastDelete() {

2
includes/libs/rdbms/exception/DBQueryError.php
View file

@ -45,7 +45,7 @@ class DBQueryError extends DBExpectedError {
public function __construct( IDatabase $db, $error, $errno, $sql, $fname, $message = null ) {
if ( $message === null ) {
if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) {
$message = "A connection error occured. \n" .
$message = "A connection error occurred. \n" .
"Query: $sql\n" .
"Function: $fname\n" .
"Error: $errno $error\n";

2
includes/search/SearchResultSet.php
View file

@ -127,7 +127,7 @@ class SearchResultSet implements Countable, IteratorAggregate {
/**
* Some search modes will run an alternative query that it thinks gives
* a better result than the provided search. Returns true if this has
* occured.
* occurred.
*
* @return bool
*/

8
languages/i18n/en.json
View file

@ -365,9 +365,9 @@
"customcssprotected": "You do not have permission to edit this CSS page because it contains another user's personal settings.",
"customjsonprotected": "You do not have permission to edit this JSON page because it contains another user's personal settings.",
"customjsprotected": "You do not have permission to edit this JavaScript page because it contains another user's personal settings.",
"sitecssprotected": "You do not have permission to edit this CSS page because it may affect all visitors",
"sitejsonprotected": "You do not have permission to edit this JSON page because it may affect all visitors",
"sitejsprotected": "You do not have permission to edit this JavaScript page because it may affect all visitors",
"sitecssprotected": "You do not have permission to edit this CSS page because it may affect all visitors.",
"sitejsonprotected": "You do not have permission to edit this JSON page because it may affect all visitors.",
"sitejsprotected": "You do not have permission to edit this JavaScript page because it may affect all visitors.",
"mycustomcssprotected": "You do not have permission to edit this CSS page.",
"mycustomjsonprotected": "You do not have permission to edit this JSON page.",
"mycustomjsprotected": "You do not have permission to edit this JavaScript page.",
@ -1024,7 +1024,7 @@
"searchdisabled": "{{SITENAME}} search is disabled.\nYou can search via Google in the meantime.\nNote that their indexes of {{SITENAME}} content may be out of date.",
"googlesearch": "<form method=\"get\" action=\"//www.google.com/search\" id=\"googlesearch\">\n\t<input type=\"hidden\" name=\"domains\" value=\"{{SERVER}}\" />\n\t<input type=\"hidden\" name=\"num\" value=\"50\" />\n\t<input type=\"hidden\" name=\"ie\" value=\"$2\" />\n\t<input type=\"hidden\" name=\"oe\" value=\"$2\" />\n\n\t<input type=\"text\" name=\"q\" size=\"31\" maxlength=\"255\" value=\"$1\" />\n\t<input type=\"submit\" name=\"btnG\" value=\"$3\" />\n <div>\n\t<input type=\"radio\" name=\"sitesearch\" id=\"gwiki\" value=\"{{SERVER}}\" checked=\"checked\" /><label for=\"gwiki\">{{SITENAME}}</label>\n\t<input type=\"radio\" name=\"sitesearch\" id=\"gWWW\" value=\"\" /><label for=\"gWWW\">WWW</label>\n </div>\n</form>",
"search-error": "An error has occurred while searching: $1",
"search-warning": "A warning has occured while searching: $1",
"search-warning": "A warning has occurred while searching: $1",
"opensearch-desc": "{{SITENAME}} ({{CONTENTLANGUAGE}})",
"preferences": "Preferences",
"preferences-summary": "",

2
languages/i18n/qqq.json
View file

@ -1225,7 +1225,7 @@
"searchdisabled": "{{doc-singularthey}}\nIn this sentence, \"their indexes\" refers to \"Google's indexes\".\n\nShown on [[Special:Search]] when the internal search is disabled.",
"googlesearch": "{{notranslate}}\nShown when [[mw:Manual:$wgDisableTextSearch|$wgDisableTextSearch]] is set to true and no [[mw:Manual:$wgSearchForwardUrl|$wgSearchForwardUrl]] is set.\n\nParameters:\n* $1 - the search term\n* $2 - \"UTF-8\" (hard-coded)\n* $3 - the message {{msg-mw|Searchbutton}}",
"search-error": "Shown when an error has occurred when performing a search. Parameters:\n* $1 - the localized error that was returned",
"search-warning": "Shown when a warning has occured when performing a search. Parameters:\n* $1 - the localized warning that was returned.",
"search-warning": "Shown when a warning has occurred when performing a search. Parameters:\n* $1 - the localized warning that was returned.",
"opensearch-desc": "{{ignored}}Link description of the [www.opensearch.org/ OpenSearch] link in the HTML head of pages.",
"preferences": "Title of the [[Special:Preferences]] page.\n{{Identical|Preferences}}",
"preferences-summary": "{{doc-specialpagesummary|preferences}}",

4
tests/phpunit/includes/user/UserTest.php
View file

@ -524,13 +524,13 @@ class UserTest extends MediaWikiTestCase {
$touched = $user->getDBTouched();
$this->assertTrue(
$user->checkAndSetTouched(), "checkAndSetTouched() succeded" );
$user->checkAndSetTouched(), "checkAndSetTouched() succedeed" );
$this->assertGreaterThan(
$touched, $user->getDBTouched(), "user_touched increased with casOnTouched()" );
$touched = $user->getDBTouched();
$this->assertTrue(
$user->checkAndSetTouched(), "checkAndSetTouched() succeded #2" );
$user->checkAndSetTouched(), "checkAndSetTouched() succedeed #2" );
$this->assertGreaterThan(
$touched, $user->getDBTouched(), "user_touched increased with casOnTouched() #2" );
}

2
tests/qunit/suites/resources/mediawiki/mediawiki.test.js
View file

@ -108,7 +108,7 @@
assert.strictEqual( conf.set( 'undef' ), false, 'Map.set requires explicit value (no undefined default)' );
assert.strictEqual( conf.set( 'undef', undefined ), true, 'Map.set allows setting value to `undefined`' );
assert.strictEqual( conf.get( 'undef', 'fallback' ), undefined, 'Map.get supports retreiving value of `undefined`' );
assert.strictEqual( conf.get( 'undef', 'fallback' ), undefined, 'Map.get supports retrieving value of `undefined`' );
assert.strictEqual( conf.set( funky, 'Funky' ), false, 'Map.set returns boolean false if key was invalid (Function)' );
assert.strictEqual( conf.set( arry, 'Arry' ), false, 'Map.set returns boolean false if key was invalid (Array)' );

2
thumb.php
View file

@ -500,7 +500,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
}
/** @noinspection PhpUnusedLocalVariableInspection */
$done = true; // no PHP fatal occured
$done = true; // no PHP fatal occurred
if ( !$thumb || $thumb->isError() ) {
// Randomize TTL to reduce stampedes