test

wrapping should be done (default true) + * + * See includes/tidy/RemexDriver.php for detail on configuration. + * + * Overriding the default configuration is strongly discouraged in + * production. */ $wgTidyConfig = [ 'driver' => 'RemexHtml' ]; -/** - * Set this to true to use the deprecated tidy configuration parameters. - * @deprecated since 1.26, use $wgTidyConfig['driver'] = 'disabled' - */ -$wgUseTidy = false; - -/** - * The path to the tidy binary. - * @deprecated since 1.26, use $wgTidyConfig['tidyBin'] - */ -$wgTidyBin = 'tidy'; - -/** - * The path to the tidy config file - * @deprecated since 1.26, use $wgTidyConfig['tidyConfigFile'] - */ -$wgTidyConf = $IP . '/includes/tidy/tidy.conf'; - -/** - * The command line options to the tidy binary - * @deprecated since 1.26, use $wgTidyConfig['tidyCommandLine'] - */ -$wgTidyOpts = ''; - -/** - * Set this to true to use the tidy extension - * @deprecated since 1.26, use $wgTidyConfig['driver'] - */ -$wgTidyInternal = extension_loaded( 'tidy' ); - -/** - * Put tidy warnings in HTML comments - * Only works for internal tidy. - * @deprecated since 1.26, use $wgTidyConfig['debugComment'] - */ -$wgDebugTidy = false; - /** * Allow raw, unchecked HTML in "..." sections. * THIS IS VERY DANGEROUS on a publicly editable site, so USE wgGroupPermissions @@ -4492,52 +4451,72 @@ $wgCentralIdLookupProviders = [ $wgCentralIdLookupProvider = 'local'; /** - * Password policy for local wiki users. A user's effective policy - * is the superset of all policy statements from the policies for the - * groups where the user is a member. If more than one group policy - * include the same policy statement, the value is the max() of the - * values. Note true > false. The 'default' policy group is required, - * and serves as the minimum policy for all users. New statements can - * be added by appending to $wgPasswordPolicy['checks']. - * Statements: - * - MinimalPasswordLength - minimum length a user can set - * - MinimumPasswordLengthToLogin - passwords shorter than this will + * Password policy for the wiki. + * Structured as + * [ + * 'policies' => [ => [ => , ... ], ... ], + * 'checks' => [ => , ... ], + * ] + * where is a user group, is a password policy name + * (arbitrary string) defined in the 'checks' part, is the + * PHP callable implementing the policy check, is a number, + * boolean or null that gets passed to the callback. + * + * A user's effective policy is the superset of all policy statements + * from the policies for the groups where the user is a member. If more + * than one group policy include the same policy statement, the value is + * the max() of the values. Note true > false. The 'default' policy group + * is required, and serves as the minimum policy for all users. + * + * Callbacks receive three arguments: the policy value, the User object + * and the password; and must return a StatusValue. A non-good status + * means the password will not be accepted for new accounts, and existing + * accounts will be prompted for password change or barred from logging in + * (depending on whether the status is a fatal or merely error/warning). + * + * The checks supported by core are: + * - MinimalPasswordLength - Minimum length a user can set. + * - MinimumPasswordLengthToLogin - Passwords shorter than this will * not be allowed to login, regardless if it is correct. * - MaximalPasswordLength - maximum length password a user is allowed * to attempt. Prevents DoS attacks with pbkdf2. - * - PasswordCannotMatchUsername - Password cannot match username to + * - PasswordCannotMatchUsername - Password cannot match the username. * - PasswordCannotMatchBlacklist - Username/password combination cannot - * match a specific, hardcoded blacklist. + * match a blacklist of default passwords used by MediaWiki in the past. * - PasswordCannotBePopular - Blacklist passwords which are known to be * commonly chosen. Set to integer n to ban the top n passwords. * If you want to ban all common passwords on file, use the * PHP_INT_MAX constant. + * Deprecated since 1.33. Use PasswordNotInLargeBlacklist instead. + * - PasswordNotInLargeBlacklist - Password not in best practices list of + * 100,000 commonly used passwords. Due to the size of the list this + * is a probabilistic test. + * * @since 1.26 + * @see PasswordPolicyChecks + * @see User::checkPasswordValidity() */ $wgPasswordPolicy = [ 'policies' => [ 'bureaucrat' => [ - 'MinimalPasswordLength' => 8, + 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordCannotMatchUsername' => true, - 'PasswordCannotBePopular' => 25, + 'PasswordNotInLargeBlacklist' => true, ], 'sysop' => [ - 'MinimalPasswordLength' => 8, + 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordCannotMatchUsername' => true, - 'PasswordCannotBePopular' => 25, + 'PasswordNotInLargeBlacklist' => true, ], 'interface-admin' => [ - 'MinimalPasswordLength' => 8, + 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordCannotMatchUsername' => true, - 'PasswordCannotBePopular' => 25, + 'PasswordNotInLargeBlacklist' => true, ], 'bot' => [ - 'MinimalPasswordLength' => 8, + 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordCannotMatchUsername' => true, + 'PasswordNotInLargeBlacklist' => true, ], 'default' => [ 'MinimalPasswordLength' => 1, @@ -4552,7 +4531,8 @@ $wgPasswordPolicy = [ 'PasswordCannotMatchUsername' => 'PasswordPolicyChecks::checkPasswordCannotMatchUsername', 'PasswordCannotMatchBlacklist' => 'PasswordPolicyChecks::checkPasswordCannotMatchBlacklist', 'MaximalPasswordLength' => 'PasswordPolicyChecks::checkMaximalPasswordLength', - 'PasswordCannotBePopular' => 'PasswordPolicyChecks::checkPopularPasswordBlacklist' + 'PasswordCannotBePopular' => 'PasswordPolicyChecks::checkPopularPasswordBlacklist', + 'PasswordNotInLargeBlacklist' => 'PasswordPolicyChecks::checkPasswordNotInLargeBlacklist', ], ]; @@ -5008,6 +4988,10 @@ $wgAutoblockExpiry = 86400; /** * Set this to true to allow blocked users to edit their own user talk page. + * + * This only applies to sitewide blocks. Partial blocks always allow users to + * edit their own user talk page unless otherwise specified in the block + * restrictions. */ $wgBlockAllowsUTEdit = true; @@ -5849,6 +5833,7 @@ $wgGrantPermissions['editmycssjs']['editmyuserjson'] = true; $wgGrantPermissions['editmycssjs']['editmyuserjs'] = true; $wgGrantPermissions['editmyoptions']['editmyoptions'] = true; +$wgGrantPermissions['editmyoptions']['editmyuserjson'] = true; $wgGrantPermissions['editinterface'] = $wgGrantPermissions['editpage']; $wgGrantPermissions['editinterface']['editinterface'] = true; @@ -5900,6 +5885,8 @@ $wgGrantPermissions['delete']['deletelogentry'] = true; $wgGrantPermissions['delete']['deleterevision'] = true; $wgGrantPermissions['delete']['undelete'] = true; +$wgGrantPermissions['oversight']['suppressrevision'] = true; + $wgGrantPermissions['protect'] = $wgGrantPermissions['editprotected']; $wgGrantPermissions['protect']['protect'] = true; @@ -5945,6 +5932,7 @@ $wgGrantPermissionGroups = [ 'viewdeleted' => 'administration', 'viewrestrictedlogs' => 'administration', 'protect' => 'administration', + 'oversight' => 'administration', 'createaccount' => 'administration', 'highvolume' => 'high-volume', @@ -6182,7 +6170,6 @@ $wgTrxProfilerLimits = [ 'maxAffected' => 1000 ], 'POST-nonwrite' => [ - 'masterConns' => 0, 'writes' => 0, 'readQueryTime' => 5, 'readQueryRows' => 10000 @@ -7550,7 +7537,10 @@ $wgJobClasses = [ 'refreshLinksPrioritized' => RefreshLinksJob::class, 'refreshLinksDynamic' => RefreshLinksJob::class, 'activityUpdateJob' => ActivityUpdateJob::class, - 'categoryMembershipChange' => CategoryMembershipChangeJob::class, + 'categoryMembershipChange' => function ( Title $title, $params = [] ) { + $pc = MediaWikiServices::getInstance()->getParserCache(); + return new CategoryMembershipChangeJob( $pc, $title, $params ); + }, 'clearUserWatchlist' => ClearUserWatchlistJob::class, 'cdnPurge' => CdnPurgeJob::class, 'userGroupExpiry' => UserGroupExpiryJob::class, @@ -8599,6 +8589,9 @@ $wgUploadMaintenance = false; * defined for a given namespace, pages in that namespace will use the CONTENT_MODEL_WIKITEXT * (except for the special case of JS and CS pages). * + * @note To determine the default model for a new page's main slot, or any slot in general, + * use SlotRoleHandler::getDefaultModel() together with SlotRoleRegistry::getRoleHandler(). + * * @since 1.21 */ $wgNamespaceContentModels = []; @@ -8785,6 +8778,7 @@ $wgSearchRunSuggestedQuery = true; * * @see maintenance/createCommonPasswordCdb.php * @since 1.27 + * @deprecated since 1.33 * @var string path to file */ $wgPopularPasswordFile = __DIR__ . '/password/commonpasswords.cdb'; @@ -8916,6 +8910,9 @@ $wgCSPFalsePositiveUrls = [ 'https://rtb.metrigo.com' => true, 'https://d5p.de17a.com' => true, 'https://ad.lkqd.net/vpaid/vpaid.js' => true, + 'https://ad.lkqd.net/vpaid/vpaid.js?fusion=1.0' => true, + 'https://t.lkqd.net/t' => true, + 'chrome-extension' => true, ]; /** @@ -8971,7 +8968,7 @@ $wgInterwikiPrefixDisplayTypes = []; * @since 1.30 * @var int One of the MIGRATION_* constants */ -$wgCommentTableSchemaMigrationStage = MIGRATION_OLD; +$wgCommentTableSchemaMigrationStage = MIGRATION_NEW; /** * RevisionStore table schema migration stage (content, slots, content_models & slot_roles tables). @@ -9013,40 +9010,24 @@ $wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_ $wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_OLD; /** - * change_tag table schema migration stage. - * - * - MIGRATION_OLD: Do not use change_tag_def table or ct_tag_id. - * - MIGRATION_WRITE_BOTH: Write to the change_tag_def table and ct_tag_id, but read from - * the old schema. This is different from the formal definition of the constants - * - MIGRATION_WRITE_NEW: Behaves the same as MIGRATION_WRITE_BOTH - * - MIGRATION_NEW: Use the change_tag_def table and ct_tag_id, do not read/write ct_tag - * - * @since 1.32 - * @var int One of the MIGRATION_* constants - */ -$wgChangeTagsSchemaMigrationStage = MIGRATION_WRITE_BOTH; - -/** - * Temporarily flag to use change_tag_def table as backend of change tag statistics. - * For example in case of Special:Tags. If set to false, it will use change_tag table. - * Before setting it to true set $wgChangeTagsSchemaMigrationStage to MIGRATION_WRITE_BOTH and run - * PopulateChangeTagDef maintaince script. - * It's redundant when $wgChangeTagsSchemaMigrationStage is set to MIGRATION_NEW + * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages + * or namespaces. * * @since 1.32 + * @deprecated 1.32 * @var bool */ -$wgTagStatisticsNewTable = false; +$wgEnablePartialBlocks = false; /** - * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages - * or namespaces. + * Enable stats monitoring when Block Notices are displayed in different places around core + * and extensions. * - * @since 1.32 - * @deprecated 1.32 + * @since 1.34 + * @deprecated 1.34 * @var bool */ -$wgEnablePartialBlocks = false; +$wgEnableBlockNoticeStats = false; /** * For really cool vim folding this needs to be at the end: diff --git a/includes/DummyLinker.php b/includes/DummyLinker.php index 2f5455ef5a..ba1233e546 100644 --- a/includes/DummyLinker.php +++ b/includes/DummyLinker.php @@ -345,11 +345,11 @@ class DummyLinker { return Linker::tocLineEnd(); } - public function tocList( $toc, $lang = false ) { + public function tocList( $toc, $lang = null ) { return Linker::tocList( $toc, $lang ); } - public function generateTOC( $tree, $lang = false ) { + public function generateTOC( $tree, $lang = null ) { return Linker::generateTOC( $tree, $lang ); } diff --git a/includes/EditPage.php b/includes/EditPage.php index 0f7d9a7a39..45995646da 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -476,7 +476,15 @@ class EditPage { $this->mArticle = $article; $this->page = $article->getPage(); // model object $this->mTitle = $article->getTitle(); - $this->context = $article->getContext(); + + // Make sure the local context is in sync with other member variables. + // Particularly make sure everything is using the same WikiPage instance. + // This should probably be the case in Article as well, but it's + // particularly important for EditPage, to make use of the in-place caching + // facility in WikiPage::prepareContentForEdit. + $this->context = new DerivativeContext( $article->getContext() ); + $this->context->setWikiPage( $this->page ); + $this->context->setTitle( $this->mTitle ); $this->contentModel = $this->mTitle->getContentModel(); @@ -619,14 +627,23 @@ class EditPage { if ( $permErrors ) { wfDebug( __METHOD__ . ": User can't edit\n" ); - // track block with a cookie if it doesn't exists already - $this->context->getUser()->trackBlockWithCookie(); + if ( $this->context->getUser()->getBlock() ) { + // track block with a cookie if it doesn't exists already + $this->context->getUser()->trackBlockWithCookie(); - // Auto-block user's IP if the account was "hard" blocked - if ( !wfReadOnly() ) { - DeferredUpdates::addCallableUpdate( function () { - $this->context->getUser()->spreadAnyEditBlock(); - } ); + // Auto-block user's IP if the account was "hard" blocked + if ( !wfReadOnly() ) { + DeferredUpdates::addCallableUpdate( function () { + $this->context->getUser()->spreadAnyEditBlock(); + } ); + } + + $config = $this->context->getConfig(); + if ( $config->get( 'EnableBlockNoticeStats' ) ) { + $wiki = $config->get( 'DBname' ); + $statsd = MediaWikiServices::getInstance()->getStatsdDataFactory(); + $statsd->increment( 'BlockNotices.' . $wiki . '.WikitextEditor.shown' ); + } } $this->displayPermissionsError( $permErrors ); @@ -672,7 +689,7 @@ class EditPage { # that edit() already checked just in case someone tries to sneak # in the back door with a hand-edited submission URL. - if ( 'save' == $this->formtype ) { + if ( $this->formtype == 'save' ) { $resultDetails = null; $status = $this->attemptSave( $resultDetails ); if ( !$this->handleStatus( $status, $resultDetails ) ) { @@ -682,7 +699,7 @@ class EditPage { # First time through: get contents, set time for conflict # checking, etc. - if ( 'initial' == $this->formtype || $this->firsttime ) { + if ( $this->formtype == 'initial' || $this->firsttime ) { if ( $this->initialiseForm() === false ) { $out = $this->context->getOutput(); if ( $out->getRedirect() === '' ) { // mcrundo hack redirects, don't override it @@ -1952,7 +1969,7 @@ ERROR; return $status; } - if ( $user->isBlockedFrom( $this->mTitle, false ) ) { + if ( $user->isBlockedFrom( $this->mTitle ) ) { // Auto-block user's IP if the account was "hard" blocked if ( !wfReadOnly() ) { $user->spreadAnyEditBlock(); @@ -2594,8 +2611,13 @@ ERROR; if ( !( $user && $user->isLoggedIn() ) && !$ip ) { # User does not exist $out->wrapWikiMsg( "

' @@ -1598,10 +1618,11 @@ class Linker { * * @since 1.16.3. $lang added in 1.17 * @param array $tree Return value of ParserOutput::getSections() - * @param string|Language|bool $lang Language for the toc title, defaults to user language + * @param string|Language|bool|null $lang Language for the toc title, defaults to user language. + * The types string and bool are deprecated. * @return string HTML fragment */ - public static function generateTOC( $tree, $lang = false ) { + public static function generateTOC( $tree, $lang = null ) { $toc = ''; $lastLevel = 0; foreach ( $tree as $section ) { diff --git a/includes/MWNamespace.php b/includes/MWNamespace.php index e03a29b80f..98e70bf9f7 100644 --- a/includes/MWNamespace.php +++ b/includes/MWNamespace.php @@ -19,6 +19,7 @@ * * @file */ +use MediaWiki\MediaWikiServices; /** * This is a utility class with only static functions @@ -462,13 +463,17 @@ class MWNamespace { * Get the default content model for a namespace * This does not mean that all pages in that namespace have the model * + * @note To determine the default model for a new page's main slot, or any slot in general, + * use SlotRoleHandler::getDefaultModel() together with SlotRoleRegistry::getRoleHandler(). + * * @since 1.21 * @param int $index Index to check * @return null|string Default model name for the given namespace, if set */ public static function getNamespaceContentModel( $index ) { - global $wgNamespaceContentModels; - return $wgNamespaceContentModels[$index] ?? null; + $config = MediaWikiServices::getInstance()->getMainConfig(); + $models = $config->get( 'NamespaceContentModels' ); + return $models[$index] ?? null; } /** diff --git a/includes/MagicWordFactory.php b/includes/MagicWordFactory.php index e62716d67e..4e9bfaf1f7 100644 --- a/includes/MagicWordFactory.php +++ b/includes/MagicWordFactory.php @@ -173,6 +173,7 @@ class MagicWordFactory { 'newsectionlink', 'nonewsectionlink', 'hiddencat', + 'expectunusedcategory', 'index', 'noindex', 'staticredirect', diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 267b589ae8..f5a954dc8d 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -893,8 +893,7 @@ class MediaWiki { // Loosen DB query expectations since the HTTP client is unblocked $trxProfiler = Profiler::instance()->getTransactionProfiler(); - $trxProfiler->resetExpectations(); - $trxProfiler->setExpectations( + $trxProfiler->redefineExpectations( $this->context->getRequest()->hasSafeMethod() ? $this->config->get( 'TrxProfilerLimits' )['PostSend-GET'] : $this->config->get( 'TrxProfilerLimits' )['PostSend-POST'], diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index f3ca7d469e..0e36b22367 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -17,6 +17,7 @@ use MediaWiki\Http\HttpRequestFactory; use MediaWiki\Preferences\PreferencesFactory; use MediaWiki\Shell\CommandFactory; use MediaWiki\Revision\RevisionRenderer; +use MediaWiki\Revision\SlotRoleRegistry; use MediaWiki\Special\SpecialPageFactory; use MediaWiki\Storage\BlobStore; use MediaWiki\Storage\BlobStoreFactory; @@ -840,6 +841,14 @@ class MediaWikiServices extends ServiceContainer { return $this->getService( 'SkinFactory' ); } + /** + * @since 1.33 + * @return SlotRoleRegistry + */ + public function getSlotRoleRegistry() { + return $this->getService( 'SlotRoleRegistry' ); + } + /** * @since 1.31 * @return NameTableStore diff --git a/includes/Message.php b/includes/Message.php index 3bd775537f..4049e114f3 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -289,7 +289,7 @@ class Message implements MessageSpecifier, Serializable { 'parameters' => $this->parameters, 'format' => $this->format, 'useDatabase' => $this->useDatabase, - 'title' => $this->title, + 'titlestr' => $this->title ? $this->title->getFullText() : null, ] ); } @@ -300,6 +300,10 @@ class Message implements MessageSpecifier, Serializable { */ public function unserialize( $serialized ) { $data = unserialize( $serialized ); + if ( !is_array( $data ) ) { + throw new InvalidArgumentException( __METHOD__ . ': Invalid serialized data' ); + } + $this->interface = $data['interface']; $this->key = $data['key']; $this->keysToTry = $data['keysToTry']; @@ -307,7 +311,15 @@ class Message implements MessageSpecifier, Serializable { $this->format = $data['format']; $this->useDatabase = $data['useDatabase']; $this->language = $data['language'] ? Language::factory( $data['language'] ) : false; - $this->title = $data['title']; + + if ( isset( $data['titlestr'] ) ) { + $this->title = Title::newFromText( $data['titlestr'] ); + } elseif ( isset( $data['title'] ) && $data['title'] instanceof Title ) { + // Old serializations from before December 2018 + $this->title = $data['title']; + } else { + $this->title = null; // Explicit for sanity + } } /** diff --git a/includes/MovePage.php b/includes/MovePage.php index 5213fc171d..7d27a277b4 100644 --- a/includes/MovePage.php +++ b/includes/MovePage.php @@ -20,6 +20,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\SlotRecord; /** * Handles the backend logic of moving a page from one title @@ -137,7 +138,8 @@ class MovePage { $status->fatal( 'content-not-allowed-here', ContentHandler::getLocalizedName( $this->oldTitle->getContentModel() ), - $this->newTitle->getPrefixedText() + $this->newTitle->getPrefixedText(), + SlotRecord::MAIN ); } @@ -240,25 +242,14 @@ class MovePage { public function move( User $user, $reason, $createRedirect, array $changeTags = [] ) { global $wgCategoryCollation; - Hooks::run( 'TitleMove', [ $this->oldTitle, $this->newTitle, $user ] ); - - // If it is a file, move it first. - // It is done before all other moving stuff is done because it's hard to revert. - $dbw = wfGetDB( DB_MASTER ); - if ( $this->oldTitle->getNamespace() == NS_FILE ) { - $file = wfLocalFile( $this->oldTitle ); - $file->load( File::READ_LATEST ); - if ( $file->exists() ) { - $status = $file->move( $this->newTitle ); - if ( !$status->isOK() ) { - return $status; - } - } - // Clear RepoGroup process cache - RepoGroup::singleton()->clearCache( $this->oldTitle ); - RepoGroup::singleton()->clearCache( $this->newTitle ); # clear false negative cache + $status = Status::newGood(); + Hooks::run( 'TitleMove', [ $this->oldTitle, $this->newTitle, $user, $reason, &$status ] ); + if ( !$status->isOK() ) { + // Move was aborted by the hook + return $status; } + $dbw = wfGetDB( DB_MASTER ); $dbw->startAtomic( __METHOD__ ); Hooks::run( 'TitleMoveStarting', [ $this->oldTitle, $this->newTitle, $user ] ); @@ -387,6 +378,16 @@ class MovePage { $store->duplicateAllAssociatedEntries( $this->oldTitle, $this->newTitle ); } + // If it is a file then move it last. + // This is done after all database changes so that file system errors cancel the transaction. + if ( $this->oldTitle->getNamespace() == NS_FILE ) { + $status = $this->moveFile( $this->oldTitle, $this->newTitle ); + if ( !$status->isOK() ) { + $dbw->cancelAtomic( __METHOD__ ); + return $status; + } + } + Hooks::run( 'TitleMoveCompleting', [ $this->oldTitle, $this->newTitle, @@ -420,6 +421,33 @@ class MovePage { return Status::newGood(); } + /** + * Move a file associated with a page to a new location. + * Can also be used to revert after a DB failure. + * + * @access private + * @param Title Old location to move the file from. + * @param Title New location to move the file to. + * @return Status + */ + private function moveFile( $oldTitle, $newTitle ) { + $status = Status::newFatal( + 'cannotdelete', + $oldTitle->getPrefixedText() + ); + + $file = wfLocalFile( $oldTitle ); + $file->load( File::READ_LATEST ); + if ( $file->exists() ) { + $status = $file->move( $newTitle ); + } + + // Clear RepoGroup process cache + RepoGroup::singleton()->clearCache( $oldTitle ); + RepoGroup::singleton()->clearCache( $newTitle ); # clear false negative cache + return $status; + } + /** * Move page to a title which is either a redirect to the * source page or nonexistent diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 4a9b542c3a..02e13e74fe 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2098,6 +2098,7 @@ class OutputPage extends ContextSource { * parseAsInterface() if $interface is true. */ public function parse( $text, $linestart = true, $interface = false, $language = null ) { + wfDeprecated( __METHOD__, '1.33' ); return $this->parseInternal( $text, $this->getTitle(), $linestart, /*tidy*/false, $interface, $language )->getText( [ @@ -2180,6 +2181,7 @@ class OutputPage extends ContextSource { * Parser::stripOuterParagraph($outputPage->parseAsContent(...)). */ public function parseInline( $text, $linestart = true, $interface = false ) { + wfDeprecated( __METHOD__, '1.33' ); $parsed = $this->parseInternal( $text, $this->getTitle(), $linestart, /*tidy*/false, $interface, /*language*/null )->getText( [ @@ -2845,16 +2847,18 @@ class OutputPage extends ContextSource { $query['returntoquery'] = wfArrayToCgi( $returntoquery ); } } + $title = SpecialPage::getTitleFor( 'Userlogin' ); $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); + $loginUrl = $title->getLinkURL( $query, false, PROTO_RELATIVE ); $loginLink = $linkRenderer->makeKnownLink( - SpecialPage::getTitleFor( 'Userlogin' ), + $title, $this->msg( 'loginreqlink' )->text(), [], $query ); $this->prepareErrorPage( $this->msg( 'loginreqtitle' ) ); - $this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->parse() ); + $this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->params( $loginUrl )->parse() ); # Don't return to a page the user can't read otherwise # we'll end up in a pointless loop @@ -2924,7 +2928,7 @@ class OutputPage extends ContextSource { * then the warning is a bit more obvious. If the lag is * lower than $wgSlaveLagWarning, then no warning is shown. * - * @param int $lag Slave lag + * @param int $lag Replica lag */ public function showLagWarning( $lag ) { $config = $this->getConfig(); diff --git a/includes/Preferences.php b/includes/Preferences.php index 6d379dcb49..70f70609ae 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -46,13 +46,6 @@ class Preferences { return $preferencesFactory; } - /** - * @return array - */ - public static function getSaveBlacklist() { - throw new Exception( __METHOD__ . '() is deprecated and does nothing' ); - } - /** * @throws MWException * @param User $user @@ -60,6 +53,7 @@ class Preferences { * @return array|null */ public static function getPreferences( $user, IContextSource $context ) { + wfDeprecated( __METHOD__, '1.31' ); $preferencesFactory = self::getDefaultPreferencesFactory(); return $preferencesFactory->getFormDescriptor( $user, $context ); } @@ -202,6 +196,7 @@ class Preferences { * @param array &$defaultPreferences */ public static function miscPreferences( $user, IContextSource $context, &$defaultPreferences ) { + wfDeprecated( __METHOD__, '1.31' ); } /** @@ -271,45 +266,8 @@ class Preferences { $formClass = PreferencesFormLegacy::class, array $remove = [] ) { + wfDeprecated( __METHOD__, '1.31' ); $preferencesFactory = self::getDefaultPreferencesFactory(); return $preferencesFactory->getForm( $user, $context, $formClass, $remove ); } - - /** - * @param IContextSource $context - * @return array - */ - public static function getTimezoneOptions( IContextSource $context ) { - throw new Exception( __METHOD__ . '() is deprecated and does nothing' ); - } - - /** - * @param string $value - * @param array $alldata - * @return int - */ - public static function filterIntval( $value, $alldata ) { - throw new Exception( __METHOD__ . '() is deprecated and does nothing' ); - } - - /** - * @param string $tz - * @param array $alldata - * @return string - */ - public static function filterTimezoneInput( $tz, $alldata ) { - throw new Exception( __METHOD__ . '() is deprecated and does nothing' ); - } - - /** - * Get a list of all time zones - * @param Language $language Language used for the localized names - * @return array A list of all time zones. The system name of the time zone is used as key and - * the value is an array which contains localized name, the timecorrection value used for - * preferences and the region - * @since 1.26 - */ - public static function getTimeZoneList( Language $language ) { - throw new Exception( __METHOD__ . '() is deprecated and does nothing' ); - } } diff --git a/includes/Revision.php b/includes/Revision.php index 6d1812a98e..b0a3ba35f2 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -29,6 +29,7 @@ use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\RevisionStoreRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\SqlBlobStore; +use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\IDatabase; use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; @@ -589,6 +590,8 @@ class Revision implements IDBAccessObject { '$row must be a row object, an associative array, or a RevisionRecord' ); } + + Assert::postcondition( $this->mRecord !== null, 'Failed to construct a RevisionRecord' ); } /** @@ -1180,9 +1183,7 @@ class Revision implements IDBAccessObject { $rec = self::getRevisionStore()->insertRevisionOn( $this->mRecord, $dbw ); $this->mRecord = $rec; - - // Avoid PHP 7.1 warning of passing $this by reference - $revision = $this; + Assert::postcondition( $this->mRecord !== null, 'Failed to acquire a RevisionRecord' ); return $rec->getId(); } diff --git a/includes/Revision/FallbackSlotRoleHandler.php b/includes/Revision/FallbackSlotRoleHandler.php new file mode 100644 index 0000000000..78dfd39861 --- /dev/null +++ b/includes/Revision/FallbackSlotRoleHandler.php @@ -0,0 +1,71 @@ + 'none'] here, causing undefined slots + // to be hidden? We'd still need some place to surface the content of such + // slots, see T209923. + + return parent::getOutputLayoutHints(); // TODO: Change the autogenerated stub + } + +} diff --git a/includes/Revision/MainSlotRoleHandler.php b/includes/Revision/MainSlotRoleHandler.php new file mode 100644 index 0000000000..6c6fdd6d05 --- /dev/null +++ b/includes/Revision/MainSlotRoleHandler.php @@ -0,0 +1,132 @@ +namespaceContentModels = $namespaceContentModels; + } + + public function supportsArticleCount() { + return true; + } + + /** + * @param string $model + * @param LinkTarget $page + * + * @return bool + */ + public function isAllowedModel( $model, LinkTarget $page ) { + $title = Title::newFromLinkTarget( $page ); + $handler = ContentHandler::getForModelID( $model ); + return $handler->canBeUsedOn( $title ); + } + + /** + * @param LinkTarget $page + * + * @return string + */ + public function getDefaultModel( LinkTarget $page ) { + // NOTE: this method must not rely on $title->getContentModel() directly or indirectly, + // because it is used to initialize the mContentModel member. + + $ext = ''; + $ns = $page->getNamespace(); + $model = $this->namespaceContentModels[$ns] ?? null; + + // Hook can determine default model + $title = Title::newFromLinkTarget( $page ); + if ( !Hooks::run( 'ContentHandlerDefaultModelFor', [ $title, &$model ] ) ) { + if ( !is_null( $model ) ) { + return $model; + } + } + + // Could this page contain code based on the title? + $isCodePage = $ns === NS_MEDIAWIKI && preg_match( '!\.(css|js|json)$!u', $title->getText(), $m ); + if ( $isCodePage ) { + $ext = $m[1]; + } + + // Is this a user subpage containing code? + $isCodeSubpage = $ns === NS_USER + && !$isCodePage + && preg_match( "/\\/.*\\.(js|css|json)$/", $title->getText(), $m ); + + if ( $isCodeSubpage ) { + $ext = $m[1]; + } + + // Is this wikitext, according to $wgNamespaceContentModels or the DefaultModelFor hook? + $isWikitext = is_null( $model ) || $model == CONTENT_MODEL_WIKITEXT; + $isWikitext = $isWikitext && !$isCodePage && !$isCodeSubpage; + + if ( !$isWikitext ) { + switch ( $ext ) { + case 'js': + return CONTENT_MODEL_JAVASCRIPT; + case 'css': + return CONTENT_MODEL_CSS; + case 'json': + return CONTENT_MODEL_JSON; + default: + return is_null( $model ) ? CONTENT_MODEL_TEXT : $model; + } + } + + // We established that it must be wikitext + + return CONTENT_MODEL_WIKITEXT; + } + +} diff --git a/includes/Revision/RenderedRevision.php b/includes/Revision/RenderedRevision.php index 6eee3c4cf6..094105aae8 100644 --- a/includes/Revision/RenderedRevision.php +++ b/includes/Revision/RenderedRevision.php @@ -159,6 +159,28 @@ class RenderedRevision implements SlotRenderingProvider { return $this->options; } + /** + * Sets a ParserOutput to be returned by getRevisionParserOutput(). + * + * @note For internal use by RevisionRenderer only! This method may be modified + * or removed without notice per the deprecation policy. + * + * @internal + * + * @param ParserOutput $output + */ + public function setRevisionParserOutput( ParserOutput $output ) { + $this->revisionOutput = $output; + + // If there is only one slot, we assume that the combined output is identical + // with the main slot's output. This is intended to prevent a redundant re-parse of + // the content in case getSlotParserOutput( SlotRecord::MAIN ) is called, for instance + // from ContentHandler::getSecondaryDataUpdates. + if ( $this->revision->getSlotRoles() === [ SlotRecord::MAIN ] ) { + $this->slotsOutput[ SlotRecord::MAIN ] = $output; + } + } + /** * @param array $hints Hints given as an associative array. Known keys: * - 'generate-html' => bool: Whether the caller is interested in output HTML (as opposed @@ -208,6 +230,7 @@ class RenderedRevision implements SlotRenderingProvider { 'Access to the content has been suppressed for this audience' ); } else { + // XXX: allow SlotRoleHandler to control the ParserOutput? $output = $this->getSlotParserOutputUncached( $content, $withHtml ); if ( $withHtml && !$output->hasText() ) { diff --git a/includes/Revision/RevisionRenderer.php b/includes/Revision/RevisionRenderer.php index e2e84b60ca..f97390ad49 100644 --- a/includes/Revision/RevisionRenderer.php +++ b/includes/Revision/RevisionRenderer.php @@ -50,15 +50,24 @@ class RevisionRenderer { /** @var ILoadBalancer */ private $loadBalancer; + /** @var SlotRoleRegistry */ + private $roleRegistery; + /** @var string|bool */ private $wikiId; /** * @param ILoadBalancer $loadBalancer + * @param SlotRoleRegistry $roleRegistry * @param bool|string $wikiId */ - public function __construct( ILoadBalancer $loadBalancer, $wikiId = false ) { + public function __construct( + ILoadBalancer $loadBalancer, + SlotRoleRegistry $roleRegistry, + $wikiId = false + ) { $this->loadBalancer = $loadBalancer; + $this->roleRegistery = $roleRegistry; $this->wikiId = $wikiId; $this->saveParseLogger = new NullLogger(); @@ -82,6 +91,11 @@ class RevisionRenderer { * - 'audience' the audience to use for content access. Default is * RevisionRecord::FOR_PUBLIC if $forUser is not set, RevisionRecord::FOR_THIS_USER * if $forUser is set. Can be set to RevisionRecord::RAW to disable audience checks. + * - 'known-revision-output' a combined ParserOutput for the revision, perhaps from + * some cache. the caller is responsible for ensuring that the ParserOutput indeed + * matched the $rev and $options. This mechanism is intended as a temporary stop-gap, + * for the time until caches have been changed to store RenderedRevision states instead + * of ParserOutput objects. * * @return RenderedRevision|null The rendered revision, or null if the audience checks fails. */ @@ -133,6 +147,10 @@ class RevisionRenderer { $renderedRevision->setSaveParseLogger( $this->saveParseLogger ); + if ( isset( $hints['known-revision-output'] ) ) { + $renderedRevision->setRevisionParserOutput( $hints['known-revision-output'] ); + } + return $renderedRevision; } @@ -175,8 +193,6 @@ class RevisionRenderer { return $rrev->getSlotParserOutput( SlotRecord::MAIN ); } - // TODO: put fancy layout logic here, see T200915. - // move main slot to front if ( isset( $slots[SlotRecord::MAIN] ) ) { $slots = [ SlotRecord::MAIN => $slots[SlotRecord::MAIN] ] + $slots; @@ -192,6 +208,7 @@ class RevisionRenderer { $out = $rrev->getSlotParserOutput( $role, $hints ); $slotOutput[$role] = $out; + // XXX: should the SlotRoleHandler be able to intervene here? $combinedOutput->mergeInternalMetaDataFrom( $out, $role ); $combinedOutput->mergeTrackingMetaDataFrom( $out ); } @@ -201,6 +218,16 @@ class RevisionRenderer { $first = true; /** @var ParserOutput $out */ foreach ( $slotOutput as $role => $out ) { + $roleHandler = $this->roleRegistery->getRoleHandler( $role ); + + // TODO: put more fancy layout logic here, see T200915. + $layout = $roleHandler->getOutputLayoutHints(); + $display = $layout['display'] ?? 'section'; + + if ( $display === 'none' ) { + continue; + } + if ( $first ) { // skip header for the first slot $first = false; @@ -210,6 +237,8 @@ class RevisionRenderer { $html .= Html::rawElement( 'h1', [ 'class' => 'mw-slot-header' ], $headText ); } + // XXX: do we want to put a wrapper div around the output? + // Do we want to let $roleHandler do that? $html .= $out->getRawText(); $combinedOutput->mergeHtmlMetaDataFrom( $out ); } diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php index 6d3b72cdf9..cf19ffbc47 100644 --- a/includes/Revision/RevisionStore.php +++ b/includes/Revision/RevisionStore.php @@ -132,6 +132,9 @@ class RevisionStore /** @var int An appropriate combination of SCHEMA_COMPAT_XXX flags. */ private $mcrMigrationStage; + /** @var SlotRoleRegistry */ + private $slotRoleRegistry; + /** * @todo $blobStore should be allowed to be any BlobStore! * @@ -146,11 +149,11 @@ class RevisionStore * @param CommentStore $commentStore * @param NameTableStore $contentModelStore * @param NameTableStore $slotRoleStore + * @param SlotRoleRegistry $slotRoleRegistry * @param int $mcrMigrationStage An appropriate combination of SCHEMA_COMPAT_XXX flags * @param ActorMigration $actorMigration * @param bool|string $wikiId * - * @throws MWException if $mcrMigrationStage or $wikiId is invalid. */ public function __construct( ILoadBalancer $loadBalancer, @@ -159,6 +162,7 @@ class RevisionStore CommentStore $commentStore, NameTableStore $contentModelStore, NameTableStore $slotRoleStore, + SlotRoleRegistry $slotRoleRegistry, $mcrMigrationStage, ActorMigration $actorMigration, $wikiId = false @@ -199,6 +203,7 @@ class RevisionStore $this->commentStore = $commentStore; $this->contentModelStore = $contentModelStore; $this->slotRoleStore = $slotRoleStore; + $this->slotRoleRegistry = $slotRoleRegistry; $this->mcrMigrationStage = $mcrMigrationStage; $this->actorMigration = $actorMigration; $this->wikiId = $wikiId; @@ -923,7 +928,7 @@ class RevisionStore $format = $content->getDefaultFormat(); $model = $content->getModel(); - $this->checkContent( $content, $title ); + $this->checkContent( $content, $title, $slot->getRole() ); return $this->blobStore->storeBlob( $content->serialize( $format ), @@ -982,11 +987,12 @@ class RevisionStore * * @param Content $content * @param Title $title + * @param string $role * * @throws MWException * @throws MWUnknownContentModelException */ - private function checkContent( Content $content, Title $title ) { + private function checkContent( Content $content, Title $title, $role ) { // Note: may return null for revisions that have not yet been inserted $model = $content->getModel(); @@ -1005,7 +1011,8 @@ class RevisionStore $this->assertCrossWikiContentLoadingIsSafe(); - $defaultModel = ContentHandler::getDefaultModelFor( $title ); + $roleHandler = $this->slotRoleRegistry->getRoleHandler( $role ); + $defaultModel = $roleHandler->getDefaultModel( $title ); $defaultHandler = ContentHandler::getForModelID( $defaultModel ); $defaultFormat = $defaultHandler->getDefaultFormat(); @@ -1350,9 +1357,8 @@ class RevisionStore $mainSlotRow->model_name = function ( SlotRecord $slot ) use ( $title ) { $this->assertCrossWikiContentLoadingIsSafe(); - // TODO: MCR: consider slot role in getDefaultModelFor()! Use LinkTarget! - // TODO: MCR: deprecate $title->getModel(). - return ContentHandler::getDefaultModelFor( $title ); + return $this->slotRoleRegistry->getRoleHandler( $slot->getRole() ) + ->getDefaultModel( $title ); }; } @@ -1624,7 +1630,7 @@ class RevisionStore $row->role_name = $this->slotRoleStore->getName( (int)$row->slot_role_id ); $row->model_name = $this->contentModelStore->getName( (int)$row->content_model ); - $contentCallback = function ( SlotRecord $slot ) use ( $queryFlags, $row ) { + $contentCallback = function ( SlotRecord $slot ) use ( $queryFlags ) { return $this->loadSlotContent( $slot, null, null, null, $queryFlags ); }; @@ -2517,45 +2523,78 @@ class RevisionStore } /** - * Get previous revision for this title + * Get the revision before $rev in the page's history, if any. + * Will return null for the first revision but also for deleted or unsaved revisions. * * MCR migration note: this replaces Revision::getPrevious * + * @see Title::getPreviousRevisionID + * @see PageArchive::getPreviousRevision + * * @param RevisionRecord $rev * @param Title|null $title if known (optional) * * @return RevisionRecord|null */ public function getPreviousRevision( RevisionRecord $rev, Title $title = null ) { + if ( !$rev->getId() || !$rev->getPageId() ) { + // revision is unsaved or otherwise incomplete + return null; + } + + if ( $rev instanceof RevisionArchiveRecord ) { + // revision is deleted, so it's not part of the page history + return null; + } + if ( $title === null ) { + // this would fail for deleted revisions $title = $this->getTitle( $rev->getPageId(), $rev->getId() ); } + $prev = $title->getPreviousRevisionID( $rev->getId() ); - if ( $prev ) { - return $this->getRevisionByTitle( $title, $prev ); + if ( !$prev ) { + return null; } - return null; + + return $this->getRevisionByTitle( $title, $prev ); } /** - * Get next revision for this title + * Get the revision after $rev in the page's history, if any. + * Will return null for the latest revision but also for deleted or unsaved revisions. * * MCR migration note: this replaces Revision::getNext * + * @see Title::getNextRevisionID + * * @param RevisionRecord $rev * @param Title|null $title if known (optional) * * @return RevisionRecord|null */ public function getNextRevision( RevisionRecord $rev, Title $title = null ) { + if ( !$rev->getId() || !$rev->getPageId() ) { + // revision is unsaved or otherwise incomplete + return null; + } + + if ( $rev instanceof RevisionArchiveRecord ) { + // revision is deleted, so it's not part of the page history + return null; + } + if ( $title === null ) { + // this would fail for deleted revisions $title = $this->getTitle( $rev->getPageId(), $rev->getId() ); } + $next = $title->getNextRevisionID( $rev->getId() ); - if ( $next ) { - return $this->getRevisionByTitle( $title, $next ); + if ( !$next ) { + return null; } - return null; + + return $this->getRevisionByTitle( $title, $next ); } /** diff --git a/includes/Revision/RevisionStoreFactory.php b/includes/Revision/RevisionStoreFactory.php index 30ffc997ef..6b3117fc78 100644 --- a/includes/Revision/RevisionStoreFactory.php +++ b/includes/Revision/RevisionStoreFactory.php @@ -72,10 +72,14 @@ class RevisionStoreFactory { /** @var NameTableStoreFactory */ private $nameTables; + /** @var SlotRoleRegistry */ + private $slotRoleRegistry; + /** * @param ILBFactory $dbLoadBalancerFactory * @param BlobStoreFactory $blobStoreFactory * @param NameTableStoreFactory $nameTables + * @param SlotRoleRegistry $slotRoleRegistry * @param WANObjectCache $cache * @param CommentStore $commentStore * @param ActorMigration $actorMigration @@ -88,6 +92,7 @@ class RevisionStoreFactory { ILBFactory $dbLoadBalancerFactory, BlobStoreFactory $blobStoreFactory, NameTableStoreFactory $nameTables, + SlotRoleRegistry $slotRoleRegistry, WANObjectCache $cache, CommentStore $commentStore, ActorMigration $actorMigration, @@ -98,6 +103,7 @@ class RevisionStoreFactory { Assert::parameterType( 'integer', $migrationStage, '$migrationStage' ); $this->dbLoadBalancerFactory = $dbLoadBalancerFactory; $this->blobStoreFactory = $blobStoreFactory; + $this->slotRoleRegistry = $slotRoleRegistry; $this->nameTables = $nameTables; $this->cache = $cache; $this->commentStore = $commentStore; @@ -124,6 +130,7 @@ class RevisionStoreFactory { $this->commentStore, $this->nameTables->getContentModels( $wikiId ), $this->nameTables->getSlotRoles( $wikiId ), + $this->slotRoleRegistry, $this->mcrMigrationStage, $this->actorMigration, $wikiId diff --git a/includes/Revision/SlotRoleHandler.php b/includes/Revision/SlotRoleHandler.php new file mode 100644 index 0000000000..85b4c5ab34 --- /dev/null +++ b/includes/Revision/SlotRoleHandler.php @@ -0,0 +1,159 @@ + 'section', // use 'none' to suppress + 'region' => 'center', + 'placement' => 'append' + ]; + + /** + * @var string + */ + private $contentModel; + + /** + * @param string $role The name of the slot role defined by this SlotRoleHandler. See + * SlotRoleRegistry::defineRole for more information. + * @param string $contentModel The default content model for this slot. As per the default + * implementation of isAllowedModel(), also the only content model allowed for the + * slot. Subclasses may however handle default and allowed models differently. + * @param array $layout Layout hints, for use by RevisionRenderer. See getOutputLayoutHints. + */ + public function __construct( $role, $contentModel, $layout = [] ) { + $this->role = $role; + $this->contentModel = $contentModel; + $this->layout = array_merge( $this->layout, $layout ); + } + + /** + * @return string The role this SlotRoleHandler applies to + */ + public function getRole() { + return $this->role; + } + + /** + * Layout hints for use while laying out the combined output of all slots, typically by + * RevisionRenderer. The layout hints are given as an associative array. Well-known keys + * to use: + * + * * "display": how the output of this slot should be represented. Supported values: + * - "section": show as a top level section of the region. + * - "none": do not show at all + * Further values that may be supported in the future include "box" and "banner". + * * "region": in which region of the page the output should be placed. Supported values: + * - "center": the central content area. + * Further values that may be supported in the future include "top" and "bottom", "left" + * and "right", "header" and "footer". + * * "placement": placement relative to other content of the same area. + * - "append": place at the end, after any output processed previously. + * Further values that may be supported in the future include "prepend". A "weight" key + * may be introduced for more fine grained control. + * + * @return array an associative array of hints + */ + public function getOutputLayoutHints() { + return $this->layout; + } + + /** + * The message key for the translation of the slot name. + * + * @return string + */ + public function getNameMessageKey() { + return 'slot-name-' . $this->role; + } + + /** + * Determines the content model to use per default for this slot on the given page. + * + * The default implementation always returns the content model provided to the constructor. + * Subclasses may base the choice on default model on the page title or namespace. + * The choice should not depend on external state, such as the page content. + * + * @param LinkTarget $page + * + * @return string + */ + public function getDefaultModel( LinkTarget $page ) { + return $this->contentModel; + } + + /** + * Determines whether the given model can be used on this slot on the given page. + * + * The default implementation checks whether $model is the content model provided to the + * constructor. Subclasses may allow other models and may base the decision on the page title + * or namespace. The choice should not depend on external state, such as the page content. + * + * @note This should be checked when creating new revisions. Existing revisions + * are not guaranteed to comply with the return value. + * + * @param string $model + * @param LinkTarget $page + * + * @return bool + */ + public function isAllowedModel( $model, LinkTarget $page ) { + return ( $model === $this->contentModel ); + } + + /** + * Whether this slot should be considered when determining whether a page should be counted + * as an "article" in the site statistics. + * + * For a page to be considered countable, one of the page's slots must return true from this + * method, and Content::isCountable() must return true for the content of that slot. + * + * The default implementation always returns false. + * + * @return string + */ + public function supportsArticleCount() { + return false; + } + +} diff --git a/includes/Revision/SlotRoleRegistry.php b/includes/Revision/SlotRoleRegistry.php new file mode 100644 index 0000000000..b108b98d43 --- /dev/null +++ b/includes/Revision/SlotRoleRegistry.php @@ -0,0 +1,236 @@ +roleNamesStore = $roleNamesStore; + } + + /** + * Defines a slot role. + * + * For use by extensions that wish to define roles beyond the main slot role. + * + * @see defineRoleWithModel() + * + * @param string $role The role name of the slot to define. This should follow the + * same convention as message keys: + * @param callable $instantiator called with $role as a parameter; + * Signature: function ( string $role ): SlotRoleHandler + */ + public function defineRole( $role, callable $instantiator ) { + if ( $this->isDefinedRole( $role ) ) { + throw new LogicException( "Role $role is already defined" ); + } + + $this->instantiators[$role] = $instantiator; + } + + /** + * Defines a slot role that allows only the given content model, and has no special + * behavior. + * + * For use by extensions that wish to define roles beyond the main slot role, but have + * no need to implement any special behavior for that slot. + * + * @see defineRole() + * + * @param string $role The role name of the slot to define, see defineRole() + * for more information. + * @param string $model A content model name, see ContentHandler + * @param array $layout See SlotRoleHandler getOutputLayoutHints + */ + public function defineRoleWithModel( $role, $model, $layout = [] ) { + $this->defineRole( + $role, + function ( $role ) use ( $model, $layout ) { + return new SlotRoleHandler( $role, $model, $layout ); + } + ); + } + + /** + * Gets the SlotRoleHandler that should be used when processing content of the given role. + * + * @param string $role + * + * @throws InvalidArgumentException If $role is not a known slot role. + * @return SlotRoleHandler The handler to be used for $role. This may be a + * FallbackSlotRoleHandler if the slot is "known" but not "defined". + */ + public function getRoleHandler( $role ) { + if ( !isset( $this->handlers[$role] ) ) { + if ( !$this->isDefinedRole( $role ) ) { + if ( $this->isKnownRole( $role ) ) { + // The role has no handler defined, but is represented in the database. + // This may happen e.g. when the extension that defined the role was uninstalled. + wfWarn( __METHOD__ . ": known but undefined slot role $role" ); + $this->handlers[$role] = new FallbackSlotRoleHandler( $role ); + } else { + // The role doesn't have a handler defined, and is not represented in + // the database. Something must be quite wrong. + throw new InvalidArgumentException( "Unknown role $role" ); + } + } else { + $handler = call_user_func( $this->instantiators[$role], $role ); + + Assert::postcondition( + $handler instanceof SlotRoleHandler, + "Instantiator for $role role must return a SlotRoleHandler" + ); + + $this->handlers[$role] = $handler; + } + } + + return $this->handlers[$role]; + } + + /** + * Returns the list of roles allowed when creating a new revision on the given page. + * The choice should not depend on external state, such as the page content. + * Note that existing revisions of that page are not guaranteed to comply with this list. + * + * All implementations of this method are required to return at least all "required" roles. + * + * @param LinkTarget $title + * + * @return string[] + */ + public function getAllowedRoles( LinkTarget $title ) { + // TODO: allow this to be overwritten per namespace (or page type) + // TODO: decide how to control which slots are offered for editing per default (T209927) + return $this->getDefinedRoles(); + } + + /** + * Returns the list of roles required when creating a new revision on the given page. + * The should not depend on external state, such as the page content. + * Note that existing revisions of that page are not guaranteed to comply with this list. + * + * All required roles are implicitly considered "allowed", so any roles + * returned by this method will also be returned by getAllowedRoles(). + * + * @param LinkTarget $title + * + * @return string[] + */ + public function getRequiredRoles( LinkTarget $title ) { + // TODO: allow this to be overwritten per namespace (or page type) + return [ 'main' ]; + } + + /** + * Returns the list of roles defined by calling defineRole(). + * + * This list should be used when enumerating slot roles that can be used for editing. + * + * @return string[] + */ + public function getDefinedRoles() { + return array_keys( $this->instantiators ); + } + + /** + * Returns the list of known roles, including the ones returned by getDefinedRoles(), + * and roles that exist according to the NameTableStore provided to the constructor. + * + * This list should be used when enumerating slot roles that can be used in queries or + * for display. + * + * @return string[] + */ + public function getKnownRoles() { + return array_unique( array_merge( + $this->getDefinedRoles(), + $this->roleNamesStore->getMap() + ) ); + } + + /** + * Whether the given role is defined, that is, it was defined by calling defineRole(). + * + * @param string $role + * @return bool + */ + public function isDefinedRole( $role ) { + return in_array( $role, $this->getDefinedRoles(), true ); + } + + /** + * Whether the given role is known, that is, it's either defined or exist according to + * the NameTableStore provided to the constructor. + * + * @param string $role + * @return bool + */ + public function isKnownRole( $role ) { + return in_array( $role, $this->getKnownRoles(), true ); + } + +} diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 33517a0665..9a94389f74 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -48,8 +48,10 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Preferences\PreferencesFactory; use MediaWiki\Preferences\DefaultPreferencesFactory; +use MediaWiki\Revision\MainSlotRoleHandler; use MediaWiki\Revision\RevisionFactory; use MediaWiki\Revision\RevisionLookup; +use MediaWiki\Revision\SlotRoleRegistry; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\RevisionStoreFactory; @@ -420,9 +422,12 @@ return [ }, 'RevisionRenderer' => function ( MediaWikiServices $services ) : RevisionRenderer { - $renderer = new RevisionRenderer( $services->getDBLoadBalancer() ); - $renderer->setLogger( LoggerFactory::getInstance( 'SaveParse' ) ); + $renderer = new RevisionRenderer( + $services->getDBLoadBalancer(), + $services->getSlotRoleRegistry() + ); + $renderer->setLogger( LoggerFactory::getInstance( 'SaveParse' ) ); return $renderer; }, @@ -436,6 +441,7 @@ return [ $services->getDBLoadBalancerFactory(), $services->getBlobStoreFactory(), $services->getNameTableStoreFactory(), + $services->getSlotRoleRegistry(), $services->getMainWANObjectCache(), $services->getCommentStore(), $services->getActorMigration(), @@ -519,6 +525,22 @@ return [ return $factory; }, + 'SlotRoleRegistry' => function ( MediaWikiServices $services ) : SlotRoleRegistry { + $config = $services->getMainConfig(); + + $registry = new SlotRoleRegistry( + $services->getNameTableStoreFactory()->getSlotRoles() + ); + + $registry->defineRole( 'main', function () use ( $config ) { + return new MainSlotRoleHandler( + $config->get( 'NamespaceContentModels' ) + ); + } ); + + return $registry; + }, + 'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory { return new SpecialPageFactory( $services->getMainConfig(), diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php index af65e457a5..7af80dcfd6 100644 --- a/includes/SiteConfiguration.php +++ b/includes/SiteConfiguration.php @@ -483,13 +483,13 @@ class SiteConfiguration { /** * Work out the site and language name from a database name - * @param string $db + * @param string $wiki Wiki ID * * @return array */ - public function siteFromDB( $db ) { + public function siteFromDB( $wiki ) { // Allow override - $def = $this->getWikiParams( $db ); + $def = $this->getWikiParams( $wiki ); if ( !is_null( $def['suffix'] ) && !is_null( $def['lang'] ) ) { return [ $def['suffix'], $def['lang'] ]; } @@ -499,15 +499,16 @@ class SiteConfiguration { foreach ( $this->suffixes as $altSite => $suffix ) { if ( $suffix === '' ) { $site = ''; - $lang = $db; + $lang = $wiki; break; - } elseif ( substr( $db, -strlen( $suffix ) ) == $suffix ) { + } elseif ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) { $site = is_numeric( $altSite ) ? $suffix : $altSite; - $lang = substr( $db, 0, strlen( $db ) - strlen( $suffix ) ); + $lang = substr( $wiki, 0, strlen( $wiki ) - strlen( $suffix ) ); break; } } $lang = str_replace( '_', '-', $lang ); + return [ $site, $lang ]; } diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index e908968b43..9ce12b4b13 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -44,6 +44,7 @@ use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Revision\RevisionSlots; use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRoleRegistry; use MediaWiki\Revision\SlotRecord; use MediaWiki\User\UserIdentity; use MessageCache; @@ -150,6 +151,9 @@ class DerivedPageDataUpdater implements IDBAccessObject { */ private $options = [ 'changed' => true, + // newrev is true if prepareUpdate is handling the creation of a new revision, + // as opposed to a null edit or a forced update. + 'newrev' => false, 'created' => false, 'moved' => false, 'restored' => false, @@ -209,6 +213,9 @@ class DerivedPageDataUpdater implements IDBAccessObject { */ private $revisionRenderer; + /** @var SlotRoleRegistry */ + private $slotRoleRegistry; + /** * A stage identifier for managing the life cycle of this instance. * Possible stages are 'new', 'knows-current', 'has-content', 'has-revision', and 'done'. @@ -255,6 +262,7 @@ class DerivedPageDataUpdater implements IDBAccessObject { * @param WikiPage $wikiPage , * @param RevisionStore $revisionStore * @param RevisionRenderer $revisionRenderer + * @param SlotRoleRegistry $slotRoleRegistry * @param ParserCache $parserCache * @param JobQueueGroup $jobQueueGroup * @param MessageCache $messageCache @@ -265,6 +273,7 @@ class DerivedPageDataUpdater implements IDBAccessObject { WikiPage $wikiPage, RevisionStore $revisionStore, RevisionRenderer $revisionRenderer, + SlotRoleRegistry $slotRoleRegistry, ParserCache $parserCache, JobQueueGroup $jobQueueGroup, MessageCache $messageCache, @@ -276,10 +285,11 @@ class DerivedPageDataUpdater implements IDBAccessObject { $this->parserCache = $parserCache; $this->revisionStore = $revisionStore; $this->revisionRenderer = $revisionRenderer; + $this->slotRoleRegistry = $slotRoleRegistry; $this->jobQueueGroup = $jobQueueGroup; $this->messageCache = $messageCache; $this->contLang = $contLang; - // XXX only needed for waiting for slaves to catch up; there should be a narrower + // XXX only needed for waiting for replicas to catch up; there should be a narrower // interface for that. $this->loadbalancerFactory = $loadbalancerFactory; } @@ -351,13 +361,9 @@ class DerivedPageDataUpdater implements IDBAccessObject { throw new InvalidArgumentException( '$parentId should match the parent of $revision' ); } - if ( $revision - && $user - && $revision->getUser( RevisionRecord::RAW )->getName() !== $user->getName() - ) { - throw new InvalidArgumentException( '$user should match the author of $revision' ); - } - + // NOTE: For null revisions, $user may be different from $this->revision->getUser + // and also from $revision->getUser. + // But $user should always match $this->user. if ( $user && $this->user && $user->getName() !== $this->user->getName() ) { return false; } @@ -368,10 +374,6 @@ class DerivedPageDataUpdater implements IDBAccessObject { return false; } - if ( $revision && !$user ) { - $user = $revision->getUser( RevisionRecord::RAW ); - } - if ( $this->pageState && $revision && $revision->getParentId() !== null @@ -387,22 +389,6 @@ class DerivedPageDataUpdater implements IDBAccessObject { return false; } - if ( $this->revision - && $user - && $this->revision->getUser( RevisionRecord::RAW ) - && $this->revision->getUser( RevisionRecord::RAW )->getName() !== $user->getName() - ) { - return false; - } - - if ( $revision - && $this->user - && $this->revision->getUser( RevisionRecord::RAW ) - && $revision->getUser( RevisionRecord::RAW )->getName() !== $this->user->getName() - ) { - return false; - } - // NOTE: this check is the primary reason for having the $this->slotsUpdate field! if ( $this->slotsUpdate && $slotsUpdate @@ -660,12 +646,26 @@ class DerivedPageDataUpdater implements IDBAccessObject { $hasLinks = null; if ( $this->articleCountMethod === 'link' ) { + // NOTE: it would be more appropriate to determine for each slot separately + // whether it has links, and use that information with that slot's + // isCountable() method. However, that would break parity with + // WikiPage::isCountable, which uses the pagelinks table to determine + // whether the current revision has links. $hasLinks = (bool)count( $this->getCanonicalParserOutput()->getLinks() ); } - // TODO: MCR: ask all slots if they have links [SlotHandler/PageTypeHandler] - $mainContent = $this->getRawContent( SlotRecord::MAIN ); - return $mainContent->isCountable( $hasLinks ); + foreach ( $this->getModifiedSlotRoles() as $role ) { + $roleHandler = $this->slotRoleRegistry->getRoleHandler( $role ); + if ( $roleHandler->supportsArticleCount() ) { + $content = $this->getRawContent( $role ); + + if ( $content->isCountable( $hasLinks ) ) { + return true; + } + } + } + + return false; } /** @@ -673,6 +673,7 @@ class DerivedPageDataUpdater implements IDBAccessObject { */ public function isRedirect() { // NOTE: main slot determines redirect status + // TODO: MCR: this should be controlled by a PageTypeHandler $mainContent = $this->getRawContent( SlotRecord::MAIN ); return $mainContent->isRedirect(); @@ -762,17 +763,6 @@ class DerivedPageDataUpdater implements IDBAccessObject { $stashedEdit = ApiStashEdit::checkCache( $title, $mainContent, $legacyUser ); } - if ( $stashedEdit ) { - /** @var ParserOutput $output */ - $output = $stashedEdit->output; - - // TODO: this should happen when stashing the ParserOutput, not now! - $output->setCacheTime( $stashedEdit->timestamp ); - - // TODO: MCR: allow output for all slots to be stashed. - $this->canonicalParserOutput = $output; - } - $userPopts = ParserOptions::newFromUserAndLang( $user, $this->contLang ); Hooks::run( 'ArticlePrepareTextForEdit', [ $wikiPage, $userPopts ] ); @@ -853,6 +843,27 @@ class DerivedPageDataUpdater implements IDBAccessObject { } else { $this->parentRevision = $parentRevision; } + + $renderHints = [ 'use-master' => $this->useMaster(), 'audience' => RevisionRecord::RAW ]; + + if ( $stashedEdit ) { + /** @var ParserOutput $output */ + $output = $stashedEdit->output; + + // TODO: this should happen when stashing the ParserOutput, not now! + $output->setCacheTime( $stashedEdit->timestamp ); + + $renderHints['known-revision-output'] = $output; + } + + // NOTE: we want a canonical rendering, so don't pass $this->user or ParserOptions + // NOTE: the revision is either new or current, so we can bypass audience checks. + $this->renderedRevision = $this->revisionRenderer->getRenderedRevision( + $this->revision, + null, + null, + $renderHints + ); } /** @@ -879,18 +890,7 @@ class DerivedPageDataUpdater implements IDBAccessObject { * @return RenderedRevision */ public function getRenderedRevision() { - if ( !$this->renderedRevision ) { - $this->assertPrepared( __METHOD__ ); - - // NOTE: we want a canonical rendering, so don't pass $this->user or ParserOptions - // NOTE: the revision is either new or current, so we can bypass audience checks. - $this->renderedRevision = $this->revisionRenderer->getRenderedRevision( - $this->revision, - null, - null, - [ 'use-master' => $this->useMaster(), 'audience' => RevisionRecord::RAW ] - ); - } + $this->assertPrepared( __METHOD__ ); return $this->renderedRevision; } @@ -1113,12 +1113,14 @@ class DerivedPageDataUpdater implements IDBAccessObject { // Override fields defined in $this->options with values from $options. $this->options = array_intersect_key( $options, $this->options ) + $this->options; - if ( isset( $this->pageState['oldId'] ) ) { - $oldId = $this->pageState['oldId']; + if ( $this->revision ) { + $oldId = $this->pageState['oldId'] ?? 0; + $this->options['newrev'] = ( $revision->getId() !== $oldId ); } elseif ( isset( $this->options['oldrevision'] ) ) { /** @var Revision|RevisionRecord $oldRev */ $oldRev = $this->options['oldrevision']; $oldId = $oldRev->getId(); + $this->options['newrev'] = ( $revision->getId() !== $oldId ); } else { $oldId = $revision->getParentId(); } @@ -1210,6 +1212,19 @@ class DerivedPageDataUpdater implements IDBAccessObject { // Prune any output that depends on the revision ID. if ( $this->renderedRevision ) { $this->renderedRevision->updateRevision( $revision ); + } else { + + // NOTE: we want a canonical rendering, so don't pass $this->user or ParserOptions + // NOTE: the revision is either new or current, so we can bypass audience checks. + $this->renderedRevision = $this->revisionRenderer->getRenderedRevision( + $this->revision, + null, + null, + [ 'use-master' => $this->useMaster(), 'audience' => RevisionRecord::RAW ] + ); + + // XXX: Since we presumably are dealing with the current revision, + // we could try to get the ParserOutput from the parser cache. } // TODO: optionally get ParserOutput from the ParserCache here. @@ -1407,12 +1422,9 @@ class DerivedPageDataUpdater implements IDBAccessObject { // the recent change entry (also done via deferred updates) and carry over any // bot/deletion/IP flags, ect. $this->jobQueueGroup->lazyPush( - new CategoryMembershipChangeJob( + CategoryMembershipChangeJob::newSpec( $this->getTitle(), - [ - 'pageId' => $this->getPageId(), - 'revTimestamp' => $this->revision->getTimestamp(), - ] + $this->revision->getTimestamp() ) ); } @@ -1604,8 +1616,8 @@ class DerivedPageDataUpdater implements IDBAccessObject { // Save it to the parser cache. Use the revision timestamp in the case of a // freshly saved edit, as that matches page_touched and a mismatch would trigger an // unnecessary reparse. - $timestamp = $this->options['changed'] ? $this->revision->getTimestamp() - : $output->getTimestamp(); + $timestamp = $this->options['newrev'] ? $this->revision->getTimestamp() + : $output->getCacheTime(); $this->parserCache->save( $output, $wikiPage, $this->getCanonicalParserOptions(), $timestamp, $this->revision->getId() diff --git a/includes/Storage/NameTableStore.php b/includes/Storage/NameTableStore.php index c1dd09dfb7..27194ab219 100644 --- a/includes/Storage/NameTableStore.php +++ b/includes/Storage/NameTableStore.php @@ -205,7 +205,7 @@ class NameTableStore { * * @param int $connFlags ILoadBalancer::CONN_XXX flags. Optional. * - * @return \string[] The freshly reloaded name map + * @return string[] The freshly reloaded name map */ public function reloadMap( $connFlags = 0 ) { $this->tableCache = $this->loadTable( diff --git a/includes/Storage/PageUpdater.php b/includes/Storage/PageUpdater.php index 043e00ebf6..6cbdcc6e91 100644 --- a/includes/Storage/PageUpdater.php +++ b/includes/Storage/PageUpdater.php @@ -31,7 +31,6 @@ use Content; use ContentHandler; use DeferredUpdates; use Hooks; -use InvalidArgumentException; use LogicException; use ManualLogEntry; use MediaWiki\Linker\LinkTarget; @@ -39,6 +38,7 @@ use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRoleRegistry; use MediaWiki\Revision\SlotRecord; use MWException; use RecentChange; @@ -96,6 +96,11 @@ class PageUpdater { */ private $revisionStore; + /** + * @var SlotRoleRegistry + */ + private $slotRoleRegistry; + /** * @var boolean see $wgUseAutomaticEditSummaries * @see $wgUseAutomaticEditSummaries @@ -148,13 +153,15 @@ class PageUpdater { * @param DerivedPageDataUpdater $derivedDataUpdater * @param LoadBalancer $loadBalancer * @param RevisionStore $revisionStore + * @param SlotRoleRegistry $slotRoleRegistry */ public function __construct( User $user, WikiPage $wikiPage, DerivedPageDataUpdater $derivedDataUpdater, LoadBalancer $loadBalancer, - RevisionStore $revisionStore + RevisionStore $revisionStore, + SlotRoleRegistry $slotRoleRegistry ) { $this->user = $user; $this->wikiPage = $wikiPage; @@ -162,6 +169,7 @@ class PageUpdater { $this->loadBalancer = $loadBalancer; $this->revisionStore = $revisionStore; + $this->slotRoleRegistry = $slotRoleRegistry; $this->slotsUpdate = new RevisionSlotsUpdate(); } @@ -317,14 +325,6 @@ class PageUpdater { return $this->derivedDataUpdater->grabCurrentRevision(); } - /** - * @return string - */ - private function getTimestampNow() { - // TODO: allow an override to be injected for testing - return wfTimestampNow(); - } - /** * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed. * @@ -346,8 +346,7 @@ class PageUpdater { * @param Content $content */ public function setContent( $role, Content $content ) { - // TODO: MCR: check the role and the content's model against the list of supported - // roles, see T194046. + $this->ensureRoleAllowed( $role ); $this->slotsUpdate->modifyContent( $role, $content ); } @@ -358,6 +357,8 @@ class PageUpdater { * @param SlotRecord $slot */ public function setSlot( SlotRecord $slot ) { + $this->ensureRoleAllowed( $slot->getRole() ); + $this->slotsUpdate->modifySlot( $slot ); } @@ -376,6 +377,7 @@ class PageUpdater { * by the new revision. */ public function inheritSlot( SlotRecord $originalSlot ) { + // NOTE: slots can be inherited even if the role is not "allowed" on the title. // NOTE: this slot is inherited from some other revision, but it's // a "modified" slot for the RevisionSlotsUpdate and DerivedPageDataUpdater, // since it's not implicitly inherited from the parent revision. @@ -393,9 +395,7 @@ class PageUpdater { * @param string $role A slot role name (but not "main") */ public function removeSlot( $role ) { - if ( $role === SlotRecord::MAIN ) { - throw new InvalidArgumentException( 'Cannot remove the main slot!' ); - } + $this->ensureRoleNotRequired( $role ); $this->slotsUpdate->removeSlot( $role ); } @@ -635,20 +635,38 @@ class PageUpdater { throw new RuntimeException( 'Something is trying to edit an article with an empty title' ); } - // TODO: MCR: check the role and the content's model against the list of supported - // and required roles, see T194046. + // NOTE: slots can be inherited even if the role is not "allowed" on the title. + $status = Status::newGood(); + $this->checkAllRolesAllowed( + $this->slotsUpdate->getModifiedRoles(), + $status + ); + $this->checkNoRolesRequired( + $this->slotsUpdate->getRemovedRoles(), + $status + ); - // Make sure the given content type is allowed for this page - // TODO: decide: Extend check to other slots? Consider the role in check? [PageType] - $mainContentHandler = $this->getContentHandler( SlotRecord::MAIN ); - if ( !$mainContentHandler->canBeUsedOn( $this->getTitle() ) ) { - $this->status = Status::newFatal( 'content-not-allowed-here', - ContentHandler::getLocalizedName( $mainContentHandler->getModelID() ), - $this->getTitle()->getPrefixedText() - ); + if ( !$status->isOK() ) { return null; } + // Make sure the given content is allowed in the respective slots of this page + foreach ( $this->slotsUpdate->getModifiedRoles() as $role ) { + $slot = $this->slotsUpdate->getModifiedSlot( $role ); + $roleHandler = $this->slotRoleRegistry->getRoleHandler( $role ); + + if ( !$roleHandler->isAllowedModel( $slot->getModel(), $this->getTitle() ) ) { + $contentHandler = ContentHandler::getForModelID( $slot->getModel() ); + $this->status = Status::newFatal( 'content-not-allowed-here', + ContentHandler::getLocalizedName( $contentHandler->getModelID() ), + $this->getTitle()->getPrefixedText(), + wfMessage( $roleHandler->getNameMessageKey() ) + // TODO: defer message lookup to caller + ); + return null; + } + } + // Load the data from the master database if needed. Needed to check flags. // NOTE: This grabs the parent revision as the CAS token, if grabParentRevision // wasn't called yet. If the page is modified by another process before we are done with @@ -882,13 +900,19 @@ class PageUpdater { $content = $slot->getContent(); // XXX: We may push this up to the "edit controller" level, see T192777. - // TODO: change the signature of PrepareSave to not take a WikiPage! + // XXX: prepareSave() and isValid() could live in SlotRoleHandler + // XXX: PrepareSave should not take a WikiPage! $prepStatus = $content->prepareSave( $wikiPage, $flags, $oldid, $user ); // TODO: MCR: record which problem arose in which slot. $status->merge( $prepStatus ); } + $this->checkAllRequiredRoles( + $rev->getSlotRoles(), + $status + ); + return $rev; } @@ -1216,4 +1240,71 @@ class PageUpdater { ); } + /** + * @return string[] Slots required for this page update, as a list of role names. + */ + private function getRequiredSlotRoles() { + return $this->slotRoleRegistry->getRequiredRoles( $this->getTitle() ); + } + + /** + * @return string[] Slots allowed for this page update, as a list of role names. + */ + private function getAllowedSlotRoles() { + return $this->slotRoleRegistry->getAllowedRoles( $this->getTitle() ); + } + + private function ensureRoleAllowed( $role ) { + $allowedRoles = $this->getAllowedSlotRoles(); + if ( !in_array( $role, $allowedRoles ) ) { + throw new PageUpdateException( "Slot role `$role` is not allowed." ); + } + } + + private function ensureRoleNotRequired( $role ) { + $requiredRoles = $this->getRequiredSlotRoles(); + if ( in_array( $role, $requiredRoles ) ) { + throw new PageUpdateException( "Slot role `$role` is required." ); + } + } + + private function checkAllRolesAllowed( array $roles, Status $status ) { + $allowedRoles = $this->getAllowedSlotRoles(); + + $forbidden = array_diff( $roles, $allowedRoles ); + if ( !empty( $forbidden ) ) { + $status->error( + 'edit-slots-cannot-add', + count( $forbidden ), + implode( ', ', $forbidden ) + ); + } + } + + private function checkNoRolesRequired( array $roles, Status $status ) { + $requiredRoles = $this->getRequiredSlotRoles(); + + $needed = array_diff( $roles, $requiredRoles ); + if ( !empty( $needed ) ) { + $status->error( + 'edit-slots-cannot-remove', + count( $needed ), + implode( ', ', $needed ) + ); + } + } + + private function checkAllRequiredRoles( array $roles, Status $status ) { + $requiredRoles = $this->getRequiredSlotRoles(); + + $missing = array_diff( $requiredRoles, $roles ); + if ( !empty( $missing ) ) { + $status->error( + 'edit-slots-missing', + count( $missing ), + implode( ', ', $missing ) + ); + } + } + } diff --git a/includes/Title.php b/includes/Title.php index 038e8b1b20..909f528637 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -954,6 +954,7 @@ class Title implements LinkTarget { /** * Get the DB key with the initial letter case as specified by the user + * @deprecated since 1.33; please use Title::getDBKey() instead * * @return string DB key */ @@ -978,6 +979,8 @@ class Title implements LinkTarget { /** * Get the page's content model id, see the CONTENT_MODEL_XXX constants. * + * @todo Deprecate this in favor of SlotRecord::getModel() + * * @param int $flags A bit field; may be Title::GAID_FOR_UPDATE to select for update * @return string Content model id */ @@ -1659,7 +1662,7 @@ class Title implements LinkTarget { $p = $this->mInterwiki . ':'; } - if ( 0 != $this->mNamespace ) { + if ( $this->mNamespace != 0 ) { $nsText = $this->getNsText(); if ( $nsText === false ) { @@ -2687,9 +2690,9 @@ class Title implements LinkTarget { $errors[] = [ 'confirmedittext' ]; } - $useSlave = ( $rigor !== 'secure' ); + $useReplica = ( $rigor !== 'secure' ); if ( ( $action == 'edit' || $action == 'create' ) - && !$user->isBlockedFrom( $this, $useSlave ) + && !$user->isBlockedFrom( $this, $useReplica ) ) { // Don't block the user from editing their own talk page unless they've been // explicitly blocked from that too. @@ -2858,10 +2861,12 @@ class Title implements LinkTarget { } $errors = []; - while ( count( $checks ) > 0 && - !( $short && count( $errors ) > 0 ) ) { - $method = array_shift( $checks ); + foreach ( $checks as $method ) { $errors = $this->$method( $action, $user, $errors, $rigor, $short ); + + if ( $short && $errors !== [] ) { + break; + } } return $errors; @@ -3273,9 +3278,13 @@ class Title implements LinkTarget { * indicating who can move or edit the page from the page table, (pre 1.10) rows. * Edit and move sections are separated by a colon * Example: "edit=autoconfirmed,sysop:move=sysop" + * @param bool $readLatest When true, skip replicas and read from the master DB. */ - public function loadRestrictionsFromRows( $rows, $oldFashionedRestrictions = null ) { - $dbr = wfGetDB( DB_REPLICA ); + public function loadRestrictionsFromRows( + $rows, $oldFashionedRestrictions = null, $readLatest = false + ) { + $whichDb = $readLatest ? DB_MASTER : DB_REPLICA; + $dbr = wfGetDB( $whichDb ); $restrictionTypes = $this->getRestrictionTypes(); @@ -3345,9 +3354,10 @@ class Title implements LinkTarget { * indicating who can move or edit the page from the page table, (pre 1.10) rows. * Edit and move sections are separated by a colon * Example: "edit=autoconfirmed,sysop:move=sysop" + * @param bool $readLatest When true, skip replicas and read from the master DB. */ - public function loadRestrictions( $oldFashionedRestrictions = null ) { - if ( $this->mRestrictionsLoaded ) { + public function loadRestrictions( $oldFashionedRestrictions = null, $readLatest = false ) { + if ( $this->mRestrictionsLoaded && !$readLatest ) { return; } @@ -3357,10 +3367,11 @@ class Title implements LinkTarget { $fname = __METHOD__; $rows = $cache->getWithSetCallback( // Page protections always leave a new null revision - $cache->makeKey( 'page-restrictions', $id, $this->getLatestRevID() ), + $cache->makeKey( 'page-restrictions', $id, $this->getLatestRevID(), $readLatest ), $cache::TTL_DAY, - function ( $curValue, &$ttl, array &$setOpts ) use ( $fname ) { - $dbr = wfGetDB( DB_REPLICA ); + function ( $curValue, &$ttl, array &$setOpts ) use ( $fname, $readLatest ) { + $whichDb = $readLatest ? DB_MASTER : DB_REPLICA; + $dbr = wfGetDB( $whichDb ); $setOpts += Database::getCacheSetOptions( $dbr ); @@ -3375,7 +3386,7 @@ class Title implements LinkTarget { } ); - $this->loadRestrictionsFromRows( $rows, $oldFashionedRestrictions ); + $this->loadRestrictionsFromRows( $rows, $oldFashionedRestrictions, $readLatest ); } else { $title_protection = $this->getTitleProtectionInternal(); @@ -3571,7 +3582,7 @@ class Title implements LinkTarget { $this->mArticleID = $linkCache->addLinkObj( $this ); $linkCache->forUpdate( $oldUpdate ); } else { - if ( -1 == $this->mArticleID ) { + if ( $this->mArticleID == -1 ) { $this->mArticleID = $linkCache->addLinkObj( $this ); } } @@ -5218,10 +5229,9 @@ class Title implements LinkTarget { if ( MWNamespace::hasSubpages( $this->mNamespace ) ) { // Optional notice for page itself and any parent page - $parts = explode( '/', $this->mDbkeyform ); $editnotice_base = $editnotice_ns; - while ( count( $parts ) > 0 ) { - $editnotice_base .= '-' . array_shift( $parts ); + foreach ( explode( '/', $this->mDbkeyform ) as $part ) { + $editnotice_base .= '-' . $part; $msg = wfMessage( $editnotice_base ); if ( $msg->exists() ) { $html = $msg->parseAsBlock(); diff --git a/includes/WikiMap.php b/includes/WikiMap.php index b731d7bd95..3305f9f7d3 100644 --- a/includes/WikiMap.php +++ b/includes/WikiMap.php @@ -246,6 +246,7 @@ class WikiMap { * Get the wiki ID of a database domain * * This is like DatabaseDomain::getId() without encoding (for legacy reasons) + * and without the schema if it merely set to the generic value "mediawiki" * * @param string|DatabaseDomain $domain * @return string @@ -253,9 +254,19 @@ class WikiMap { public static function getWikiIdFromDomain( $domain ) { $domain = DatabaseDomain::newFromId( $domain ); + if ( !in_array( $domain->getSchema(), [ null, 'mediawiki' ], true ) ) { + // Include the schema if it is set and is not the default placeholder. + // This means a site admin may have specifically taylored the schemas. + // Domain IDs might use the form --, meaning that + // the schema portion must be accounted for to disambiguate wikis. + return "{$domain->getDatabase()}-{$domain->getSchema()}-{$domain->getTablePrefix()}"; + } + + // Note that if this wiki ID is passed a a domain ID to LoadBalancer, then it can + // handle the schema by assuming the generic "mediawiki" schema if needed. return strlen( $domain->getTablePrefix() ) ? "{$domain->getDatabase()}-{$domain->getTablePrefix()}" - : $domain->getDatabase(); + : (string)$domain->getDatabase(); } /** @@ -277,9 +288,16 @@ class WikiMap { $domain = DatabaseDomain::newFromId( $domain ); $curDomain = self::getCurrentWikiDomain(); + if ( !in_array( $curDomain->getSchema(), [ null, 'mediawiki' ], true ) ) { + // Include the schema if it is set and is not the default placeholder. + // This means a site admin may have specifically taylored the schemas. + // Domain IDs might use the form --, meaning that + // the schema portion must be accounted for to disambiguate wikis. + return $curDomain->equals( $domain ); + } + return ( $curDomain->getDatabase() === $domain->getDatabase() && - // @TODO: check schema instead of assuming it's ""/"mediawiki" and never collides $curDomain->getTablePrefix() === $domain->getTablePrefix() ); } diff --git a/includes/XmlSelect.php b/includes/XmlSelect.php index 5d7406c64d..45002e82f6 100644 --- a/includes/XmlSelect.php +++ b/includes/XmlSelect.php @@ -75,7 +75,7 @@ class XmlSelect { /** * @param string $label - * @param string $value If not given, assumed equal to $label + * @param string|false $value If not given, assumed equal to $label */ public function addOption( $label, $value = false ) { $value = $value !== false ? $value : $label; @@ -99,7 +99,7 @@ class XmlSelect { * label => ( label => value, label => value ) * * @param array $options - * @param string|array $default + * @param string|array|false $default * @return string */ static function formatOptions( $options, $default = false ) { diff --git a/includes/actions/Action.php b/includes/actions/Action.php index e5233f0607..f288a5cb1f 100644 --- a/includes/actions/Action.php +++ b/includes/actions/Action.php @@ -314,9 +314,14 @@ abstract class Action implements MessageLocalizer { } } - if ( $this->requiresUnblock() && $user->isBlocked() ) { + // If the action requires an unblock, explicitly check the user's block. + if ( $this->requiresUnblock() && $user->isBlockedFrom( $this->getTitle() ) ) { $block = $user->getBlock(); - throw new UserBlockedError( $block ); + if ( $block ) { + throw new UserBlockedError( $block ); + } + + throw new PermissionsError( $this->getName(), [ 'badaccess-group0' ] ); } // This should be checked at the end so that the user won't think the diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 7d6b548b0f..140ca2e2e8 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -492,7 +492,7 @@ class HistoryPager extends ReverseChronologicalPager { return $s; } - function doBatchLookups() { + protected function doBatchLookups() { if ( !Hooks::run( 'PageHistoryPager::doBatchLookups', [ $this, $this->mResult ] ) ) { return; } @@ -523,7 +523,7 @@ class HistoryPager extends ReverseChronologicalPager { * * @return string HTML output */ - function getStartBody() { + protected function getStartBody() { $this->lastRow = false; $this->counter = 1; $this->oldIdChecked = 0; @@ -585,7 +585,7 @@ class HistoryPager extends ReverseChronologicalPager { return $element; } - function getEndBody() { + protected function getEndBody() { if ( $this->lastRow ) { $latest = $this->counter == 1 && $this->mIsFirst; $firstInList = $this->counter == 1; diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index d0145034c8..49a6bb5a5f 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -174,7 +174,7 @@ class InfoAction extends FormlessAction { * @param string $table The table that will be added to the content * @param string $name The name of the row * @param string $value The value of the row - * @param string $id The ID to use for the 'tr' element + * @param string|null $id The ID to use for the 'tr' element * @return string The table with the row added */ protected function addRow( $table, $name, $value, $id ) { @@ -264,6 +264,12 @@ class InfoAction extends FormlessAction { $this->msg( 'pageinfo-length' ), $lang->formatNum( $title->getLength() ) ]; + // Page namespace + $pageNamespace = $title->getNsText(); + if ( $pageNamespace ) { + $pageInfo['header-basic'][] = [ $this->msg( 'pageinfo-namespace' ), $pageNamespace ]; + } + // Page ID (number not localised, as it's a database ID) $pageInfo['header-basic'][] = [ $this->msg( 'pageinfo-article-id' ), $id ]; diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index c962e20d22..03a5bc840a 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -70,9 +70,13 @@ class RollbackAction extends FormlessAction { } // @TODO: remove this hack once rollback uses POST (T88044) + $fname = __METHOD__; $trxLimits = $this->context->getConfig()->get( 'TrxProfilerLimits' ); $trxProfiler = Profiler::instance()->getTransactionProfiler(); - $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ ); + $trxProfiler->redefineExpectations( $trxLimits['POST'], $fname ); + DeferredUpdates::addCallableUpdate( function () use ( $trxProfiler, $trxLimits, $fname ) { + $trxProfiler->redefineExpectations( $trxLimits['PostSend-POST'], $fname ); + } ); $data = null; $errors = $this->page->doRollback( diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index c66e5d52bb..1efd747f80 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -21,6 +21,7 @@ */ use Wikimedia\Rdbms\IDatabase; +use MediaWiki\MediaWikiServices; /** * This abstract class implements many basic API functions, and is the base of @@ -267,11 +268,14 @@ abstract class ApiBase extends ContextSource { /** @var array Maps extension paths to info arrays */ private static $extensionInfo = null; + /** @var int[][][] Cache for self::filterIDs() */ + private static $filterIDsCache = []; + /** @var ApiMain */ private $mMainModule; /** @var string */ private $mModuleName, $mModulePrefix; - private $mSlaveDB = null; + private $mReplicaDB = null; private $mParamCache = []; /** @var array|null|bool */ private $mModuleSource = false; @@ -647,11 +651,11 @@ abstract class ApiBase extends ContextSource { * @return IDatabase */ protected function getDB() { - if ( !isset( $this->mSlaveDB ) ) { - $this->mSlaveDB = wfGetDB( DB_REPLICA, 'api' ); + if ( !isset( $this->mReplicaDB ) ) { + $this->mReplicaDB = wfGetDB( DB_REPLICA, 'api' ); } - return $this->mSlaveDB; + return $this->mReplicaDB; } /** @@ -1831,6 +1835,41 @@ abstract class ApiBase extends ContextSource { } } + /** + * Filter out-of-range values from a list of positive integer IDs + * @since 1.33 + * @param array $fields Array of pairs of table and field to check + * @param (string|int)[] $ids IDs to filter. Strings in the array are + * expected to be stringified ints. + * @return (string|int)[] Filtered IDs. + */ + protected function filterIDs( $fields, array $ids ) { + $min = INF; + $max = 0; + foreach ( $fields as list( $table, $field ) ) { + if ( isset( self::$filterIDsCache[$table][$field] ) ) { + $row = self::$filterIDsCache[$table][$field]; + } else { + $row = $this->getDB()->selectRow( + $table, + [ + 'min_id' => "MIN($field)", + 'max_id' => "MAX($field)", + ], + '', + __METHOD__ + ); + self::$filterIDsCache[$table][$field] = $row; + } + $min = min( $min, $row->min_id ); + $max = max( $max, $row->max_id ); + } + return array_filter( $ids, function ( $id ) use ( $min, $max ) { + return ( is_int( $id ) && $id >= 0 || ctype_digit( $id ) ) + && $id >= $min && $id <= $max; + } ); + } + /**@}*/ /************************************************************************//** @@ -1910,9 +1949,14 @@ abstract class ApiBase extends ContextSource { * @since 1.29 * @param StatusValue $status * @param string[] $types 'warning' and/or 'error' + * @param string[] $filter Message keys to filter out (since 1.33) */ - public function addMessagesFromStatus( StatusValue $status, $types = [ 'warning', 'error' ] ) { - $this->getErrorFormatter()->addMessagesFromStatus( $this->getModulePath(), $status, $types ); + public function addMessagesFromStatus( + StatusValue $status, $types = [ 'warning', 'error' ], array $filter = [] + ) { + $this->getErrorFormatter()->addMessagesFromStatus( + $this->getModulePath(), $status, $types, $filter + ); } /** @@ -2069,11 +2113,41 @@ abstract class ApiBase extends ContextSource { foreach ( (array)$actions as $action ) { $errors = array_merge( $errors, $title->getUserPermissionsErrors( $action, $user ) ); } + if ( $errors ) { + // track block notices + if ( $this->getConfig()->get( 'EnableBlockNoticeStats' ) ) { + $this->trackBlockNotices( $errors ); + } + $this->dieStatus( $this->errorArrayToStatus( $errors, $user ) ); } } + /** + * Keep track of errors messages resulting from a block + * + * @param array $errors + */ + private function trackBlockNotices( array $errors ) { + $errorMessageKeys = [ + 'blockedtext', + 'blockedtext-partial', + 'autoblockedtext', + 'systemblockedtext', + ]; + + $statsd = MediaWikiServices::getInstance()->getStatsdDataFactory(); + + foreach ( $errors as $error ) { + if ( in_array( $error[0], $errorMessageKeys ) ) { + $wiki = $this->getConfig()->get( 'DBname' ); + $statsd->increment( 'BlockNotices.' . $wiki . '.MediaWikiApi.returned' ); + break; + } + } + } + /** * Will only set a warning instead of failing if the global $wgDebugAPI * is set to true. Otherwise behaves exactly as self::dieWithError(). diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php index 3581ac8514..ed3d01ce8e 100644 --- a/includes/api/ApiBlock.php +++ b/includes/api/ApiBlock.php @@ -57,25 +57,11 @@ class ApiBlock extends ApiBase { $editingRestriction = 'sitewide'; $pageRestrictions = ''; if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) { - if ( $params['pagerestrictions'] ) { - $count = count( $params['pagerestrictions'] ); - if ( $count > 10 ) { - $this->dieWithError( - $this->msg( - 'apierror-integeroutofrange-abovebotmax', - 'pagerestrictions', - 10, - $count - ) - ); - } - } - if ( $params['partial'] ) { $editingRestriction = 'partial'; } - $pageRestrictions = implode( "\n", $params['pagerestrictions'] ); + $pageRestrictions = implode( "\n", (array)$params['pagerestrictions'] ); } if ( $params['userid'] !== null ) { @@ -207,6 +193,8 @@ class ApiBlock extends ApiBase { $params['partial'] = false; $params['pagerestrictions'] = [ ApiBase::PARAM_ISMULTI => true, + ApiBase::PARAM_ISMULTI_LIMIT1 => 10, + ApiBase::PARAM_ISMULTI_LIMIT2 => 10, ]; } diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index 76b7bce67b..4ba30abfd4 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -22,6 +22,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionArchiveRecord; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRecord; @@ -30,11 +31,15 @@ class ApiComparePages extends ApiBase { /** @var RevisionStore */ private $revisionStore; + /** @var \MediaWiki\Revision\SlotRoleRegistry */ + private $slotRoleRegistry; + private $guessedTitle = false, $props; public function __construct( ApiMain $mainModule, $moduleName, $modulePrefix = '' ) { parent::__construct( $mainModule, $moduleName, $modulePrefix ); $this->revisionStore = MediaWikiServices::getInstance()->getRevisionStore(); + $this->slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); } public function execute() { @@ -61,19 +66,56 @@ class ApiComparePages extends ApiBase { if ( !$fromRelRev ) { $this->dieWithError( 'apierror-compare-relative-to-nothing' ); } + if ( $params['torelative'] !== 'cur' && $fromRelRev instanceof RevisionArchiveRecord ) { + // RevisionStore's getPreviousRevision/getNextRevision blow up + // when passed an RevisionArchiveRecord for a deleted page + $this->dieWithError( [ 'apierror-compare-relative-to-deleted', $params['torelative'] ] ); + } switch ( $params['torelative'] ) { case 'prev': // Swap 'from' and 'to' - list( $toRev, $toRelRev2, $toValsRev ) = [ $fromRev, $fromRelRev, $fromValsRev ]; - $fromRev = $this->revisionStore->getPreviousRevision( $fromRelRev ); + list( $toRev, $toRelRev, $toValsRev ) = [ $fromRev, $fromRelRev, $fromValsRev ]; + $fromRev = $this->revisionStore->getPreviousRevision( $toRelRev ); $fromRelRev = $fromRev; $fromValsRev = $fromRev; + if ( !$fromRev ) { + $title = Title::newFromLinkTarget( $toRelRev->getPageAsLinkTarget() ); + $this->addWarning( [ + 'apiwarn-compare-no-prev', + wfEscapeWikiText( $title->getPrefixedText() ), + $toRelRev->getId() + ] ); + + // (T203433) Create an empty dummy revision as the "previous". + // The main slot has to exist, the rest will be handled by DifferenceEngine. + $fromRev = $this->revisionStore->newMutableRevisionFromArray( [ + 'title' => $title ?: Title::makeTitle( NS_SPECIAL, 'Badtitle/' . __METHOD__ ) + ] ); + $fromRev->setContent( + SlotRecord::MAIN, + $toRelRev->getContent( SlotRecord::MAIN, RevisionRecord::RAW ) + ->getContentHandler() + ->makeEmptyContent() + ); + } break; case 'next': $toRev = $this->revisionStore->getNextRevision( $fromRelRev ); $toRelRev = $toRev; $toValsRev = $toRev; + if ( !$toRev ) { + $title = Title::newFromLinkTarget( $fromRelRev->getPageAsLinkTarget() ); + $this->addWarning( [ + 'apiwarn-compare-no-next', + wfEscapeWikiText( $title->getPrefixedText() ), + $fromRelRev->getId() + ] ); + + // (T203433) The web UI treats "next" as "cur" in this case. + // Avoid repeating metadata by making a MutableRevisionRecord with no changes. + $toRev = MutableRevisionRecord::newFromParentRevision( $fromRelRev ); + } break; case 'cur': @@ -93,10 +135,12 @@ class ApiComparePages extends ApiBase { list( $toRev, $toRelRev, $toValsRev ) = $this->getDiffRevision( 'to', $params ); } - // Handle missing from or to revisions + // Handle missing from or to revisions (should never happen) + // @codeCoverageIgnoreStart if ( !$fromRev || !$toRev ) { $this->dieWithError( 'apierror-baddiff' ); } + // @codeCoverageIgnoreEnd // Handle revdel if ( !$fromRev->audienceCan( @@ -272,9 +316,8 @@ class ApiComparePages extends ApiBase { } $guessedTitle = $this->guessTitle(); - if ( $guessedTitle && $role === SlotRecord::MAIN ) { - // @todo: Use SlotRoleRegistry and do this for all slots - return $guessedTitle->getContentModel(); + if ( $guessedTitle ) { + return $this->slotRoleRegistry->getRoleHandler( $role )->getDefaultModel( $guessedTitle ); } if ( isset( $params["fromcontentmodel-$role"] ) ) { @@ -582,10 +625,7 @@ class ApiComparePages extends ApiBase { } public function getAllowedParams() { - $slotRoles = MediaWikiServices::getInstance()->getSlotRoleStore()->getMap(); - if ( !in_array( SlotRecord::MAIN, $slotRoles, true ) ) { - $slotRoles[] = SlotRecord::MAIN; - } + $slotRoles = $this->slotRoleRegistry->getKnownRoles(); sort( $slotRoles, SORT_STRING ); // Parameters for the 'from' and 'to' content diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index ec857b7da9..7e8041d667 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -75,9 +75,10 @@ class ApiDelete extends ApiBase { $status = self::delete( $pageObj, $user, $reason, $params['tags'] ); } - if ( !$status->isGood() ) { + if ( !$status->isOk() ) { $this->dieStatus( $status ); } + $this->addMessagesFromStatus( $status, [ 'warning' ], [ 'delete-scheduled' ] ); // Deprecated parameters if ( $params['watch'] ) { @@ -92,8 +93,14 @@ class ApiDelete extends ApiBase { $r = [ 'title' => $titleObj->getPrefixedText(), 'reason' => $reason, - 'logid' => $status->value ]; + if ( $status->hasMessage( 'delete-scheduled' ) ) { + $r['scheduled'] = true; + } + if ( $status->value !== null ) { + // Scheduled deletions don't currently have a log entry available at this point + $r['logid'] = $status->value; + } $this->getResult()->addValue( null, $this->getModuleName(), $r ); } diff --git a/includes/api/ApiErrorFormatter.php b/includes/api/ApiErrorFormatter.php index 847afd8634..9669464733 100644 --- a/includes/api/ApiErrorFormatter.php +++ b/includes/api/ApiErrorFormatter.php @@ -58,6 +58,26 @@ class ApiErrorFormatter { $this->format = $format; } + /** + * Test whether a code is a valid API error code + * + * A valid code contains only ASCII letters, numbers, underscore, and + * hyphen and is not the empty string. + * + * For backwards compatibility, any code beginning 'internal_api_error_' is + * also allowed. + * + * @param string $code + * @return bool + */ + public static function isValidApiCode( $code ) { + return is_string( $code ) && ( + preg_match( '/^[a-zA-Z0-9_-]+$/', $code ) || + // TODO: Deprecate this + preg_match( '/^internal_api_error_[^\0\r\n]+$/', $code ) + ); + } + /** * Return a formatter like this one but with a different format * @@ -133,9 +153,10 @@ class ApiErrorFormatter { * @param string|null $modulePath * @param StatusValue $status * @param string[]|string $types 'warning' and/or 'error' + * @param string[] $filter Messages to filter out (since 1.33) */ public function addMessagesFromStatus( - $modulePath, StatusValue $status, $types = [ 'warning', 'error' ] + $modulePath, StatusValue $status, $types = [ 'warning', 'error' ], array $filter = [] ) { if ( $status->isGood() || !$status->getErrors() ) { return; @@ -158,7 +179,9 @@ class ApiErrorFormatter { ->inLanguage( $this->lang ) ->title( $this->getDummyTitle() ) ->useDatabase( $this->useDB ); - $this->addWarningOrError( $tag, $modulePath, $msg ); + if ( !in_array( $msg->getKey(), $filter, true ) ) { + $this->addWarningOrError( $tag, $modulePath, $msg ); + } } } @@ -191,6 +214,7 @@ class ApiErrorFormatter { if ( !isset( $options['code'] ) ) { $class = preg_replace( '#^Wikimedia\\\Rdbms\\\#', '', get_class( $exception ) ); $options['code'] = 'internal_api_error_' . $class; + $options['data']['errorclass'] = get_class( $exception ); } } $params = [ wfEscapeWikiText( $exception->getMessage() ) ]; diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php index 5bf8da9ff8..9edf929f8e 100644 --- a/includes/api/ApiFeedContributions.php +++ b/includes/api/ApiFeedContributions.php @@ -172,33 +172,29 @@ class ApiFeedContributions extends ApiBase { * @return string */ protected function feedItemDesc( RevisionRecord $revision ) { - if ( $revision ) { - $msg = wfMessage( 'colon-separator' )->inContentLanguage()->text(); - try { - $content = $revision->getContent( SlotRecord::MAIN ); - } catch ( RevisionAccessException $e ) { - $content = null; - } - - if ( $content instanceof TextContent ) { - // only textual content has a "source view". - $html = nl2br( htmlspecialchars( $content->getNativeData() ) ); - } else { - // XXX: we could get an HTML representation of the content via getParserOutput, but that may - // contain JS magic and generally may not be suitable for inclusion in a feed. - // Perhaps Content should have a getDescriptiveHtml method and/or a getSourceText method. - // Compare also FeedUtils::formatDiffRow. - $html = ''; - } - - $comment = $revision->getComment(); + $msg = wfMessage( 'colon-separator' )->inContentLanguage()->text(); + try { + $content = $revision->getContent( SlotRecord::MAIN ); + } catch ( RevisionAccessException $e ) { + $content = null; + } - return '

' . htmlspecialchars( $this->feedItemAuthor( $revision ) ) . $msg . - htmlspecialchars( FeedItem::stripComment( $comment ? $comment->text : '' ) ) . - "

" . $html . '

'; + if ( $content instanceof TextContent ) { + // only textual content has a "source view". + $html = nl2br( htmlspecialchars( $content->getNativeData() ) ); + } else { + // XXX: we could get an HTML representation of the content via getParserOutput, but that may + // contain JS magic and generally may not be suitable for inclusion in a feed. + // Perhaps Content should have a getDescriptiveHtml method and/or a getSourceText method. + // Compare also FeedUtils::formatDiffRow. + $html = ''; } - return ''; + $comment = $revision->getComment(); + + return '

' . htmlspecialchars( $this->feedItemAuthor( $revision ) ) . $msg . + htmlspecialchars( FeedItem::stripComment( $comment ? $comment->text : '' ) ) . + "

" . $html . '

'; } public function getAllowedParams() { diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index 37ec3cfd32..8c0b42df21 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -69,7 +69,7 @@ class ApiFeedWatchlist extends ApiBase { 'meta' => 'siteinfo', 'siprop' => 'general', 'list' => 'watchlist', - 'wlprop' => 'title|user|comment|timestamp|ids', + 'wlprop' => 'title|user|comment|timestamp|ids|loginfo', 'wldir' => 'older', // reverse order - from newest to oldest 'wlend' => $endTime, // stop at this time 'wllimit' => min( 50, $this->getConfig()->get( 'FeedLimit' ) ) @@ -193,7 +193,12 @@ class ApiFeedWatchlist extends ApiBase { } } if ( isset( $info['revid'] ) ) { - $titleUrl = $title->getFullURL( [ 'diff' => $info['revid'] ] ); + if ( $info['revid'] === 0 && isset( $info['logid'] ) ) { + $logTitle = Title::makeTitle( NS_SPECIAL, 'Log' ); + $titleUrl = $logTitle->getFullURL( [ 'logid' => $info['logid'] ] ); + } else { + $titleUrl = $title->getFullURL( [ 'diff' => $info['revid'] ] ); + } } else { $titleUrl = $title->getFullURL( $curidParam ); } diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index 9dcde8f32b..8cb22dd1ba 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -88,6 +88,13 @@ class ApiFormatJson extends ApiFormatBase { } $data = $this->getResult()->getResultData( null, $transform ); $json = FormatJson::encode( $data, $this->getIsHtml(), $opt ); + if ( $json === false ) { + // This should never happen, but it's a bug which could crop up + // if you use ApiResult::NO_VALIDATE for instance. + // @codeCoverageIgnoreStart + $this->dieDebug( __METHOD__, 'Unable to encode API result as JSON' ); + // @codeCoverageIgnoreEnd + } // T68776: OutputHandler::mangleFlashPolicy() avoids a nasty bug in // Flash, but what it does isn't friendly for the API, so we need to diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index 84fcbeff7b..886dbcc059 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -102,7 +102,6 @@ class ApiHelp extends ApiBase { 'mediawiki.apihelp', ] ); if ( !empty( $options['toc'] ) ) { - $out->addModules( 'mediawiki.toc' ); $out->addModuleStyles( 'mediawiki.toc.styles' ); } $out->setPageTitle( $context->msg( 'api-help-title' ) ); diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index d2a7db2bea..3cc34070e2 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -829,12 +829,17 @@ class ApiMain extends ApiBase { 'dnt', 'origin', /* MediaWiki whitelist */ + 'user-agent', 'api-user-agent', ] ); foreach ( $requestedHeaders as $rHeader ) { $rHeader = strtolower( trim( $rHeader ) ); if ( !isset( $allowedAuthorHeaders[$rHeader] ) ) { - wfDebugLog( 'api', 'CORS preflight failed on requested header: ' . $rHeader ); + LoggerFactory::getInstance( 'api-warning' )->warning( + 'CORS preflight failed on requested header: {header}', [ + 'header' => $rHeader + ] + ); return false; } } @@ -1025,8 +1030,10 @@ class ApiMain extends ApiBase { } else { // Something is seriously wrong $config = $this->getConfig(); + // TODO: Avoid embedding arbitrary class names in the error code. $class = preg_replace( '#^Wikimedia\\\Rdbms\\\#', '', get_class( $e ) ); $code = 'internal_api_error_' . $class; + $data = [ 'errorclass' => get_class( $e ) ]; if ( $config->get( 'ShowExceptionDetails' ) ) { if ( $e instanceof ILocalizedException ) { $msg = $e->getMessageObject(); @@ -1040,7 +1047,7 @@ class ApiMain extends ApiBase { $params = [ 'apierror-exceptioncaughttype', WebRequest::getRequestId(), get_class( $e ) ]; } - $messages[] = ApiMessage::create( $params, $code ); + $messages[] = ApiMessage::create( $params, $code, $data ); } return $messages; } @@ -1077,7 +1084,15 @@ class ApiMain extends ApiBase { // Add errors from the exception $modulePath = $e instanceof ApiUsageException ? $e->getModulePath() : null; foreach ( $this->errorMessagesFromException( $e, 'error' ) as $msg ) { - $errorCodes[$msg->getApiCode()] = true; + if ( ApiErrorFormatter::isValidApiCode( $msg->getApiCode() ) ) { + $errorCodes[$msg->getApiCode()] = true; + } else { + LoggerFactory::getInstance( 'api-warning' )->error( 'Invalid API error code "{code}"', [ + 'code' => $msg->getApiCode(), + 'exception' => $e, + ] ); + $errorCodes[''] = true; + } $formatter->addError( $modulePath, $msg ); } foreach ( $this->errorMessagesFromException( $e, 'warning' ) as $msg ) { @@ -1464,9 +1479,14 @@ class ApiMain extends ApiBase { if ( $numLagged >= ceil( $replicaCount / 2 ) ) { $laggedServers = implode( ', ', $laggedServers ); wfDebugLog( - 'api-readonly', + 'api-readonly', // Deprecate this channel in favor of api-warning? "Api request failed as read only because the following DBs are lagged: $laggedServers" ); + LoggerFactory::getInstance( 'api-warning' )->warning( + "Api request failed as read only because the following DBs are lagged: {laggeddbs}", [ + 'laggeddbs' => $laggedServers, + ] + ); $this->dieWithError( 'readonly_lag', @@ -1512,7 +1532,13 @@ class ApiMain extends ApiBase { * @param array $params An array with the request parameters */ protected function setupExternalResponse( $module, $params ) { + $validMethods = [ 'GET', 'HEAD', 'POST', 'OPTIONS' ]; $request = $this->getRequest(); + + if ( !in_array( $request->getMethod(), $validMethods ) ) { + $this->dieWithError( 'apierror-invalidmethod', null, null, 405 ); + } + if ( !$request->wasPosted() && $module->mustBePosted() ) { // Module requires POST. GET request might still be allowed // if $wgDebugApi is true, otherwise fail. diff --git a/includes/api/ApiMessageTrait.php b/includes/api/ApiMessageTrait.php index 18b6bc42c1..6894d2809f 100644 --- a/includes/api/ApiMessageTrait.php +++ b/includes/api/ApiMessageTrait.php @@ -105,12 +105,15 @@ trait ApiMessageTrait { } else { $this->apiCode = $key; } + + // Ensure the code is actually valid + $this->apiCode = preg_replace( '/[^a-zA-Z0-9_-]/', '_', $this->apiCode ); } return $this->apiCode; } public function setApiCode( $code, array $data = null ) { - if ( $code !== null && !( is_string( $code ) && $code !== '' ) ) { + if ( $code !== null && !ApiErrorFormatter::isValidApiCode( $code ) ) { throw new InvalidArgumentException( "Invalid code \"$code\"" ); } diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index 194a511061..4ffe873ccf 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -819,8 +819,9 @@ class ApiPageSet extends ApiBase { /** * Does the same as initFromTitles(), but is based on page IDs instead * @param array $pageids Array of page IDs + * @param bool $filterIds Whether the IDs need filtering */ - private function initFromPageIds( $pageids ) { + private function initFromPageIds( $pageids, $filterIds = true ) { if ( !$pageids ) { return; } @@ -828,7 +829,9 @@ class ApiPageSet extends ApiBase { $pageids = array_map( 'intval', $pageids ); // paranoia $remaining = array_flip( $pageids ); - $pageids = self::getPositiveIntegers( $pageids ); + if ( $filterIds ) { + $pageids = $this->filterIDs( [ [ 'page', 'page_id' ] ], $pageids ); + } $res = null; if ( !empty( $pageids ) ) { @@ -939,9 +942,10 @@ class ApiPageSet extends ApiBase { $pageids = []; $remaining = array_flip( $revids ); - $revids = self::getPositiveIntegers( $revids ); + $revids = $this->filterIDs( [ [ 'revision', 'rev_id' ], [ 'archive', 'ar_rev_id' ] ], $revids ); + $goodRemaining = array_flip( $revids ); - if ( !empty( $revids ) ) { + if ( $revids ) { $tables = [ 'revision', 'page' ]; $fields = [ 'rev_id', 'rev_page' ]; $where = [ 'rev_id' => $revids, 'rev_page = page_id' ]; @@ -955,22 +959,20 @@ class ApiPageSet extends ApiBase { $this->mLiveRevIDs[$revid] = $pageid; $pageids[$pageid] = ''; unset( $remaining[$revid] ); + unset( $goodRemaining[$revid] ); } } - $this->mMissingRevIDs = array_keys( $remaining ); - // Populate all the page information - $this->initFromPageIds( array_keys( $pageids ) ); + $this->initFromPageIds( array_keys( $pageids ), false ); // If the user can see deleted revisions, pull out the corresponding // titles from the archive table and include them too. We ignore // ar_page_id because deleted revisions are tied by title, not page_id. - if ( !empty( $this->mMissingRevIDs ) && $this->getUser()->isAllowed( 'deletedhistory' ) ) { - $remaining = array_flip( $this->mMissingRevIDs ); + if ( $goodRemaining && $this->getUser()->isAllowed( 'deletedhistory' ) ) { $tables = [ 'archive' ]; $fields = [ 'ar_rev_id', 'ar_namespace', 'ar_title' ]; - $where = [ 'ar_rev_id' => $this->mMissingRevIDs ]; + $where = [ 'ar_rev_id' => array_keys( $goodRemaining ) ]; $res = $db->select( $tables, $fields, $where, __METHOD__ ); $titles = []; @@ -1002,9 +1004,9 @@ class ApiPageSet extends ApiBase { $remaining[$revid] = true; } } - - $this->mMissingRevIDs = array_keys( $remaining ); } + + $this->mMissingRevIDs = array_keys( $remaining ); } /** @@ -1416,25 +1418,6 @@ class ApiPageSet extends ApiBase { return $this->mDbSource->getDB(); } - /** - * Returns the input array of integers with all values < 0 removed - * - * @param array $array - * @return array - */ - private static function getPositiveIntegers( $array ) { - // T27734 API: possible issue with revids validation - // It seems with a load of revision rows, MySQL gets upset - // Remove any < 0 integers, as they can't be valid - foreach ( $array as $i => $int ) { - if ( $int < 0 ) { - unset( $array[$i] ); - } - } - - return $array; - } - public function getAllowedParams( $flags = 0 ) { $result = [ 'titles' => [ diff --git a/includes/api/ApiQueryAllDeletedRevisions.php b/includes/api/ApiQueryAllDeletedRevisions.php index 7b4f15e517..7a1c461000 100644 --- a/includes/api/ApiQueryAllDeletedRevisions.php +++ b/includes/api/ApiQueryAllDeletedRevisions.php @@ -43,8 +43,6 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase { * @return void */ protected function run( ApiPageSet $resultPageSet = null ) { - global $wgChangeTagsSchemaMigrationStage; - // Before doing anything at all, let's check permissions $this->checkUserRightsAny( 'deletedhistory' ); @@ -127,11 +125,7 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase { } if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] ); } if ( !is_null( $params['tag'] ) ) { @@ -139,16 +133,12 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase { $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryAllRevisions.php b/includes/api/ApiQueryAllRevisions.php index 922d2c3e25..5343c33747 100644 --- a/includes/api/ApiQueryAllRevisions.php +++ b/includes/api/ApiQueryAllRevisions.php @@ -140,11 +140,7 @@ class ApiQueryAllRevisions extends ApiQueryRevisionsBase { $this->addTimestampWhereRange( $tsField, $dir, $params['start'], $params['end'] ); if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ 'rev_id=ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] ); } if ( $params['user'] !== null ) { diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php index 35cb83ace3..f4e7463e22 100644 --- a/includes/api/ApiQueryBacklinks.php +++ b/includes/api/ApiQueryBacklinks.php @@ -418,7 +418,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase { if ( is_null( $resultPageSet ) ) { // Try to add the result data in one go and pray that it fits $code = $this->bl_code; - $data = array_map( function ( $arr ) use ( $result, $code ) { + $data = array_map( function ( $arr ) use ( $code ) { if ( isset( $arr['redirlinks'] ) ) { $arr['redirlinks'] = array_values( $arr['redirlinks'] ); ApiResult::setIndexedTagName( $arr['redirlinks'], $code ); diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php index 8630561b2e..d9fe50b8d6 100644 --- a/includes/api/ApiQueryBase.php +++ b/includes/api/ApiQueryBase.php @@ -263,6 +263,30 @@ abstract class ApiQueryBase extends ApiBase { } } + /** + * Like addWhereFld for an integer list of IDs + * @since 1.33 + * @param string $table Table name + * @param string $field Field name + * @param int[] $ids IDs + * @return int Count of IDs actually included + */ + protected function addWhereIDsFld( $table, $field, $ids ) { + // Use count() to its full documented capabilities to simultaneously + // test for null, empty array or empty countable object + if ( count( $ids ) ) { + $ids = $this->filterIDs( [ [ $table, $field ] ], $ids ); + + if ( !count( $ids ) ) { + // Return nothing, no IDs are valid + $this->where[] = '0 = 1'; + } else { + $this->where[$field] = $ids; + } + } + return count( $ids ); + } + /** * Add a WHERE clause corresponding to a range, and an ORDER BY * clause to sort in the right direction @@ -402,13 +426,15 @@ abstract class ApiQueryBase extends ApiBase { } /** + * @deprecated since 1.33, use LinkFilter::getQueryConditions() instead * @param string|null $query * @param string|null $protocol * @return null|string */ public function prepareUrlQuerySearchString( $query = null, $protocol = null ) { + wfDeprecated( __METHOD__, '1.33' ); $db = $this->getDB(); - if ( !is_null( $query ) || $query != '' ) { + if ( $query !== null && $query !== '' ) { if ( is_null( $protocol ) ) { $protocol = 'http://'; } @@ -438,32 +464,31 @@ abstract class ApiQueryBase extends ApiBase { public function showHiddenUsersAddBlockInfo( $showBlockInfo ) { $db = $this->getDB(); - $this->addTables( 'ipblocks' ); - $this->addJoinConds( [ - 'ipblocks' => [ 'LEFT JOIN', [ + $tables = [ 'ipblocks' ]; + $fields = [ 'ipb_deleted' ]; + $joinConds = [ + 'blk' => [ 'LEFT JOIN', [ 'ipb_user=user_id', 'ipb_expiry > ' . $db->addQuotes( $db->timestamp() ), ] ], - ] ); - - $this->addFields( 'ipb_deleted' ); + ]; if ( $showBlockInfo ) { - $this->addFields( [ + $actorQuery = ActorMigration::newMigration()->getJoin( 'ipb_by' ); + $commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' ); + $tables += $actorQuery['tables'] + $commentQuery['tables']; + $joinConds += $actorQuery['joins'] + $commentQuery['joins']; + $fields = array_merge( $fields, [ 'ipb_id', 'ipb_expiry', 'ipb_timestamp' - ] ); - $actorQuery = ActorMigration::newMigration()->getJoin( 'ipb_by' ); - $this->addTables( $actorQuery['tables'] ); - $this->addFields( $actorQuery['fields'] ); - $this->addJoinConds( $actorQuery['joins'] ); - $commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' ); - $this->addTables( $commentQuery['tables'] ); - $this->addFields( $commentQuery['fields'] ); - $this->addJoinConds( $commentQuery['joins'] ); + ], $actorQuery['fields'], $commentQuery['fields'] ); } + $this->addTables( [ 'blk' => $tables ] ); + $this->addFields( $fields ); + $this->addJoinConds( $joinConds ); + // Don't show hidden names if ( !$this->getUser()->isAllowed( 'hideuser' ) ) { $this->addWhere( 'ipb_deleted = 0 OR ipb_deleted IS NULL' ); diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index 3cd2aceceb..95f8cda818 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -103,7 +103,7 @@ class ApiQueryBlocks extends ApiQueryBase { } if ( isset( $params['ids'] ) ) { - $this->addWhereFld( 'ipb_id', $params['ids'] ); + $this->addWhereIDsFld( 'ipblocks', 'ipb_id', $params['ids'] ); } if ( isset( $params['users'] ) ) { $usernames = []; @@ -187,7 +187,7 @@ class ApiQueryBlocks extends ApiQueryBase { $restrictions = []; if ( $fld_restrictions ) { - $restrictions = $this->getRestrictionData( $res, $params['limit'] ); + $restrictions = self::getRestrictionData( $res, $params['limit'] ); } $count = 0; diff --git a/includes/api/ApiQueryDeletedRevisions.php b/includes/api/ApiQueryDeletedRevisions.php index 8f71c1c4d7..9275a7c727 100644 --- a/includes/api/ApiQueryDeletedRevisions.php +++ b/includes/api/ApiQueryDeletedRevisions.php @@ -39,8 +39,6 @@ class ApiQueryDeletedRevisions extends ApiQueryRevisionsBase { } protected function run( ApiPageSet $resultPageSet = null ) { - global $wgChangeTagsSchemaMigrationStage; - $user = $this->getUser(); // Before doing anything at all, let's check permissions $this->checkUserRightsAny( 'deletedhistory' ); @@ -79,11 +77,7 @@ class ApiQueryDeletedRevisions extends ApiQueryRevisionsBase { } if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] ); } if ( !is_null( $params['tag'] ) ) { @@ -91,16 +85,12 @@ class ApiQueryDeletedRevisions extends ApiQueryRevisionsBase { $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php index e84b9b2247..8540190f1e 100644 --- a/includes/api/ApiQueryDeletedrevs.php +++ b/includes/api/ApiQueryDeletedrevs.php @@ -36,8 +36,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase { } public function execute() { - global $wgChangeTagsSchemaMigrationStage; - // Before doing anything at all, let's check permissions $this->checkUserRightsAny( 'deletedhistory' ); @@ -133,11 +131,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase { } if ( $fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] ); } if ( !is_null( $params['tag'] ) ) { @@ -145,16 +139,12 @@ class ApiQueryDeletedrevs extends ApiQueryBase { $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php index fc5d8a0425..d508c55fec 100644 --- a/includes/api/ApiQueryExtLinksUsage.php +++ b/includes/api/ApiQueryExtLinksUsage.php @@ -47,12 +47,12 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { */ private function run( $resultPageSet = null ) { $params = $this->extractRequestParams(); + $db = $this->getDB(); $query = $params['query']; $protocol = self::getProtocolPrefix( $params['protocol'] ); - $this->addTables( [ 'page', 'externallinks' ] ); // must be in this order for 'USE INDEX' - $this->addOption( 'USE INDEX', 'el_index' ); + $this->addTables( [ 'page', 'externallinks' ] ); $this->addWhere( 'page_id=el_from' ); $miser_ns = []; @@ -62,15 +62,46 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { $this->addWhereFld( 'page_namespace', $params['namespace'] ); } - // Normalize query to match the normalization applied for the externallinks table - $query = Parser::normalizeLinkUrl( $query ); + $orderBy = []; - $whereQuery = $this->prepareUrlQuerySearchString( $query, $protocol ); + if ( $query !== null && $query !== '' ) { + if ( $protocol === null ) { + $protocol = 'http://'; + } + + // Normalize query to match the normalization applied for the externallinks table + $query = Parser::normalizeLinkUrl( $protocol . $query ); + + $conds = LinkFilter::getQueryConditions( $query, [ + 'protocol' => '', + 'oneWildcard' => true, + 'db' => $db + ] ); + if ( !$conds ) { + $this->dieWithError( 'apierror-badquery' ); + } + $this->addWhere( $conds ); + if ( !isset( $conds['el_index_60'] ) ) { + $orderBy[] = 'el_index_60'; + } + } else { + $orderBy[] = 'el_index_60'; - if ( $whereQuery !== null ) { - $this->addWhere( $whereQuery ); + if ( $protocol !== null ) { + $this->addWhere( 'el_index_60' . $db->buildLike( "$protocol", $db->anyString() ) ); + } else { + // We're querying all protocols, filter out duplicate protocol-relative links + $this->addWhere( $db->makeList( [ + 'el_to NOT' . $db->buildLike( '//', $db->anyString() ), + 'el_index_60 ' . $db->buildLike( 'http://', $db->anyString() ), + ], LIST_OR ) ); + } } + $orderBy[] = 'el_id'; + $this->addOption( 'ORDER BY', $orderBy ); + $this->addFields( $orderBy ); // Make sure + $prop = array_flip( $params['prop'] ); $fld_ids = isset( $prop['ids'] ); $fld_title = isset( $prop['title'] ); @@ -88,10 +119,19 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { } $limit = $params['limit']; - $offset = $params['offset']; $this->addOption( 'LIMIT', $limit + 1 ); - if ( isset( $offset ) ) { - $this->addOption( 'OFFSET', $offset ); + + if ( $params['continue'] !== null ) { + $cont = explode( '|', $params['continue'] ); + $this->dieContinueUsageIf( count( $cont ) !== count( $orderBy ) ); + $i = count( $cont ) - 1; + $cond = $orderBy[$i] . ' >= ' . $db->addQuotes( rawurldecode( $cont[$i] ) ); + while ( $i-- > 0 ) { + $field = $orderBy[$i]; + $v = $db->addQuotes( rawurldecode( $cont[$i] ) ); + $cond = "($field > $v OR ($field = $v AND $cond))"; + } + $this->addWhere( $cond ); } $res = $this->select( __METHOD__ ); @@ -102,7 +142,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { if ( ++$count > $limit ) { // We've reached the one extra which shows that there are // additional pages to be had. Stop here... - $this->setContinueEnumParameter( 'offset', $offset + $limit ); + $this->setContinue( $orderBy, $row ); break; } @@ -131,7 +171,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { } $fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $vals ); if ( !$fit ) { - $this->setContinueEnumParameter( 'offset', $offset + $count - 1 ); + $this->setContinue( $orderBy, $row ); break; } } else { @@ -145,6 +185,14 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { } } + private function setContinue( $orderBy, $row ) { + $fields = []; + foreach ( $orderBy as $field ) { + $fields[] = strtr( $row->$field, [ '%' => '%25', '|' => '%7C' ] ); + } + $this->setContinueEnumParameter( 'continue', implode( '|', $fields ) ); + } + public function getAllowedParams() { $ret = [ 'prop' => [ @@ -157,8 +205,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { ], ApiBase::PARAM_HELP_MSG_PER_VALUE => [], ], - 'offset' => [ - ApiBase::PARAM_TYPE => 'integer', + 'continue' => [ ApiBase::PARAM_HELP_MSG => 'api-help-param-continue', ], 'protocol' => [ diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php index 6c219d4a91..b5731a33f6 100644 --- a/includes/api/ApiQueryExternalLinks.php +++ b/includes/api/ApiQueryExternalLinks.php @@ -37,6 +37,7 @@ class ApiQueryExternalLinks extends ApiQueryBase { } $params = $this->extractRequestParams(); + $db = $this->getDB(); $query = $params['query']; $protocol = ApiQueryExtLinksUsage::getProtocolPrefix( $params['protocol'] ); @@ -49,26 +50,64 @@ class ApiQueryExternalLinks extends ApiQueryBase { $this->addTables( 'externallinks' ); $this->addWhereFld( 'el_from', array_keys( $this->getPageSet()->getGoodTitles() ) ); - $whereQuery = $this->prepareUrlQuerySearchString( $query, $protocol ); - - if ( $whereQuery !== null ) { - $this->addWhere( $whereQuery ); - } + $orderBy = []; // Don't order by el_from if it's constant in the WHERE clause if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) { - $this->addOption( 'ORDER BY', 'el_from' ); + $orderBy[] = 'el_from'; } - // If we're querying all protocols, use DISTINCT to avoid repeating protocol-relative links twice - if ( $protocol === null ) { - $this->addOption( 'DISTINCT' ); + if ( $query !== null && $query !== '' ) { + if ( $protocol === null ) { + $protocol = 'http://'; + } + + // Normalize query to match the normalization applied for the externallinks table + $query = Parser::normalizeLinkUrl( $protocol . $query ); + + $conds = LinkFilter::getQueryConditions( $query, [ + 'protocol' => '', + 'oneWildcard' => true, + 'db' => $db + ] ); + if ( !$conds ) { + $this->dieWithError( 'apierror-badquery' ); + } + $this->addWhere( $conds ); + if ( !isset( $conds['el_index_60'] ) ) { + $orderBy[] = 'el_index_60'; + } + } else { + $orderBy[] = 'el_index_60'; + + if ( $protocol !== null ) { + $this->addWhere( 'el_index_60' . $db->buildLike( "$protocol", $db->anyString() ) ); + } else { + // We're querying all protocols, filter out duplicate protocol-relative links + $this->addWhere( $db->makeList( [ + 'el_to NOT' . $db->buildLike( '//', $db->anyString() ), + 'el_index_60 ' . $db->buildLike( 'http://', $db->anyString() ), + ], LIST_OR ) ); + } } + $orderBy[] = 'el_id'; + $this->addOption( 'ORDER BY', $orderBy ); + $this->addFields( $orderBy ); // Make sure + $this->addOption( 'LIMIT', $params['limit'] + 1 ); - $offset = $params['offset'] ?? 0; - if ( $offset ) { - $this->addOption( 'OFFSET', $params['offset'] ); + + if ( $params['continue'] !== null ) { + $cont = explode( '|', $params['continue'] ); + $this->dieContinueUsageIf( count( $cont ) !== count( $orderBy ) ); + $i = count( $cont ) - 1; + $cond = $orderBy[$i] . ' >= ' . $db->addQuotes( rawurldecode( $cont[$i] ) ); + while ( $i-- > 0 ) { + $field = $orderBy[$i]; + $v = $db->addQuotes( rawurldecode( $cont[$i] ) ); + $cond = "($field > $v OR ($field = $v AND $cond))"; + } + $this->addWhere( $cond ); } $res = $this->select( __METHOD__ ); @@ -78,7 +117,7 @@ class ApiQueryExternalLinks extends ApiQueryBase { if ( ++$count > $params['limit'] ) { // We've reached the one extra which shows that // there are additional pages to be had. Stop here... - $this->setContinueEnumParameter( 'offset', $offset + $params['limit'] ); + $this->setContinue( $orderBy, $row ); break; } $entry = []; @@ -90,12 +129,20 @@ class ApiQueryExternalLinks extends ApiQueryBase { ApiResult::setContentValue( $entry, 'url', $to ); $fit = $this->addPageSubItem( $row->el_from, $entry ); if ( !$fit ) { - $this->setContinueEnumParameter( 'offset', $offset + $count - 1 ); + $this->setContinue( $orderBy, $row ); break; } } } + private function setContinue( $orderBy, $row ) { + $fields = []; + foreach ( $orderBy as $field ) { + $fields[] = strtr( $row->$field, [ '%' => '%25', '|' => '%7C' ] ); + } + $this->setContinueEnumParameter( 'continue', implode( '|', $fields ) ); + } + public function getCacheMode( $params ) { return 'public'; } @@ -109,8 +156,7 @@ class ApiQueryExternalLinks extends ApiQueryBase { ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1, ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2 ], - 'offset' => [ - ApiBase::PARAM_TYPE => 'integer', + 'continue' => [ ApiBase::PARAM_HELP_MSG => 'api-help-param-continue', ], 'protocol' => [ diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 3cb55e4169..edf7002280 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -42,8 +42,6 @@ class ApiQueryLogEvents extends ApiQueryBase { $fld_details = false, $fld_tags = false; public function execute() { - global $wgChangeTagsSchemaMigrationStage; - $params = $this->extractRequestParams(); $db = $this->getDB(); $this->commentStore = CommentStore::getStore(); @@ -109,25 +107,19 @@ class ApiQueryLogEvents extends ApiQueryBase { } if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( [ 'tag_summary' => [ 'LEFT JOIN', 'log_id=ts_log_id' ] ] ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'logging' ) ] ); } if ( !is_null( $params['tag'] ) ) { $this->addTables( 'change_tag' ); $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'log_id=ct_log_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index 8758d9c232..ea2066490e 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -20,24 +20,33 @@ * @file */ +use MediaWiki\MediaWikiServices; +use MediaWiki\Special\SpecialPageFactory; + /** * Query module to get the results of a QueryPage-based special page * * @ingroup API */ class ApiQueryQueryPage extends ApiQueryGeneratorBase { - private $qpMap; + + /** + * @var string[] list of special page names + */ + private $queryPages; + + /** + * @var SpecialPageFactory + */ + private $specialPageFactory; public function __construct( ApiQuery $query, $moduleName ) { parent::__construct( $query, $moduleName, 'qp' ); - // Build mapping from special page names to QueryPage classes - $uselessQueryPages = $this->getConfig()->get( 'APIUselessQueryPages' ); - $this->qpMap = []; - foreach ( QueryPage::getPages() as $page ) { - if ( !in_array( $page[1], $uselessQueryPages ) ) { - $this->qpMap[$page[1]] = $page[0]; - } - } + $this->queryPages = array_values( array_diff( + array_column( QueryPage::getPages(), 1 ), // [ class, name ] + $this->getConfig()->get( 'APIUselessQueryPages' ) + ) ); + $this->specialPageFactory = MediaWikiServices::getInstance()->getSpecialPageFactory(); } public function execute() { @@ -48,6 +57,27 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { $this->run( $resultPageSet ); } + /** + * @param string $name + * @return QueryPage + */ + private function getSpecialPage( $name ) { + $qp = $this->specialPageFactory->getPage( $name ); + if ( !$qp ) { + self::dieDebug( + __METHOD__, + 'SpecialPageFactory failed to create special page ' . $name + ); + } + if ( !( $qp instanceof QueryPage ) ) { + self::dieDebug( + __METHOD__, + 'Special page ' . $name . ' is not a QueryPage' + ); + } + return $qp; + } + /** * @param ApiPageSet|null $resultPageSet */ @@ -55,8 +85,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { $params = $this->extractRequestParams(); $result = $this->getResult(); - /** @var QueryPage $qp */ - $qp = new $this->qpMap[$params['page']](); + $qp = $this->getSpecialPage( $params['page'] ); if ( !$qp->userCanExecute( $this->getUser() ) ) { $this->dieWithError( 'apierror-specialpage-cantexecute' ); } @@ -125,8 +154,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { } public function getCacheMode( $params ) { - /** @var QueryPage $qp */ - $qp = new $this->qpMap[$params['page']](); + $qp = $this->getSpecialPage( $params['page'] ); if ( $qp->getRestriction() != '' ) { return 'private'; } @@ -137,7 +165,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { public function getAllowedParams() { return [ 'page' => [ - ApiBase::PARAM_TYPE => array_keys( $this->qpMap ), + ApiBase::PARAM_TYPE => $this->queryPages, ApiBase::PARAM_REQUIRED => true ], 'offset' => [ diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index b1dcf0dba1..7c6b4634e5 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -143,8 +143,6 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { * @param ApiPageSet|null $resultPageSet */ public function run( $resultPageSet = null ) { - global $wgChangeTagsSchemaMigrationStage; - $user = $this->getUser(); /* Get the parameters of the request. */ $params = $this->extractRequestParams(); @@ -339,9 +337,7 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { $resultPageSet && $params['generaterevisions'] ); if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( [ 'tag_summary' => [ 'LEFT JOIN', [ 'rc_id=ts_rc_id' ] ] ] ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'recentchanges' ) ] ); } if ( $this->fld_sha1 ) { @@ -365,16 +361,12 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { if ( !is_null( $params['tag'] ) ) { $this->addTables( 'change_tag' ); $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'rc_id=ct_rc_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index ac7ee0ae9f..cb2f6168ae 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -84,7 +84,7 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { } protected function run( ApiPageSet $resultPageSet = null ) { - global $wgActorTableSchemaMigrationStage, $wgChangeTagsSchemaMigrationStage; + global $wgActorTableSchemaMigrationStage; $params = $this->extractRequestParams( false ); $revisionStore = MediaWikiServices::getInstance()->getRevisionStore(); @@ -185,11 +185,7 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { } if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ 'rev_id=ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] ); } if ( $params['tag'] !== null ) { @@ -197,16 +193,12 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'rev_id=ct_rev_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index c00010a131..3d0a0fba62 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -616,10 +616,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase { } public function getAllowedParams() { - $slotRoles = MediaWikiServices::getInstance()->getSlotRoleStore()->getMap(); - if ( !in_array( SlotRecord::MAIN, $slotRoles, true ) ) { - $slotRoles[] = SlotRecord::MAIN; - } + $slotRoles = MediaWikiServices::getInstance()->getSlotRoleRegistry()->getKnownRoles(); sort( $slotRoles, SORT_STRING ); return [ diff --git a/includes/api/ApiQueryUserContribs.php b/includes/api/ApiQueryUserContribs.php index f16f958eb1..ed831306eb 100644 --- a/includes/api/ApiQueryUserContribs.php +++ b/includes/api/ApiQueryUserContribs.php @@ -321,7 +321,7 @@ class ApiQueryUserContribs extends ApiQueryBase { * @param int $limit */ private function prepareQuery( array $users, $limit ) { - global $wgActorTableSchemaMigrationStage, $wgChangeTagsSchemaMigrationStage; + global $wgActorTableSchemaMigrationStage; $this->resetQueryParams(); $db = $this->getDB(); @@ -478,11 +478,7 @@ class ApiQueryUserContribs extends ApiQueryBase { $this->addFieldsIf( 'rc_patrolled', $this->fld_patrolled ); if ( $this->fld_tags ) { - $this->addTables( 'tag_summary' ); - $this->addJoinConds( - [ 'tag_summary' => [ 'LEFT JOIN', [ $idField . ' = ts_rev_id' ] ] ] - ); - $this->addFields( 'ts_tags' ); + $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] ); } if ( isset( $this->params['tag'] ) ) { @@ -490,16 +486,12 @@ class ApiQueryUserContribs extends ApiQueryBase { $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ $idField . ' = ct_rev_id' ] ] ] ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - try { - $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $this->params['tag'] ) ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $this->addWhere( '1=0' ); - } - } else { - $this->addWhereFld( 'ct_tag', $this->params['tag'] ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + try { + $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $this->params['tag'] ) ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $this->addWhere( '1=0' ); } } } diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php index db57f7e034..18aa6daa66 100644 --- a/includes/api/ApiRollback.php +++ b/includes/api/ApiRollback.php @@ -56,9 +56,13 @@ class ApiRollback extends ApiBase { } // @TODO: remove this hack once rollback uses POST (T88044) + $fname = __METHOD__; $trxLimits = $this->getConfig()->get( 'TrxProfilerLimits' ); $trxProfiler = Profiler::instance()->getTransactionProfiler(); - $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ ); + $trxProfiler->redefineExpectations( $trxLimits['POST'], $fname ); + DeferredUpdates::addCallableUpdate( function () use ( $trxProfiler, $trxLimits, $fname ) { + $trxProfiler->redefineExpectations( $trxLimits['PostSend-POST'], $fname ); + } ); $retval = $pageObj->doRollback( $this->getRbUser( $params ), diff --git a/includes/api/i18n/ar.json b/includes/api/i18n/ar.json index c75238c40a..518a4fa685 100644 --- a/includes/api/i18n/ar.json +++ b/includes/api/i18n/ar.json @@ -1461,11 +1461,11 @@ "apihelp-json-param-callback": "Ø¥Ø°Ø§ ØªÙ ØªØØ¯ÙØ¯ÙØ ÙØ³ÙÙÙÙ Ø¨Ø¥Ø®Ø±Ø§Ø¬ Ø§ÙØ¥Ø®Ø±Ø§Ø¬ ÙÙ Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ Ø¯Ø§ÙØ© ÙØ¹ÙÙØ©Ø ÙÙØ³ÙØ§ÙØ©; Ø³ÙØªÙ ØªÙÙÙØ¯ Ø¬ÙÙØ¹ Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙØ®Ø§ØµØ© Ø¨Ø§ÙÙØ³ØªØ®Ø¯Ù.", "apihelp-json-param-utf8": "Ø¥Ø°Ø§ ØªÙ ØªØØ¯ÙØ¯ÙØ ÙÙÙÙ Ø¨ØªØ±ÙÙØ² ÙØ¹Ø¸Ù (ÙÙÙØ³ ÙÙ) Ø§ÙØ£ØØ±Ù ØºÙØ± ASCII ÙÙUTF-8 Ø¨Ø¯ÙØ§ ÙÙ Ø§Ø³ØªØ¨Ø¯Ø§ÙÙØ§ Ø¨ØªØ³ÙØ³ÙØ§Øª Ø§ÙÙØ±ÙØ¨ Ø§ÙØ³Ø¯Ø§Ø³ÙØ© Ø§ÙØ¹Ø´Ø±ÙØ©Ø Ø§ÙØªØ±Ø§Ø¶Ù Ø¹ÙØ¯ÙØ§ ÙØ§ ÙÙÙÙ formatversion 1.", "apihelp-json-param-ascii": "Ø¥Ø°Ø§ ØªÙ ØªØØ¯ÙØ¯ÙØ ÙØ´ÙØ± ÙÙ ØºÙØ± ASCII Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù ØªØ³ÙØ³ÙØ§Øª Ø§ÙÙØ±ÙØ¨ Ø§ÙØ³Ø¯Ø§Ø³ÙØ© Ø§ÙØ¹Ø´Ø±ÙØ©Ø Ø§ÙØªØ±Ø§Ø¶Ù Ø¹ÙØ¯ÙØ§ ÙÙÙÙ formatversion 1.", - "apihelp-json-param-formatversion": "ØªÙØ³ÙÙ Ø§ÙØ¥Ø®Ø±Ø§Ø¬: \n;1:ØªÙØ³ÙÙ ÙØªÙØ§ÙÙ ÙØ¹ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØ³Ø§Ø¨ÙØ© (ÙØµÙÙÙØ§Øª ÙÙØ·ÙÙØ© Ø¨ØªÙØ³ÙÙ XMLØ ÙÙÙØ§ØªÙØ * ÙØ¹ÙØ¯ Ø§ÙÙØØªÙÙØ ÙÙØ§ Ø¥ÙÙ Ø°ÙÙ).\n;2:Ø§ÙØªÙØ³ÙÙ Ø§ÙØØ¯ÙØ« Ø§ÙØªØ¬Ø±ÙØ¨ÙØ Ø§ÙØªÙØ§ØµÙÙ ÙØ¯ ØªØªØºÙØ±!\n;Ø§ÙØ£ØØ¯Ø«: Ø§Ø³ØªØ®Ø¯Ù Ø£ØØ¯Ø« ØªÙØ³ÙÙ (ØØ§ÙÙØ§ 2)Ø ÙØ¯ ÙØªØºÙØ± Ø¯ÙÙ Ø³Ø§Ø¨Ù Ø¥ÙØ°Ø§Ø±.", + "apihelp-json-param-formatversion": "ØªÙØ³ÙÙ Ø§ÙØ¥Ø®Ø±Ø§Ø¬: \n;1:ØªÙØ³ÙÙ ÙØªÙØ§ÙÙ ÙØ¹ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØ³Ø§Ø¨ÙØ© (ÙØµÙÙÙØ§Øª ÙÙØ·ÙÙØ© Ø¨ØªÙØ³ÙÙ XMLØ ÙÙÙØ§ØªÙØ * ÙØ¹ÙØ¯ Ø§ÙÙØØªÙÙØ ÙÙØ§ Ø¥ÙÙ Ø°ÙÙ).\n;2:Ø§ÙØªÙØ³ÙÙ Ø§ÙØØ¯ÙØ«.\n;Ø§ÙØ£ØØ¯Ø«: Ø§Ø³ØªØ®Ø¯Ù Ø£ØØ¯Ø« ØªÙØ³ÙÙ (ØØ§ÙÙØ§ 2)Ø ÙØ¯ ÙØªØºÙØ± Ø¯ÙÙ Ø³Ø§Ø¨Ù Ø¥ÙØ°Ø§Ø±.", "apihelp-jsonfm-summary": "Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¥Ø®Ø±Ø§Ø¬ Ø¨ØªÙØ³ÙÙ JSON (Ø§ÙØ·Ø¨Ø§Ø¹Ø© Ø¨ÙHTML).", "apihelp-none-summary": "Ø¹Ø¯Ù Ø¥Ø®Ø±Ø§Ø¬ Ø£Ù Ø´ÙØ¡.", "apihelp-php-summary": "Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¥Ø®Ø±Ø§Ø¬ Ø¨ØªÙØ³ÙÙ PHP Ø§ÙÙØªØ³ÙØ³Ù.", - "apihelp-php-param-formatversion": "ØªÙØ³ÙÙ Ø§ÙØ¥Ø®Ø±Ø§Ø¬: \n;1:ØªÙØ³ÙÙ ÙØªÙØ§ÙÙ ÙØ¹ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØ³Ø§Ø¨ÙØ© (ÙØµÙÙÙØ§Øª ÙÙØ·ÙÙØ© Ø¨ØªÙØ³ÙÙ XMLØ ÙÙÙØ§ØªÙØ * ÙØ¹ÙØ¯ Ø§ÙÙØØªÙÙØ ÙÙØ§ Ø¥ÙÙ Ø°ÙÙ).\n;2:Ø§ÙØªÙØ³ÙÙ Ø§ÙØØ¯ÙØ« Ø§ÙØªØ¬Ø±ÙØ¨ÙØ Ø§ÙØªÙØ§ØµÙÙ ÙØ¯ ØªØªØºÙØ±!\n;Ø§ÙØ£ØØ¯Ø«: Ø§Ø³ØªØ®Ø¯Ù Ø£ØØ¯Ø« ØªÙØ³ÙÙ (ØØ§ÙÙØ§ 2)Ø ÙØ¯ ÙØªØºÙØ± Ø¯ÙÙ Ø³Ø§Ø¨Ù Ø¥ÙØ°Ø§Ø±.", + "apihelp-php-param-formatversion": "ØªÙØ³ÙÙ Ø§ÙØ¥Ø®Ø±Ø§Ø¬: \n;1:ØªÙØ³ÙÙ ÙØªÙØ§ÙÙ ÙØ¹ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØ³Ø§Ø¨ÙØ© (ÙØµÙÙÙØ§Øª ÙÙØ·ÙÙØ© Ø¨ØªÙØ³ÙÙ XMLØ ÙÙÙØ§ØªÙØ * ÙØ¹ÙØ¯ Ø§ÙÙØØªÙÙØ ÙÙØ§ Ø¥ÙÙ Ø°ÙÙ).\n;2:Ø§ÙØªÙØ³ÙÙ Ø§ÙØØ¯ÙØ«.\n;Ø§ÙØ£ØØ¯Ø«: Ø§Ø³ØªØ®Ø¯Ù Ø£ØØ¯Ø« ØªÙØ³ÙÙ (ØØ§ÙÙØ§ 2)Ø ÙØ¯ ÙØªØºÙØ± Ø¯ÙÙ Ø³Ø§Ø¨Ù Ø¥ÙØ°Ø§Ø±.", "apihelp-phpfm-summary": "Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¥Ø®Ø±Ø§Ø¬ Ø¨ØªÙØ³ÙÙ JSON (Ø§ÙØ·Ø¨Ø§Ø¹Ø© Ø¨ÙHTML).", "apihelp-rawfm-summary": "Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¥Ø®Ø±Ø§Ø¬Ø Ø¨ÙØ§ ÙÙ Ø°ÙÙ Ø¹ÙØ§ØµØ± ØªØµØÙØ Ø§ÙØ£Ø®Ø·Ø§Ø¡Ø Ø¨ØªÙØ³ÙÙ JSON (Ø§ÙØ·Ø¨Ø§Ø¹Ø© Ø¨ÙHTML).", "apihelp-xml-summary": "Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¥Ø®Ø±Ø§Ø¬ Ø¨ØªÙØ³ÙÙ XML.", @@ -1611,6 +1611,7 @@ "apierror-compare-nofromrevision": "ÙÙØ³ 'ÙÙ' ÙØ±Ø§Ø¬Ø¹Ø©Ø ØØ¯Ø¯ fromrev Ø£Ù fromtitle Ø£Ù fromid.", "apierror-compare-notext": "ÙØ§ ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙÙØ³ÙØ· $1 Ø¨Ø¯ÙÙ $2.", "apierror-compare-notorevision": "ÙÙØ³ 'Ø¥ÙÙ' ÙØ±Ø§Ø¬Ø¹Ø©Ø ØØ¯Ø¯ torev Ø£Ù totitle Ø£Ù toid.", + "apierror-compare-relative-to-deleted": "ÙØ§ ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù torelative=$1 Ø¨Ø§ÙÙØ³Ø¨Ø© ÙÙØ±Ø§Ø¬Ø¹Ø© ÙØØ°ÙÙØ©.", "apierror-compare-relative-to-nothing": "ÙØ§ ØªÙØ¬Ø¯ ÙØ±Ø§Ø¬Ø¹Ø© 'ÙÙ' ÙÙtorelative ÙØªÙÙÙ ÙØ³Ø¨Ø©.", "apierror-contentserializationexception": "ÙØ´Ù ØªØ³ÙØ³Ù Ø§ÙÙØØªÙÙ: $1", "apierror-contenttoobig": "ÙØªØ¬Ø§ÙØ² Ø§ÙÙØØªÙÙ Ø§ÙØ°Ù Ø£Ø¯Ø®ÙØªÙ ØØ¯ ØØ¬Ù Ø§ÙÙÙØ§ÙØ© Ø§ÙØ¨Ø§ÙØº $1 {{PLURAL:$1|ÙÙÙÙØ¨Ø§ÙØª}}.", @@ -1639,6 +1640,7 @@ "apierror-invalidexpiry": "ÙÙØª Ø§ÙØªÙØ§Ø¡ Ø§ÙØµÙØ§ØÙØ© ØºÙØ± ØµØ§ÙØ \"$1\".", "apierror-invalid-file-key": "ÙÙØ³ ÙÙØªØ§Ø ÙÙÙ ØµØ§ÙØ.", "apierror-invalidlang": "Ø±ÙØ² ÙØºØ© ØºÙØ± ØµØ§ÙØ ÙÙÙØ³ÙØ· $1.", + "apierror-invalidmethod": "Ø·Ø±ÙÙØ© HTTP ØºÙØ± ØµØ§ÙØØ©; ÙÙØ± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù GET Ø£Ù POST.", "apierror-invalidoldimage": "ÙØØªÙÙ Ø§ÙÙØ³ÙØ· oldimage Ø¹ÙÙ ØªÙØ³ÙÙ ØºÙØ± ØµØ§ÙØ.", "apierror-invalidparammix-cannotusewith": "ÙØ§ ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙÙØ³ÙØ· $1 ÙØ¹ $2.", "apierror-invalidparammix-mustusewith": "ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙÙØ³ÙØ· $1 ÙØ¹ $2 ÙÙØ·.", @@ -1767,6 +1769,8 @@ "apiwarn-badurlparam": "ØªØ¹Ø°Ø± ØªØÙÙÙ $1urlparam ÙÙ$2Ø Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¹Ø±Ø¶ ÙØ§ÙØ·ÙÙ ÙÙØ·.", "apiwarn-badutf8": "ØªØØªÙÙ Ø§ÙÙÙÙØ© Ø§ÙØªÙ ØªÙ ØªÙØ±ÙØ±ÙØ§ ÙÙ$1 Ø¹ÙÙ Ø¨ÙØ§ÙØ§Øª ØºÙØ± ØµØ§ÙØØ© Ø£Ù ØºÙØ± Ø·Ø¨ÙØ¹ÙØ©Ø ÙØ¬Ø¨ Ø£Ù ØªÙÙÙ Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙÙØµÙØ© ØµØ§ÙØØ©Ø NFC-normalized Unicode Ø¨Ø¯ÙÙ Ø£ØØ±Ù ØªØÙÙ C0 ØºÙØ± HT (\\t) ÙLF (\\n) ÙCR (\\r).", "apiwarn-checktoken-percentencoding": "ØªØÙÙ ÙÙ Ø£Ù Ø§ÙØ±ÙÙØ² ÙØ«Ù \"+\" ÙÙ Ø§ÙØ±ÙØ² Ø§ÙÙÙÙØ² ÙØªÙ ØªØ±ÙÙØ²ÙØ§ Ø¨Ø´ÙÙ ØµØÙØ ÙÙ Ø§ÙÙØ³Ø§Ø±.", + "apiwarn-compare-no-next": "Ø§ÙÙØ±Ø§Ø¬Ø¹Ø© $2 ÙÙ Ø£ØØ¯Ø« ÙØ±Ø§Ø¬Ø¹Ø© ÙÙ $1Ø ÙÙØ§ ØªÙØ¬Ø¯ ÙØ±Ø§Ø¬Ø¹Ø© ÙÙtorelative=next ÙÙÙÙØ§Ø±ÙØ© Ø¨ÙØ§.", + "apiwarn-compare-no-prev": "Ø§ÙÙØ±Ø§Ø¬Ø¹Ø© $2 ÙÙ Ø£ÙØ¯Ù ÙØ±Ø§Ø¬Ø¹Ø© ÙÙ $1Ø ÙÙØ§ ØªÙØ¬Ø¯ ÙØ±Ø§Ø¬Ø¹Ø© ÙÙtorelative=next ÙÙÙÙØ§Ø±ÙØ© Ø¨ÙØ§.", "apiwarn-compare-nocontentmodel": "ÙØ§ ÙÙÙÙ ØªØØ¯ÙØ¯ ÙÙÙØ°Ø¬ ÙØØªÙÙØ Ø¹ÙÙ Ø§ÙØªØ±Ø§Ø¶ $1.", "apiwarn-deprecation-deletedrevs": "ØªÙ Ø¥ÙÙØ§Ù list=deletedrevs; Ø§ÙØ±Ø¬Ø§Ø¡ Ø§Ø³ØªØ®Ø¯Ø§Ù prop=deletedrevisions or list=alldeletedrevisions Ø¨Ø¯ÙØ§ ÙÙ Ø°ÙÙ.", "apiwarn-deprecation-httpsexpected": "HTTP Ø§ÙÙØ³ØªØ®Ø¯ÙØ© Ø¹ÙØ¯ ØªÙÙØ¹ HTTPS.", diff --git a/includes/api/i18n/de.json b/includes/api/i18n/de.json index e6f6bafcd3..f626d2b1e3 100644 --- a/includes/api/i18n/de.json +++ b/includes/api/i18n/de.json @@ -19,7 +19,8 @@ "Luke081515", "Eddie", "Zenith", - "Tacsipacsi" + "Tacsipacsi", + "FF11" ] }, "apihelp-main-extended-description": "

\n* [[mw:Special:MyLanguage/API:Main_page|Dokumentation]]\n* [[mw:Special:MyLanguage/API:FAQ|HÃ¤ufig gestellte Fragen]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailingliste]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API-AnkÃ¼ndigungen]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Fehlerberichte und Anfragen]\n

\nStatus: Die MediaWiki-API ist eine ausgereifte und stabile Schnittstelle, die aktiv unterstÃ¼tzt und verbessert wird. WÃ¤hrend wir versuchen, dies zu vermeiden, kÃ¶nnen wir gelegentlich Breaking Changes erforderlich machen. Abonniere die [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ MediaWiki-API-AnkÃ¼ndigungs-Mailingliste] fÃ¼r Mitteilungen zu Aktualisierungen.\n\nFehlerhafte Anfragen: Wenn fehlerhafte Anfragen an die API gesendet werden, wird ein HTTP-Header mit dem SchlÃ¼ssel âMediaWiki-API-Errorâ gesendet. Der Wert des Headers und der Fehlercode werden auf den gleichen Wert gesetzt. FÃ¼r weitere Informationen siehe [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Fehler und Warnungen]].\n\n

Testen: Zum einfachen Testen von API-Anfragen, siehe [[Special:ApiSandbox]].

", @@ -696,6 +697,7 @@ "apihelp-query+filearchive-example-simple": "Eine Liste aller gelÃ¶schten Dateien auflisten", "apihelp-query+filerepoinfo-summary": "Gebe Metainformationen Ã¼ber Bild-Repositorien zurÃ¼ck, die im Wiki eingerichtet sind.", "apihelp-query+filerepoinfo-paramvalue-prop-displayname": "Der menschenlesbare Name des Repositoriumwikis.", + "apihelp-query+filerepoinfo-paramvalue-prop-initialCapital": "Ob Dateinamen implizit mit einem GroÃbuchstaben beginnen.", "apihelp-query+filerepoinfo-paramvalue-prop-local": "Ob dieses Repositorium das lokale ist oder nicht.", "apihelp-query+filerepoinfo-paramvalue-prop-rootUrl": "Wurzel-URL-Pfad fÃ¼r Bildpfade.", "apihelp-query+filerepoinfo-paramvalue-prop-scriptDirUrl": "Wurzel-URL-Pfad fÃ¼r die MediaWiki-Installation des Repositoriumwikis.", @@ -766,6 +768,7 @@ "apihelp-query+info-paramvalue-prop-varianttitles": "Gibt den Anzeigetitel in allen Varianten der Sprache des Websiteinhalts aus.", "apihelp-query+info-param-testactions": "ÃberprÃ¼ft, ob der aktuelle Benutzer gewisse Aktionen auf der Seite ausfÃ¼hren kann.", "apihelp-query+info-paramvalue-testactionsdetail-boolean": "Gibt einen booleschen Wert fÃ¼r jede Aktion zurÃ¼ck.", + "apihelp-query+info-paramvalue-testactionsdetail-full": "Gibt Nachrichten zurÃ¼ck, die erklÃ¤ren, warum diese Aktion nicht erlaubt ist oder ein leeres Array, wenn sie erlaubt ist.", "apihelp-query+info-paramvalue-testactionsdetail-quick": "Wie full, aber mit Ãberspringen von AufwandsÃ¼berprÃ¼fungen.", "apihelp-query+info-example-simple": "Ruft Informationen Ã¼ber die Seite Hauptseite ab.", "apihelp-query+iwbacklinks-summary": "Findet alle Seiten, die auf einen angegebenen Interwikilink verlinken.", @@ -797,6 +800,7 @@ "apihelp-query+langlinks-paramvalue-prop-url": "ErgÃ¤nzt die vollstÃ¤ndige URL.", "apihelp-query+langlinks-paramvalue-prop-autonym": "ErgÃ¤nzt den Namen der Muttersprache.", "apihelp-query+langlinks-param-dir": "Die Auflistungsrichtung.", + "apihelp-query+langlinks-param-inlanguagecode": "Sprachcode fÃ¼r lokalisierte Sprachnamen.", "apihelp-query+links-summary": "Gibt alle Links von den angegebenen Seiten zurÃ¼ck.", "apihelp-query+links-param-namespace": "Zeigt nur Links in diesen NamensrÃ¤umen.", "apihelp-query+links-param-limit": "Wie viele Links zurÃ¼ckgegeben werden sollen.", @@ -824,12 +828,15 @@ "apihelp-query+logevents-param-type": "Filtert nur LogbucheintrÃ¤ge mit diesem Typ heraus.", "apihelp-query+logevents-param-start": "Der Zeitstempel, bei dem die AufzÃ¤hlung beginnen soll.", "apihelp-query+logevents-param-end": "Der Zeitstempel, bei dem die AufzÃ¤hlung enden soll.", + "apihelp-query+logevents-param-title": "Filtert EintrÃ¤ge auf solche, die einer Seite Ã¤hnlich sind.", "apihelp-query+logevents-param-prefix": "Filtert EintrÃ¤ge, die mit diesem PrÃ¤fix beginnen.", + "apihelp-query+logevents-param-tag": "Listet nur EreigniseintrÃ¤ge auf, die mit dieser Markierung markiert sind.", "apihelp-query+logevents-param-limit": "Wie viele EreigniseintrÃ¤ge insgesamt zurÃ¼ckgegeben werden sollen.", "apihelp-query+logevents-example-simple": "Listet die letzten Logbuch-Ereignisse auf.", "apihelp-query+pagepropnames-param-limit": "Die maximale Anzahl zurÃ¼ckzugebender Namen.", "apihelp-query+pagepropnames-example-simple": "Ruft die ersten 10 Eigenschaftsnamen auf.", "apihelp-query+pageswithprop-paramvalue-prop-ids": "FÃ¼gt die Seitenkennung hinzu.", + "apihelp-query+pageswithprop-paramvalue-prop-title": "ErgÃ¤nzt den Titel und die Namensraumkennung der Seite.", "apihelp-query+pageswithprop-paramvalue-prop-value": "ErgÃ¤nzt den Wert der Seiteneigenschaft.", "apihelp-query+pageswithprop-param-limit": "Die maximale Anzahl zurÃ¼ckzugebender Seiten.", "apihelp-query+pageswithprop-param-dir": "In welche Richtung sortiert werden soll.", @@ -840,15 +847,19 @@ "apihelp-query+prefixsearch-param-profile": "Zu verwendendes Suchprofil.", "apihelp-query+protectedtitles-summary": "Listet alle Titel auf, die vor einer Erstellung geschÃ¼tzt sind.", "apihelp-query+protectedtitles-param-namespace": "Listet nur Titel in diesen NamensrÃ¤umen auf.", + "apihelp-query+protectedtitles-param-level": "Listet nur Titel mit diesen Schutzstufen auf.", "apihelp-query+protectedtitles-param-limit": "Wie viele Seiten insgesamt zurÃ¼ckgegeben werden sollen.", "apihelp-query+protectedtitles-param-start": "Startet die Auflistung bei diesem Schutz-Zeitstempel.", "apihelp-query+protectedtitles-param-end": "Stoppt die Auflistung bei diesem Schutz-Zeitstempel.", "apihelp-query+protectedtitles-param-prop": "ZurÃ¼ckzugebende Eigenschaften:", "apihelp-query+protectedtitles-paramvalue-prop-timestamp": "ErgÃ¤nzt den Zeitstempel, wann der Schutz hinzugefÃ¼gt wurde.", + "apihelp-query+protectedtitles-paramvalue-prop-comment": "ErgÃ¤nzt den Kommentar fÃ¼r den Schutz.", + "apihelp-query+protectedtitles-paramvalue-prop-parsedcomment": "ErgÃ¤nzt den geparsten Kommentar fÃ¼r den Schutz.", "apihelp-query+protectedtitles-paramvalue-prop-level": "ErgÃ¤nzt den Schutzstatus.", "apihelp-query+protectedtitles-example-simple": "Listet geschÃ¼tzte Titel auf.", "apihelp-query+querypage-param-limit": "Anzahl der zurÃ¼ckzugebenden Ergebnisse.", "apihelp-query+random-summary": "Ruft einen Satz an zufÃ¤lligen Seiten ab.", + "apihelp-query+random-param-namespace": "Gibt nur Seiten in diesen NamensrÃ¤umen zurÃ¼ck.", "apihelp-query+recentchanges-summary": "Listet die letzten Ãnderungen auf.", "apihelp-query+recentchanges-param-user": "Listet nur Ãnderungen von diesem Benutzer auf.", "apihelp-query+recentchanges-param-excludeuser": "Listet keine Ãnderungen von diesem Benutzer auf.", @@ -1118,10 +1129,12 @@ "apierror-compare-nofromrevision": "Keine Version âfromâ. fromrev, fromtitle oder fromid angeben.", "apierror-compare-notext": "Der Parameter $1 kann nicht ohne $2 verwendet werden.", "apierror-compare-notorevision": "Keine Version âtoâ. torev, totitle oder toid angeben.", + "apierror-compare-relative-to-deleted": "torelative=$1 kann nicht relativ zu einer gelÃ¶schten Version verwendet werden.", "apierror-emptypage": "Das Erstellen neuer leerer Seiten ist nicht erlaubt.", "apierror-filedoesnotexist": "Die Datei ist nicht vorhanden.", "apierror-import-unknownerror": "Unbekannter Fehler beim Importieren: $1.", "apierror-invalid-file-key": "Kein gÃ¼ltiger DateischlÃ¼ssel.", + "apierror-invalidmethod": "UngÃ¼ltige HTTP-Methode. Ziehe in ErwÃ¤gung, GET oder POST zu verwenden.", "apierror-invalidsection": "Der Parameter section muss eine gÃ¼ltige Abschnittskennung oder new sein.", "apierror-invaliduserid": "Die Benutzerkennung $1 ist nicht gÃ¼ltig.", "apierror-maxbytes": "Der Parameter $1 kann nicht lÃ¤nger sein als {{PLURAL:$2|ein Byte|$2 Bytes}}", @@ -1145,6 +1158,8 @@ "apierror-unknownerror-nocode": "Unbekannter Fehler.", "apierror-unknownerror": "Unbekannter Fehler: â$1â.", "apierror-unknownformat": "Nicht erkanntes Format â$1â.", + "apiwarn-compare-no-next": "Die Version $2 ist die aktuelle Version von $1. Es gibt keine zu vergleichende Version fÃ¼r torelative=next.", + "apiwarn-compare-no-prev": "Die Version $2 ist die aktuelle Version von $1. Es gibt keine zu vergleichende Version fÃ¼r torelative=prev.", "apiwarn-deprecation-missingparam": "Da $1 nicht angegeben wurde, wurde ein veraltetes Format fÃ¼r die Ausgabe verwendet. Dieses Format ist veraltet und in Zukunft wird immer das neue Format benutzt.", "apiwarn-ignoring-invalid-templated-value": "Ignorieren des Wertes $2 in $1 bei der Verarbeitung von Vorlagenparametern.", "apiwarn-invalidcategory": "â$1â ist keine Kategorie.", diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index 83bb6e65d5..8f5ba8d492 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -1570,11 +1570,11 @@ "apihelp-json-param-callback": "If specified, wraps the output into a given function call. For safety, all user-specific data will be restricted.", "apihelp-json-param-utf8": "If specified, encodes most (but not all) non-ASCII characters as UTF-8 instead of replacing them with hexadecimal escape sequences. Default when formatversion is not 1.", "apihelp-json-param-ascii": "If specified, encodes all non-ASCII using hexadecimal escape sequences. Default when formatversion is 1.", - "apihelp-json-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, * keys for content nodes, etc.).\n;2:Experimental modern format. Details may change!\n;latest:Use the latest format (currently 2), may change without warning.", + "apihelp-json-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, * keys for content nodes, etc.).\n;2:Modern format.\n;latest:Use the latest format (currently 2), may change without warning.", "apihelp-jsonfm-summary": "Output data in JSON format (pretty-print in HTML).", "apihelp-none-summary": "Output nothing.", "apihelp-php-summary": "Output data in serialized PHP format.", - "apihelp-php-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, * keys for content nodes, etc.).\n;2:Experimental modern format. Details may change!\n;latest:Use the latest format (currently 2), may change without warning.", + "apihelp-php-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, * keys for content nodes, etc.).\n;2:Modern format.\n;latest:Use the latest format (currently 2), may change without warning.", "apihelp-phpfm-summary": "Output data in serialized PHP format (pretty-print in HTML).", "apihelp-rawfm-summary": "Output data, including debugging elements, in JSON format (pretty-print in HTML).", "apihelp-xml-summary": "Output data in XML format.", @@ -1730,6 +1730,7 @@ "apierror-compare-nofromrevision": "No 'from' revision. Specify fromrev, fromtitle, or fromid.", "apierror-compare-notext": "Parameter $1 cannot be used without $2.", "apierror-compare-notorevision": "No 'to' revision. Specify torev, totitle, or toid.", + "apierror-compare-relative-to-deleted": "Cannot use torelative=$1 relative to a deleted revision.", "apierror-compare-relative-to-nothing": "No 'from' revision for torelative to be relative to.", "apierror-contentserializationexception": "Content serialization failed: $1", "apierror-contenttoobig": "The content you supplied exceeds the article size limit of $1 {{PLURAL:$1|kilobyte|kilobytes}}.", @@ -1758,6 +1759,7 @@ "apierror-invalidexpiry": "Invalid expiry time \"$1\".", "apierror-invalid-file-key": "Not a valid file key.", "apierror-invalidlang": "Invalid language code for parameter $1.", + "apierror-invalidmethod": "Invalid HTTP method. Consider using GET or POST.", "apierror-invalidoldimage": "The oldimage parameter has an invalid format.", "apierror-invalidparammix-cannotusewith": "The $1 parameter cannot be used with $2.", "apierror-invalidparammix-mustusewith": "The $1 parameter may only be used with $2.", @@ -1888,6 +1890,8 @@ "apiwarn-badurlparam": "Could not parse $1urlparam for $2. Using only width and height.", "apiwarn-badutf8": "The value passed for $1 contains invalid or non-normalized data. Textual data should be valid, NFC-normalized Unicode without C0 control characters other than HT (\\t), LF (\\n), and CR (\\r).", "apiwarn-checktoken-percentencoding": "Check that symbols such as \"+\" in the token are properly percent-encoded in the URL.", + "apiwarn-compare-no-next": "Revision $2 is the latest revision of $1, there is no revision for torelative=next to compare to.", + "apiwarn-compare-no-prev": "Revision $2 is the earliest revision of $1, there is no revision for torelative=prev to compare to.", "apiwarn-compare-nocontentmodel": "No content model could be determined, assuming $1.", "apiwarn-deprecation-deletedrevs": "list=deletedrevs has been deprecated. Please use prop=deletedrevisions or list=alldeletedrevisions instead.", "apiwarn-deprecation-httpsexpected": "HTTP used when HTTPS was expected.", diff --git a/includes/api/i18n/es.json b/includes/api/i18n/es.json index f807411433..afddc10a88 100644 --- a/includes/api/i18n/es.json +++ b/includes/api/i18n/es.json @@ -31,13 +31,15 @@ "Luzcaru", "Javiersanp", "KATRINE1992", - "Adjen" + "Adjen", + "Tiberius1701", + "Jelou" ] }, - "apihelp-main-extended-description": "

\n* [[mw:Special:MyLanguage/API:Main_page|Documentation]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailing list]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API Announcements]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bugs & requests]\n

\nStatus: Todas las funciones mostradas en esta pÃ¡gina deberÃan estar funcionando, pero la API aÃºn estÃ¡ en desarrollo activo, y puede cambiar en cualquier momento. Suscribase a [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the mediawiki-api-announce mailing list] para aviso de actualizaciones.\n\nErroneous requests: Cuando se envÃan solicitudes errÃ³neas a la API, se enviarÃ¡ un encabezado HTTP con la clave \"MediaWiki-API-Error\" y, luego, el valor del encabezado y el cÃ³digo de error devuelto se establecerÃ¡n en el mismo valor. Para mÃ¡s informaciÃ³n ver [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Errors and warnings]].\n\nTesting: Para facilitar la comprobaciÃ³n de las solicitudes de API, consulte [[Special:ApiSandbox]].", + "apihelp-main-extended-description": "

\n* [[mw:Special:MyLanguage/API:Main_page|DocumentaciÃ³n]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Lista de correo]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Anuncios API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Errores y peticiones]\n

\nEstado: La API de MediaWiki es una interfaz madura y estable que se mejora y prueba activamente. Aunque tratamos de evitarlo, es posible que ocasionalmente debamos hacer cambios importantes; Suscribase a la [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ lista de correo the mediawiki-api-announce] para recibir avisos de actualizaciones.\n\nSolicitudes errÃ³neas: Cuando se envÃan solicitudes errÃ³neas a la API, se enviarÃ¡ un encabezado HTTP con la clave \"MediaWiki-API-Error\" y, luego, el valor del encabezado y el cÃ³digo de error devuelto se establecerÃ¡n en el mismo valor. Para obtener mÃ¡s informaciÃ³n, consulte [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Errores y advertencias]].\n\n

Pruebas: Para facilitar la comprobaciÃ³n de las solicitudes de API, consulte [[Special:ApiSandbox]].

", "apihelp-main-param-action": "QuÃ© acciÃ³n se realizarÃ¡.", "apihelp-main-param-format": "El formato de la salida.", - "apihelp-main-param-maxlag": "El retardo mÃ¡ximo puede utilizarse cuando MediaWiki se instala en una agrupaciÃ³n replicada de bases de datos. Para guardar las acciones que causan mÃ¡s retardo de replicaciÃ³n de sitio, este parÃ¡metro puede hacer que el cliente espere hasta que el retardo de replicaciÃ³n sea menor que el valor especificado. En caso de un retardo excesivo, se devuelve el cÃ³digo de error maxlag con un mensaje como Esperando a $host: $lag segundos de retardo.
Consulta [[mw:Special:MyLanguage/Manual:Maxlag_parameter|Manual: parÃ¡metro Maxlag]] para mÃ¡s informaciÃ³n.", + "apihelp-main-param-maxlag": "Se puede usar el retardo mÃ¡ximo cuando se instala MediaWiki en un clÃºster replicado de base de datos. Para evitar acciones que causen mÃ¡s retardo en la replicaciÃ³n del sitio, este parÃ¡metro puede hacer que el cliente espere hasta que el retardo en la replicaciÃ³n sea menor que el valor especificado. En caso de retardo excesivo, se devuelve el cÃ³digo de error maxlag con un mensaje como Esperando a $host: $lag segundos de retardo.
Consulta [[mw:Special:MyLanguage/Manual:Maxlag_parameter|Manual: parÃ¡metro Maxlag]] para mÃ¡s informaciÃ³n.", "apihelp-main-param-smaxage": "Establece la cabecera HTTP s-maxage de control de antememoria a esta cantidad de segundos. Los errores nunca se almacenan en la antememoria.", "apihelp-main-param-maxage": "Establece la cabecera HTTP max-age de control de antememoria a esta cantidad de segundos. Los errores nunca se almacenan en la antememoria.", "apihelp-main-param-assert": "Comprobar que el usuario haya iniciado sesiÃ³n si el valor es user o si tiene el permiso de bot si es bot.", @@ -89,7 +91,7 @@ "apihelp-compare-param-toid": "Segunda identificador de pÃ¡gina para comparar.", "apihelp-compare-param-torev": "Segunda revisiÃ³n para comparar.", "apihelp-compare-param-tosection": "Solamente usar la secciÃ³n especificada del contenido 'to' especificado.", - "apihelp-compare-param-prop": "CuÃ¡les fragmentos de informaciÃ³n se obtendrÃ¡n.", + "apihelp-compare-param-prop": "QuÃ© fragmentos de informaciÃ³n se obtendrÃ¡n.", "apihelp-compare-paramvalue-prop-diff": "El HTML de las diferencias.", "apihelp-compare-paramvalue-prop-diffsize": "El tamaÃ±o del HTML de las diferencias, en bytes.", "apihelp-compare-example-1": "Crear una diferencia entre las revisiones 1 y 2.", @@ -119,8 +121,8 @@ "apihelp-delete-param-watchlist": "AÃ±adir o quitar incondicionalmente la pÃ¡gina de la lista de seguimiento del usuario actual, usar preferencias o no cambiar el estado de seguimiento.", "apihelp-delete-param-unwatch": "Quitar la pÃ¡gina de la lista de seguimiento del usuario actual.", "apihelp-delete-param-oldimage": "El nombre de la imagen antigua es proporcionado conforme a lo dispuesto por [[Special:ApiHelp/query+imageinfo|action=query&prop=imageinfo&iiprop=archivename]].", - "apihelp-delete-example-simple": "Borrar Main Page.", - "apihelp-delete-example-reason": "Eliminar Main Page con el motivo Preparing for move.", + "apihelp-delete-example-simple": "Borrar Pagina principal.", + "apihelp-delete-example-reason": "Eliminar Main Page con el motivo PreparÃ¡ndose para traslado.", "apihelp-disabled-summary": "Se desactivÃ³ este mÃ³dulo.", "apihelp-edit-summary": "Crear y editar pÃ¡ginas.", "apihelp-edit-param-title": "TÃtulo de la pÃ¡gina a editar. No se puede utilizar junto a $1pageid.", @@ -132,7 +134,7 @@ "apihelp-edit-param-tags": "Cambia las etiquetas para aplicarlas a la revisiÃ³n.", "apihelp-edit-param-minor": "EdiciÃ³n menor.", "apihelp-edit-param-notminor": "EdiciÃ³n no menor.", - "apihelp-edit-param-bot": "Marcar esta como una ediciÃ³n de robot.", + "apihelp-edit-param-bot": "Marcar esta como una ediciÃ³n de bot.", "apihelp-edit-param-basetimestamp": "Marca de tiempo de la revisiÃ³n base, usada para detectar conflictos de ediciÃ³n. Se puede obtener mediante [[Special:ApiHelp/query+revisions|action=query&prop=revisions&rvprop=timestamp]]", "apihelp-edit-param-starttimestamp": "Marca de tiempo de cuando empezÃ³ el proceso de ediciÃ³n, usada para detectar conflictos de ediciÃ³n. Se puede obtener un valor apropiado usando [[Special:ApiHelp/main|curtimestamp]] cuando comiences el proceso de ediciÃ³n (por ejemplo, al cargar el contenido de la pÃ¡gina por editar).", "apihelp-edit-param-recreate": "Reemplazar los errores acerca de la pÃ¡gina de haber sido eliminados en el Ãnterin.", @@ -155,13 +157,13 @@ "apihelp-edit-example-undo": "Deshacer intervalo de revisiones 13579-13585 con resumen automÃ¡tico", "apihelp-emailuser-summary": "Enviar un mensaje de correo electrÃ³nico a un usuario.", "apihelp-emailuser-param-target": "Cuenta de usuario destinatario.", - "apihelp-emailuser-param-subject": "Cabecera de asunto.", + "apihelp-emailuser-param-subject": "Cabecera del asunto.", "apihelp-emailuser-param-text": "Cuerpo del mensaje.", "apihelp-emailuser-param-ccme": "Enviarme una copia de este mensaje.", "apihelp-emailuser-example-email": "Enviar un correo al usuario WikiSysop con el texto Content.", "apihelp-expandtemplates-summary": "Expande todas las plantillas en wikitexto.", "apihelp-expandtemplates-param-title": "TÃtulo de la pÃ¡gina.", - "apihelp-expandtemplates-param-text": "Sintaxis wiki que se convertirÃ¡.", + "apihelp-expandtemplates-param-text": "Wikitexto que se convertirÃ¡.", "apihelp-expandtemplates-param-revid": "Id. de revisiÃ³n, para {{REVISIONID}} y variables similares.", "apihelp-expandtemplates-param-prop": "QuÃ© elementos de informaciÃ³n se utilizan para llegar.\n\nTenga en cuenta que si no se seleccionan los valores, el resultado contendrÃ¡ el wikitexto, pero la salida serÃ¡ en un formato obsoleto.", "apihelp-expandtemplates-paramvalue-prop-wikitext": "El wikitexto expandido.", @@ -326,7 +328,7 @@ "apihelp-paraminfo-example-1": "Mostrar informaciÃ³n para [[Special:ApiHelp/parse|action=parse]], [[Special:ApiHelp/jsonfm|format=jsonfm]], [[Special:ApiHelp/query+allpages|action=query&list=allpages]] y [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]].", "apihelp-paraminfo-example-2": "Mostrar informaciÃ³n para todos los submÃ³dulos de [[Special:ApiHelp/query|action=query]].", "apihelp-parse-summary": "Analiza el contenido y devuelve la salida del analizador sintÃ¡ctico.", - "apihelp-parse-extended-description": "VÃ©anse los distintos mÃ³dulos prop de [[Special:ApiHelp/query|action=query]] para obtener informaciÃ³n de la versiÃ³n actual de una pÃ¡gina.\n\nHay varias maneras de especificar el texto que analizar:\n# Especificar una pÃ¡gina o revisiÃ³n, mediante $1page, $1pageid o $1oldid.\n# Especificar explÃcitamente el contenido, mediante $1text, $1title y $1contentmodel.\n# Especificar solamente un resumen que analizar. Se deberÃa asignar a $1prop un valor vacÃo.", + "apihelp-parse-extended-description": "VÃ©anse los distintos mÃ³dulos prop de [[Special:ApiHelp/query|action=query]] para obtener informaciÃ³n de la versiÃ³n actual de una pÃ¡gina.\n\nHay varias maneras de especificar el texto que analizar:\n# Especificar una pÃ¡gina o revisiÃ³n, mediante $1page, $1pageid o $1oldid.\n# Especificar explÃcitamente el contenido, mediante $1text, $1title, $1revid, y $1contentmodel.\n# Especificar solamente un resumen que analizar. Se deberÃa asignar a $1prop un valor vacÃo.", "apihelp-parse-param-title": "TÃtulo de la pÃ¡gina a la que pertenece el texto. Si se omite se debe especificar $1contentmodel y se debe utilizar el [[API]] como tÃtulo.", "apihelp-parse-param-text": "Texto a analizar. Utiliza $1title or $1contentmodel para controlar el modelo del contenido.", "apihelp-parse-param-summary": "Resumen a analizar.", @@ -761,7 +763,7 @@ "apihelp-query+filearchive-paramvalue-prop-archivename": "AÃ±ade el nombre de archivo de la versiÃ³n archivada para las versiones que no son las Ãºltimas.", "apihelp-query+filearchive-example-simple": "Mostrar una lista de todos los archivos eliminados.", "apihelp-query+filerepoinfo-summary": "Devuelve metainformaciÃ³n sobre los repositorios de imÃ¡genes configurados en el wiki.", - "apihelp-query+filerepoinfo-param-prop": "Propiedades del repositorio a obtener (puede haber mÃ¡s disponibles en algunos wikis):\n;apiurl:URL del repositorio API - Ãºtil para obtener informaciÃ³n de imagen del servidor.\n;name:La clave del repositorio - usado in e.g. [[mw:Special:MyLanguage/Manual:$wgForeignFileRepos|$wgForeignFileRepos]] y [[Special:ApiHelp/query+imageinfo|imageinfo]] devuelve valores.\n;displayname:El nombre legible del repositorio wiki.\n;rooturl:RaÃz URL para rutas de imÃ¡genes.\n;local:Si ese repositorio es local o no.", + "apihelp-query+filerepoinfo-param-prop": "QuÃ© propiedades del repositorio obtener (las propiedades disponibles pueden variar en otras wikis).", "apihelp-query+filerepoinfo-example-simple": "Obtener informaciÃ³n acerca de los repositorios de archivos.", "apihelp-query+fileusage-summary": "Encontrar todas las pÃ¡ginas que utilizan los archivos dados.", "apihelp-query+fileusage-param-prop": "QuÃ© propiedades se obtendrÃ¡n:", @@ -835,7 +837,7 @@ "apihelp-query+info-paramvalue-prop-notificationtimestamp": "La hora de notificaciÃ³n de la lista de seguimiento de cada pÃ¡gina.", "apihelp-query+info-paramvalue-prop-subjectid": "La ID de pÃ¡gina de la pÃ¡gina principal de cada pÃ¡gina de discusiÃ³n.", "apihelp-query+info-paramvalue-prop-url": "Muestra una URL completa, una URL de ediciÃ³n y la URL canÃ³nica de cada pÃ¡gina.", - "apihelp-query+info-paramvalue-prop-readable": "Si el usuario puede leer esta pÃ¡gina.", + "apihelp-query+info-paramvalue-prop-readable": "Si el usuario puede leer esta pÃ¡gina. Usa intestactions=read en su lugar.", "apihelp-query+info-paramvalue-prop-preload": "Muestra el texto devuelto por EditFormPreloadText.", "apihelp-query+info-paramvalue-prop-displaytitle": "Proporciona la manera en que se muestra realmente el tÃtulo de la pÃ¡gina", "apihelp-query+info-param-testactions": "Comprobar su el usuario actual puede realizar determinadas acciones en la pÃ¡gina.", @@ -1022,8 +1024,8 @@ "apihelp-query+revisions-summary": "Obtener informaciÃ³n de la revisiÃ³n.", "apihelp-query+revisions-extended-description": "Puede ser utilizado de varias maneras:\n# Obtener datos sobre un conjunto de pÃ¡ginas (Ãºltima revisiÃ³n), estableciendo tÃtulos o ID de paginas.\n# Obtener revisiones para una pÃ¡gina determinada, usando tÃtulos o ID de pÃ¡ginas con inicio, fin o lÃmite.\n# Obtener datos sobre un conjunto de revisiones estableciendo sus ID con revids.", "apihelp-query+revisions-paraminfo-singlepageonly": "Solo se puede usar con una sola pÃ¡gina (modo n.Âº 2).", - "apihelp-query+revisions-param-startid": "Identificador de revisiÃ³n a partir del cual empezar la enumeraciÃ³n.", - "apihelp-query+revisions-param-endid": "Identificador de revisiÃ³n en el que detener la enumeraciÃ³n.", + "apihelp-query+revisions-param-startid": "Iniciar la enumeraciÃ³n desde la marca de tiempo de esta revisiÃ³n. La revisiÃ³n debe existir, pero no es necesario que pertenezca a esta pÃ¡gina.", + "apihelp-query+revisions-param-endid": "Detener la enumeraciÃ³n en la marca de tiempo de esta revisiÃ³n. La revisiÃ³n debe existir, pero no es necesario que pertenezca a esta pÃ¡gina.", "apihelp-query+revisions-param-start": "Marca de tiempo a partir de la cual empezar la enumeraciÃ³n.", "apihelp-query+revisions-param-end": "Enumerar hasta esta marca de tiempo.", "apihelp-query+revisions-param-user": "Incluir solo las revisiones realizadas por el usuario.", @@ -1043,16 +1045,16 @@ "apihelp-query+revisions+base-paramvalue-prop-userid": "Identificador de usuario del creador de la revisiÃ³n.", "apihelp-query+revisions+base-paramvalue-prop-size": "Longitud (en bytes) de la revisiÃ³n.", "apihelp-query+revisions+base-paramvalue-prop-sha1": "SHA-1 (base 16) de la revisiÃ³n.", - "apihelp-query+revisions+base-paramvalue-prop-contentmodel": "Identificador del modelo de contenido de la revisiÃ³n.", + "apihelp-query+revisions+base-paramvalue-prop-contentmodel": "Id. del modelo de contenido en cada espacio de revisiÃ³n.", "apihelp-query+revisions+base-paramvalue-prop-comment": "Comentario del usuario para la revisiÃ³n.", "apihelp-query+revisions+base-paramvalue-prop-parsedcomment": "Comentario analizado del usuario para la revisiÃ³n.", - "apihelp-query+revisions+base-paramvalue-prop-content": "Texto de la revisiÃ³n.", + "apihelp-query+revisions+base-paramvalue-prop-content": "Contenido de cada espacio de revisiÃ³n.", "apihelp-query+revisions+base-paramvalue-prop-tags": "Etiquetas para la revisiÃ³n.", - "apihelp-query+revisions+base-paramvalue-prop-parsetree": "El Ã¡rbol de anÃ¡lisis sintÃ¡ctico XML del contenido de la revisiÃ³n (requiere el modelo de contenido $1).", + "apihelp-query+revisions+base-paramvalue-prop-parsetree": "Usa [[Special:ApiHelp/expandtemplates|action=expandtemplates]] o [[Special:ApiHelp/parse|action=parse]] en su lugar.\nEl Ã¡rbol de anÃ¡lisis sintÃ¡ctico XML del contenido de la revisiÃ³n (necesita el modelo de contenido $1).", "apihelp-query+revisions+base-param-limit": "Limitar la cantidad de revisiones que se devolverÃ¡n.", - "apihelp-query+revisions+base-param-expandtemplates": "Expandir las plantillas en el contenido de la revisiÃ³n (requiere $1prop=content).", - "apihelp-query+revisions+base-param-generatexml": "Generar el Ã¡rbol de anÃ¡lisis sintÃ¡ctico XML para el contenido de la revisiÃ³n (requiere $1prop=content; reemplazado por $1prop=parsetree).", - "apihelp-query+revisions+base-param-parse": "Analizar el contenido de la revisiÃ³n (requiere $1prop=content). Por motivos de rendimiento, si se utiliza esta opciÃ³n, el valor de $1limit es forzado a 1.", + "apihelp-query+revisions+base-param-expandtemplates": "Usa [[Special:ApiHelp/expandtemplates|action=expandtemplates]] en su lugar.\nExpandir las plantillas en el contenido de la revisiÃ³n (necesita $1prop=content).", + "apihelp-query+revisions+base-param-generatexml": "Usa [[Special:ApiHelp/expandtemplates|action=expandtemplates]] o [[Special:ApiHelp/parse|action=parse]] en su lugar.\nGenerar el Ã¡rbol de anÃ¡lisis sintÃ¡ctico XML para el contenido de la revisiÃ³n (necesita $1prop=content).", + "apihelp-query+revisions+base-param-parse": "Usa [[Special:ApiHelp/parse|action=parse]] en su lugar.\nAnalizar el contenido de la revisiÃ³n (requiere $1prop=content). Por razones de rendimiento, si se usa esta opciÃ³n, el valor de $1limit es forzado a 1.", "apihelp-query+revisions+base-param-section": "Recuperar solamente el contenido de este nÃºmero de secciÃ³n.", "apihelp-query+revisions+base-param-contentformat": "Formato de serializaciÃ³n utilizado para $1difftotext y esperado para la salida de contenido.", "apihelp-query+search-summary": "Realizar una bÃºsqueda de texto completa.", @@ -1221,7 +1223,7 @@ "apihelp-query+watchlist-paramvalue-prop-tags": "Enumera las etiquetas de la entrada.", "apihelp-query+watchlist-param-show": "Muestra solo los elementos que cumplan estos criterios. Por ejemplo, para ver solo ediciones menores realizadas por usuarios conectados, introduce $1show=minor|!anon.", "apihelp-query+watchlist-param-type": "QuÃ© tipos de cambios mostrar:", - "apihelp-query+watchlist-paramvalue-type-edit": "Ediciones comunes a pÃ¡ginas", + "apihelp-query+watchlist-paramvalue-type-edit": "Ediciones comunes en pÃ¡ginas", "apihelp-query+watchlist-paramvalue-type-external": "Cambios externos.", "apihelp-query+watchlist-paramvalue-type-new": "Creaciones de pÃ¡ginas.", "apihelp-query+watchlist-paramvalue-type-log": "Entradas del registro.", @@ -1268,7 +1270,7 @@ "apihelp-rollback-param-tags": "Etiquetas que aplicar a la reversiÃ³n.", "apihelp-rollback-param-user": "Nombre del usuario cuyas ediciones se van a revertir.", "apihelp-rollback-param-summary": "Resumen de ediciÃ³n personalizado. Si se deja vacÃo se utilizarÃ¡ el predeterminado.", - "apihelp-rollback-param-markbot": "Marcar las acciones revertidas y la reversiÃ³n como ediciones por bots.", + "apihelp-rollback-param-markbot": "Marca las ediciones como revertidas y las revierte como ediciones de un bot.", "apihelp-rollback-param-watchlist": "AÃ±adir o borrar incondicionalmente la pÃ¡gina de la lista de seguimiento del usuario actual, usar preferencias o no cambiar seguimiento.", "apihelp-rollback-example-simple": "Revertir las Ãºltimas ediciones de la pÃ¡gina Main Page por el usuario Example.", "apihelp-rollback-example-summary": "Revertir las Ãºltimas ediciones de la pÃ¡gina Main Page por el usuario de IP 192.0.2.5 con resumen Reverting vandalism, y marcar esas ediciones y la reversiÃ³n como ediciones realizadas por bots.", @@ -1373,11 +1375,11 @@ "apihelp-json-param-callback": "Si se especifica, envuelve la salida dentro de una llamada a una funciÃ³n dada. Por motivos de seguridad, cualquier dato especÃfico del usuario estarÃ¡ restringido.", "apihelp-json-param-utf8": "Si se especifica, codifica la mayorÃa (pero no todos) de los caracteres no pertenecientes a ASCII como UTF-8 en lugar de reemplazarlos por secuencias de escape hexadecimal. Toma el comportamiento por defecto si formatversion no es 1.", "apihelp-json-param-ascii": "Si se especifica, codifica todos los caracteres no pertenecientes a ASCII mediante secuencias de escape hexadecimal. Toma el comportamiento por defecto si formatversion no es 1.", - "apihelp-json-param-formatversion": "Formato de salida:\n;1: Formato retrocompatible (booleanos con estilo XML, claves * para nodos de contenido, etc.).\n;2: Formato moderno experimental. Â¡AtenciÃ³n, las especificaciones pueden cambiar!\n;latest: Utiliza el Ãºltimo formato (actualmente 2). Puede cambiar sin aviso.", + "apihelp-json-param-formatversion": "Formato de salida:\n;1: Formato retrocompatible (booleanos con estilo XML, claves * para nodos de contenido, etc.).\n;2: Formato moderno.\n;Ãºltimo: Utiliza el Ãºltimo formato (actualmente 2), puede cambiar sin aviso.", "apihelp-jsonfm-summary": "Producir los datos de salida en formato JSON (con resaltado sintÃ¡ctico en HTML).", "apihelp-none-summary": "No extraer nada.", "apihelp-php-summary": "Extraer los datos de salida en formato serializado PHP.", - "apihelp-php-param-formatversion": "Formato de salida:\n;1: Formato retrocompatible (booleanos con estilo XML, claves * para nodos de contenido, etc.).\n;2: Formato moderno experimental. Â¡AtenciÃ³n, las especificaciones pueden cambiar!\n;latest: Utilizar el Ãºltimo formato (actualmente 2). Puede cambiar sin aviso.", + "apihelp-php-param-formatversion": "Formato de salida:\n;1: Formato retrocompatible (booleanos con estilo XML, claves * para nodos de contenido, etc.).\n;2: Formato moderno.\n;Ãºltimo: Utiliza el Ãºltimo formato (actualmente 2), puede cambiar sin aviso.", "apihelp-phpfm-summary": "Producir los datos de salida en formato PHP serializado (con resaltado sintÃ¡ctico en HTML).", "apihelp-rawfm-summary": "Extraer los datos de salida, incluidos los elementos de depuraciÃ³n, en formato JSON (embellecido en HTML).", "apihelp-xml-summary": "Producir los datos de salida en formato XML.", @@ -1567,7 +1569,7 @@ "apierror-nosuchuserid": "No hay ningÃºn usuario con ID $1.", "apierror-notarget": "No has especificado un destino vÃ¡lido para esta acciÃ³n.", "apierror-notpatrollable": "La revisiÃ³n r$1 no se puede patrullar por ser demasiado antigua.", - "apierror-offline": "No se puede continuar debido a problemas de conectividad de la red. AsegÃºrate de que tienes una conexiÃ³n activa a internet e intÃ©ntalo de nuevo.", + "apierror-offline": "No se pudo continuar debido a problemas de conectividad de red. AsegÃºrate de tener una conexiÃ³n a Internet que funcione y vuelve a intentarlo.", "apierror-opensearch-json-warnings": "No se pueden representar los avisos en formato JSON de OpenSearch.", "apierror-pagecannotexist": "En este espacio de nombres no se permiten pÃ¡ginas reales.", "apierror-pagedeleted": "La pÃ¡gina ha sido borrada en algÃºn momento desde que obtuviste su marca de tiempo.", diff --git a/includes/api/i18n/fr.json b/includes/api/i18n/fr.json index 1af75a0690..6801faa255 100644 --- a/includes/api/i18n/fr.json +++ b/includes/api/i18n/fr.json @@ -1481,11 +1481,11 @@ "apihelp-json-param-callback": "Si spÃ©cifiÃ©, inclut la sortie dans lâappel dâune fonction fournie. Pour plus de sÃ»retÃ©, toutes les donnÃ©es spÃ©cifiques Ã lâutilisateur seront restreintes.", "apihelp-json-param-utf8": "Si spÃ©cifiÃ©, encode la plupart (mais pas tous) des caractÃ¨res non ASCII en URF-8 au lieu de les remplacer par leur sÃ©quence dâÃ©chappement hexadÃ©cimale. Valeur par dÃ©faut quand formatversion ne vaut pas 1.", "apihelp-json-param-ascii": "Si spÃ©cifiÃ©, encode toutes ses sÃ©quences dâÃ©chappement non ASCII utilisant lâhexadÃ©cimal. Valeur par dÃ©faut quand formatversion vaut 1.", - "apihelp-json-param-formatversion": "Mise en forme de sortie :\n;1:Format rÃ©tro-compatible (boolÃ©ens de style XML, clÃ©s * pour les nÅuds de contenu, etc.).\n;2:Format moderne expÃ©rimental. Des dÃ©tails peuvent changerâ¯!\n;latest:Utilise le dernier format (actuellement 2), peut changer sans avertissement.", + "apihelp-json-param-formatversion": "Mise en forme de sortie :\n;1:Format rÃ©tro-compatible (boolÃ©ens de style XML, clÃ©s * pour les nÅuds de contenu, etc.).\n;2:Format moderne.\n;latest:Utilise le dernier format (actuellement 2), peut changer sans avertissement.", "apihelp-jsonfm-summary": "Extraire les donnÃ©es au format JSON (affichÃ© proprement en HTML).", "apihelp-none-summary": "Ne rien extraire.", "apihelp-php-summary": "Extraire les donnÃ©es au format sÃ©rialisÃ© de PHP.", - "apihelp-php-param-formatversion": "Mise en forme de la sortie :\n;1:Format rÃ©tro-compatible (bool&ens de style XML, clÃ©s * pour les nÅuds de contenu, etc.).\n;2:Format moderne expÃ©rimental. Des dÃ©tails peuvent changerâ¯!\n;latest:Utilise le dernier format (actuellement 2), peut changer sans avertissement.", + "apihelp-php-param-formatversion": "Mise en forme de la sortie :\n;1:format rÃ©tro-compatible (boolÃ©ens de style XML, clÃ©s * pour les nÅuds de contenu, etc.).\n;2:format moderne.\n;latest:utilise le dernier format (actuellement 2), peut changer sans avertissement.", "apihelp-phpfm-summary": "Extraire les donnÃ©es au format sÃ©rialisÃ© de PHP (affichÃ© proprement en HTML).", "apihelp-rawfm-summary": "Extraire les donnÃ©es, y compris les Ã©lÃ©ments de dÃ©bogage, au format JSON (affichÃ© proprement en HTML).", "apihelp-xml-summary": "Extraire les donnÃ©es au format XML.", @@ -1631,6 +1631,7 @@ "apierror-compare-nofromrevision": "Aucune rÃ©vision 'from'. SpÃ©cifiez fromrev, fromtitle, ou fromid.", "apierror-compare-notext": "Le paramÃ¨tre $1 ne peut pas Ãªtre utilisÃ© sans $2.", "apierror-compare-notorevision": "Aucune rÃ©vision 'to'. SpÃ©cifiez torev, totitle, ou toid.", + "apierror-compare-relative-to-deleted": "Impossible dâutiliser torelative=$1 par rapport Ã une rÃ©vision supprimÃ©e.", "apierror-compare-relative-to-nothing": "Pas de rÃ©vision 'depuis' pour torelative Ã laquelle se rapporter.", "apierror-contentserializationexception": "Ãchec de sÃ©rialisation du contenu : $1", "apierror-contenttoobig": "Le contenu que vous avez fourni dÃ©passe la limite de taille dâun article, qui est de $1 {{PLURAL:$1|kilooctet|kilooctets}}.", @@ -1659,6 +1660,7 @@ "apierror-invalidexpiry": "Heure d'expiration invalide \"$1\".", "apierror-invalid-file-key": "Ne correspond pas Ã une clÃ© valide de fichier.", "apierror-invalidlang": "Code de langue non valide pour le paramÃ¨tre $1.", + "apierror-invalidmethod": "MÃ©thode HTTP non valide. Seul GET ou POST est autorisÃ©.", "apierror-invalidoldimage": "Le paramÃ¨tre oldimage a un format non valide.", "apierror-invalidparammix-cannotusewith": "Le paramÃ¨tre $1 ne peut pas Ãªtre utilisÃ© avec $2.", "apierror-invalidparammix-mustusewith": "Le paramÃ¨tre $1 ne peut Ãªtre utilisÃ© quâavec $2.", @@ -1787,6 +1789,8 @@ "apiwarn-badurlparam": "Impossible d'analyser $1urlparam pour $2. En utilisant seulement la largeur et la hauteur.", "apiwarn-badutf8": "La valeur passÃ©e pour $1 contient des donnÃ©es non valides ou non normalisÃ©es. Les donnÃ©es textuelles doivent Ãªtre de lâUnicode valide normalisÃ© en NFC sans caractÃ¨res de contrÃ´le c0 autres que HT (\\t), LF (\\n) et CR (\\r).", "apiwarn-checktoken-percentencoding": "VÃ©rifier que les symboles tels que \"+\" dans le jeton sont correctement codÃ©s avec des pourcents dans l'URL.", + "apiwarn-compare-no-next": "La version $2 est la derniÃ¨re version de $1, il n'existe pas de version torelative=next Ã comparer.", + "apiwarn-compare-no-prev": "La version $2 est la plus ancienne de $1, il n'existe pas de version torelative=prev Ã comparer.", "apiwarn-compare-nocontentmodel": "Aucun modÃ¨le de contenu nâa pu Ãªtre dÃ©terminÃ©, $1 est supposÃ©.", "apiwarn-deprecation-deletedrevs": "list=deletedrevs est devenu dÃ©suet. Veuillez utiliser prop=deletedrevisions ou list=alldeletedrevisions Ã la place.", "apiwarn-deprecation-httpsexpected": "HTTP est utilisÃ© alors que HTTPS est attendu.", diff --git a/includes/api/i18n/he.json b/includes/api/i18n/he.json index 3370d73848..94ee481345 100644 --- a/includes/api/i18n/he.json +++ b/includes/api/i18n/he.json @@ -49,6 +49,8 @@ "apihelp-block-param-reblock": "×× ×××©×ª××© ×××¨ ××¡××, ×××¨××¡ ××ª ×××¡××× ×× ×××××ª.", "apihelp-block-param-watchuser": "××¢×§×× ×××¨× ××£ ×××©×ª××© ×××£ ××©××× ×©× ×××©×ª××© ×× ×©× ××ª×××ª ×Ö¾IP.", "apihelp-block-param-tags": "×ª×× ×©×× ×× ×©××××× ×¢× ××¢××× ××××× ×××¡×××.", + "apihelp-block-param-partial": "××¡×××ª ××©×ª××© ××¢×¨×××ª ××¤×× ×× ××¨××× ×©× ××¡××××× ××× ××× ×××ª×¨.", + "apihelp-block-param-pagerestrictions": "×¨×©×××ª ×××ª×¨××ª ×©×××©×ª××© ××××¡× ×××¢×¨××. ×× ×¨×§ ×××©×¨ \"partial\" ××××× ×Ö¾true.", "apihelp-block-example-ip-simple": "××¡×××ª ××ª×××ª ×Ö¾IPâ 192.0.2.5 ××©×××©× ×××× ×¢× ××¡××× First strike.", "apihelp-block-example-user-complex": "××¡×××ª ×××©×ª××© Vandal ××× ×××××ª ××× ×¢× ××¡××× Vandalism, ××× ××¢×ª ××¦××¨×ª ××©××× ××ª ×××©×× ××©××××ª ×××\"×.", "apihelp-changeauthenticationdata-summary": "×©×× ×× × ×ª×× × ×××××ª ×¢×××¨ ×××©×ª××© ×× ××××.", @@ -68,19 +70,29 @@ "apihelp-compare-param-fromtitle": "×××ª×¨×ª ×¨××©×× × ×××©××××.", "apihelp-compare-param-fromid": "××¡×³ ××××× ×©× ×××£ ××¨××©×× ×××©××××.", "apihelp-compare-param-fromrev": "××¨×¡× ×¨××©×× × ×××©××××.", - "apihelp-compare-param-frompst": "××¢×©××ª ××ª××¨× ××¤× × ×©×××¨× ×Ö¾fromtext.", - "apihelp-compare-param-fromtext": "×××©×ª××© ×××§×¡× ××× ×××§×× ×ª××× ×××¨×¡× ×©×××××¨× ×¢×Ö¾××× fromtitle, fromid ×× fromrev.", - "apihelp-compare-param-fromcontentmodel": "×××× ××ª××× ×©× fromtext. ×× ×× ×× ×¡××¤×§, ×××¢×©× × ××××© ×¢× ×¡×× ×¤×¨×××¨×× ×××¨××.", - "apihelp-compare-param-fromcontentformat": "×ª×¡×××¨ ××¡××¨×ª ×ª××× ×©× fromtext.", + "apihelp-compare-param-frompst": "××¢×©××ª ××ª××¨× ××¤× × ×©×××¨× ×Ö¾romtext-{slot}.", + "apihelp-compare-param-fromslots": "××¨××¡×ª ×ª××× ×××¨×¡× ×©×¦××× × ×Ö¾fromtitle, ×Ö¾fromid, ×× ×Ö¾fromrev.\n\n××¤×¨×××¨ ××× ××¦××× ××ª ×××©××¦××ª ×©××©×× ×. ××© ×××©×ª××© ×Ö¾fromtext-{slot}, ×Ö¾fromcontentmodel-{slot}, ××Ö¾fromcontentformat-{slot} ××¦××× ×ª××× ×¢×××¨ ×× ××©××¦×ª.", + "apihelp-compare-param-fromtext-{slot}": "×××§×¡× ×©× ×××©××¦×ª ×©××¦××× ×ª. ×× ×× ×××©××, ×××©××¦×ª ××Ö¼×¡×¨×ª ××××¨×¡×.", + "apihelp-compare-param-fromsection-{slot}": "×××©×¨ fromtext-{slot} ××× ××ª××× ×©× ×¤×¡×§× ×××ª, ××× ××¡×¤×¨ ××¤×¡×§×. ××× ××××× ××ª×× ×××¨×¡× ×©××¦××× ×ª ×Ö¾fromtitle, ×Ö¾fromid, ×× ×Ö¾fromrev ××× ××¢×¨×××ª ×¤×¡×§×.", + "apihelp-compare-param-fromcontentmodel-{slot}": "×××× ××ª××× ×©× fromtext-{slot}. ×× ×× ×× ×¡××¤×§, ×× ×× ×××© ××¤× ××¤×¨×××¨×× ××××¨××.", + "apihelp-compare-param-fromcontentformat-{slot}": "×ª×¡×××¨ ×××¡××¨×ª ×ª××× ×©× fromtext-{slot}.", + "apihelp-compare-param-fromtext": "××© ××¦××× fromslots=main ××××©×ª××© ×Ö¾fromtext-main ×××§×× ××.", + "apihelp-compare-param-fromcontentmodel": "××© ××¦××× fromslots=main ××××©×ª××© ×Ö¾fromcontentmodel-main ×××§×× ××.", + "apihelp-compare-param-fromcontentformat": "××© ××¦××× fromslots=main ××××©×ª××© ×Ö¾fromcontentformat-main ×××§×× ××.", "apihelp-compare-param-fromsection": "××© ×××©×ª××© ×¨×§ ××¤×¡×§× ×©×¦××× × ××ª××× ×©× ××¤×¨×××¨ 'from'.", "apihelp-compare-param-totitle": "×××ª×¨×ª ×©× ××× ×××©××××.", "apihelp-compare-param-toid": "××¡×³ ×××× ×©× ×××£ ××©× × ×××©××××.", "apihelp-compare-param-torev": "××¨×¡× ×©× ××× ×××©××××.", "apihelp-compare-param-torelative": "×××©×ª××© ×××¨×¡× ×××¡××ª ×××¨×¡× ×©×××¡×§× ×fromtitle, fromid ×× fromrev. ××× ××¤×©×¨×××ª ×Ö¾\"to\" ××××¨××ª ×× ×ª××× ××©×¤×¢×.", "apihelp-compare-param-topst": "××¢×©××ª ××ª××¨× ××¤× × ×©×××¨× ×Ö¾totext.", - "apihelp-compare-param-totext": "×××©×ª××© ×××§×¡× ××× ×××§×× ××ª××× ×©× ×××¨×¡× ×©×××××¨ ×Ö¾totitle, toid or torev.", - "apihelp-compare-param-tocontentmodel": "×××× ××ª××× ×©× totext. ×× ×× ×× ×¡××¤×§, ×××¢×©× × ××××© ×¢× ×¡×× ×¤×¨×××¨×× ×××¨××.", - "apihelp-compare-param-tocontentformat": "×ª×¡×××¨ ××¡××¨×ª ×ª××× ×©× fromtext.", + "apihelp-compare-param-toslots": "××¨××¡×ª ×ª××× ×××¨×¡× ×©×¦××× × ×Ö¾totitle, ×Ö¾toid, ×× ×Ö¾torev.\n\n××¤×¨×××¨ ××× ××¦××× ××ª ×××©××¦××ª ×©××©×× ×. ××© ×××©×ª××© ×Ö¾totext-{slot}, ×Ö¾tocontentmodel-{slot}, ××Ö¾tocontentformat-{slot} ××¦××× ×ª××× ×¢×××¨ ×× ××©××¦×ª.", + "apihelp-compare-param-totext-{slot}": "×××§×¡× ×©× ×××©××¦×ª ×©××¦××× ×ª. ×× ×× ×××©××, ×××©××¦×ª ××Ö¼×¡×¨×ª ××××¨×¡×.", + "apihelp-compare-param-tosection-{slot}": "×××©×¨ totext-{slot} ××× ××ª××× ×©× ×¤×¡×§× ×××ª, ××× ××¡×¤×¨ ××¤×¡×§×. ××× ××××× ××ª×× ×××¨×¡× ×©××¦××× ×ª ×Ö¾totitle, ×Ö¾toid, ×× ×Ö¾torev ××× ××¢×¨×××ª ×¤×¡×§×.", + "apihelp-compare-param-tocontentmodel-{slot}": "×××× ××ª××× ×©× totext-{slot}. ×× ×× ×× ×¡××¤×§, ×× ×× ×××© ××¤× ××¤×¨×××¨×× ××××¨××.", + "apihelp-compare-param-tocontentformat-{slot}": "×ª×¡×××¨ ×××¡××¨×ª ×ª××× ×©× totext-{slot}.", + "apihelp-compare-param-totext": "××© ××¦××× toslots=main ××××©×ª××© ×Ö¾totext-main ×××§×× ××.", + "apihelp-compare-param-tocontentmodel": "××© ××¦××× toslots=main ××××©×ª××© ×Ö¾tocontentmodel-main ×××§×× ××.", + "apihelp-compare-param-tocontentformat": "××© ××¦××× toslots=main ××××©×ª××© ×Ö¾tocontentformat-main ×××§×× ××.", "apihelp-compare-param-tosection": "××© ×××©×ª××© ×¨×§ ××¤×¡×§× ×©×¦××× × ××ª××× ×©× ××¤×¨×××¨ 'to'.", "apihelp-compare-param-prop": "×××× ×¤×¨××× ××××¢ ××§××.", "apihelp-compare-paramvalue-prop-diff": "×Ö¾HTML ×©× ×××©××××.", @@ -92,6 +104,7 @@ "apihelp-compare-paramvalue-prop-comment": "××ª×§×¦××¨ ×¢× ××¨×¡×××ª ×Ö¾\"from\" ××Ö¾\"to\".", "apihelp-compare-paramvalue-prop-parsedcomment": "××ª×§×¦××¨ ×××¤××¢× × ×¢× ××¨×¡×××ª ×Ö¾\"from\" ××Ö¾\"to\".", "apihelp-compare-paramvalue-prop-size": "××××× ×©× ××¨×¡×××ª ×Ö¾\"from\" ××Ö¾\"to\".", + "apihelp-compare-param-slots": "××××¨×ª ××©×××××ª ×¤×¨×× ×× ×××©××¦××ª ××××, ××× ××©×××× ×××ª ××©××××ª ××× ×××©××¦××ª.", "apihelp-compare-example-1": "××¦××¨×ª ×ª××¢×× ×©×× ×× ××× ××¨×¡× 1 ×Ö¾2.", "apihelp-createaccount-summary": "××¦××¨×ª ××©××× ××©×ª××© ×××©.", "apihelp-createaccount-param-preservestate": "×× [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] ×××××¨ true ×¢×××¨ hasprimarypreservedstate, ××§×©××ª ×©××¡××× ××ª ××ª××¨ primary-required ××××¨××ª ×××××ª ×××©××××ª. ×× ×××××¨ ×¢×¨× ×× ×¨××§ ×Ö¾preservedusername, ×©× ×××©×ª××© ××× ××©××© ××¤×¨×××¨ username.", @@ -632,6 +645,7 @@ "apihelp-query+blocks-paramvalue-prop-reason": "×××¡×¤×ª ××¡××× ×©× ××ª× × ×××¡×××.", "apihelp-query+blocks-paramvalue-prop-range": "×××¡×¤×ª ×××× ××ª××××ª ×Ö¾IP ×©×××¡××× ××©×¤××¢× ×¢××××.", "apihelp-query+blocks-paramvalue-prop-flags": "××ª××× ××ª ××××¨×× (autoblockâ, anononly, ×××'.).", + "apihelp-query+blocks-paramvalue-prop-restrictions": "×××¡×¤×ª ××××××ª ×××¡××× ××××§××ª ×× ×××¡××× ××× × ××× ×××ª×¨.", "apihelp-query+blocks-param-show": "×××¦×× ×¨×§ ×¤×¨×××× ×©××ª××××× ×××××ª ××××× ××××.\n×××©×, ××× ××¨×××ª ×¨×§ ××¡××××ª ××× ××¦×××ª××ª ×¢× ××ª××××ª IP ××© ××××××¨ $1show=ip|!temp.", "apihelp-query+blocks-example-simple": "×¨×©×××ª ××¡××××ª.", "apihelp-query+blocks-example-users": "×¨×©×××ª ××¡××××ª ×©× ×××©×ª××©×× Alice ×Ö¾Bob.", @@ -852,11 +866,15 @@ "apihelp-query+info-paramvalue-prop-notificationtimestamp": "×××ª×Ö¾××× ×©× ××××¢×ª ×¨×©×××ª ××¢×§× ×©× ×× ××£.", "apihelp-query+info-paramvalue-prop-subjectid": "×××× ×××£ ×©× ×××£ ××¢××§×¨× ×©× ×× ××£ ×©×××.", "apihelp-query+info-paramvalue-prop-url": "× ××ª× URL ×××, URL ××¢×¨××× ×Ö¾URL ×§× ×× × ××× ××£.", - "apihelp-query+info-paramvalue-prop-readable": "××× ×××©×ª××© ×××× ×××¦×× ××£ ××.", + "apihelp-query+info-paramvalue-prop-readable": "××× ×××©×ª××© ×××× ××§×¨×× ××ª ×××£ ×××. ××© ×××©×ª××© ×Ö¾intestactions=read ×××§×× ××.", "apihelp-query+info-paramvalue-prop-preload": "× ××ª× ××ª ×××§×¡× ×©×××××¨ ×¢×Ö¾××× EditFormPreloadText.", "apihelp-query+info-paramvalue-prop-displaytitle": "× ××ª× ××ª ××××¤× ×©×× ×©× ×××£ ××××ª ×××¦×.", "apihelp-query+info-paramvalue-prop-varianttitles": "×××ª×¨×ª ××ª×¦××× ××× ×××¨×¡×××ª ×©× ×©×¤×ª ××ª××× ×©× ×××ª×¨.", "apihelp-query+info-param-testactions": "××××§× ××× ×××©×ª××© ×× ×××× ×××× ×××¦×¢ ×¤×¢××××ª ××¡×××××ª ×¢× ×××£.", + "apihelp-query+info-param-testactionsdetail": "×¨××ª ×¤××¨×× ×©× $1testactions. ××© ×××©×ª××© ××¤×¨×××¨×× errorformat ×Ö¾errorlang ×©× [[Special:ApiHelp/main|×××××× ××¨××©×]] ××× ××©××× ××ª×¡×××¨ ××ª ×××××¢××ª ××××××¨××ª.", + "apihelp-query+info-paramvalue-testactionsdetail-boolean": "××××¨×ª ×¢×¨× ×××××× × ×¢×××¨ ×× ×¤×¢×××.", + "apihelp-query+info-paramvalue-testactionsdetail-full": "××××¨×ª ××××¢××ª ×©××ª××¨××ª ××× ××¤×¢××× ××× × ×××ª×¨×ª, ×× ××¢×¨× ×¨××§ ×× ××× ×××ª×¨×ª.", + "apihelp-query+info-paramvalue-testactionsdetail-quick": "××× full, ××× ××× ××××§××ª ××§×¨××ª.", "apihelp-query+info-param-token": "×××©×ª××© ×Ö¾[[Special:ApiHelp/query+tokens|action=query&meta=tokens]] ×××§××.", "apihelp-query+info-example-simple": "×§×××ª ××××¢ ×¢× ×××£ Main Page", "apihelp-query+info-example-protection": "×§×××ª ××××¢ ×××× ×××××¢ ×¢× ××× × ×©× ×××£ Main Page.", @@ -1447,11 +1465,11 @@ "apihelp-json-param-callback": "×× ×× ×¦×××, ×¢×××£ ××ª ××¤×× ××ª×× ×§×¨×××ª ×¤×× ×§×¦×× × ×ª×× ×. ×××¢× ×××××××ª, ×× ×× ×ª×× ×× ××××××××× ×××©×ª××© ××××××.", "apihelp-json-param-utf8": "×× ×× ×¦×××, ×¨×× ××ª×××× ×©××× × ASCII (××× ×× ××××) ××§×××× ××ª××¨ UTF-8 ×××§×× ×××ª×××£ ××¡××¨××ª ×××××£ ××§×¡××¦××××××ª. ×××ª ××¨×¨×ª ××××× ×× ××¢×¨× ×©× formatversion ××× ×× 1.", "apihelp-json-param-ascii": "×× ×× ×¦×××, ××§××× ××ª ×× ×× ×©××× × ASCII ××¡××¨××ª ×××××£ ××§×¡××¦××××××ª. ×××ª ××¨×¨×ª ××××× ××©Ö¾formatversion ××× 1.", - "apihelp-json-param-formatversion": "×ª×¡×××¨ ××¤××:\n;1:×ª×¡×××¨ ×¢× ×ª×××××ª ××××¨× (×¢×¨××× ×××××× ××× ××¡×× ×× XML, ××¤×ª×××ª * ××¦×××ª× ×ª×××, ×××').\n;2:×ª×¡×××¨ ××××¨× × × ××¡××× ×. ××¤×¨××× ×××××× ×××©×ª× ××ª!\n;latest:×××©×ª××© ××ª×¡×××¨ ××××© ××××ª×¨ (××¨××¢ 2), ×××× ×××©×ª× ××ª ××× ××ª×¨××.", + "apihelp-json-param-formatversion": "×ª×¡×××¨ ××¤××:\n;1:×ª×¡×××¨ ×¢× ×ª×××××ª ××××¨× (×¢×¨××× ×××××× ××× ××¡×× ×× XML, ××¤×ª×××ª * ××¦×××ª× ×ª×××, ×××').\n;2:×ª×¡×××¨ ××××¨× ×.\n;latest:×××©×ª××© ××ª×¡×××¨ ××××© ××××ª×¨ (××¨××¢ 2), ×××× ×××©×ª× ××ª ××× ××ª×¨××.", "apihelp-jsonfm-summary": "××¤××× × ×ª×× ×× ××ª×¡×××¨ JSON (×¢× ×××¤×¡× ××¤× ×Ö¾HTML).", "apihelp-none-summary": "×× ××¤××× ×©×× ×××¨.", "apihelp-php-summary": "××¤××× × ×ª×× ×× ××ª×¡×××¨ PHP ×××¡××¨.", - "apihelp-php-param-formatversion": "×ª×¡×××¨ ××¤××:\n;1:×ª×¡×××¨ ×¢× ×ª×××××ª ××××¨× (×¢×¨××× ×××××× ××× ××¡×× ×× XML, ××¤×ª×××ª * ××¦×××ª× ×ª×××, ×××').\n;2:×ª×¡×××¨ ××××¨× × × ××¡××× ×. ××¤×¨××× ×××××× ×××©×ª× ××ª!\n;latest:×××©×ª××© ××ª×¡×××¨ ××××© ××××ª×¨ (××¨××¢ 2), ×××× ×××©×ª× ××ª ××× ××ª×¨××.", + "apihelp-php-param-formatversion": "×ª×¡×××¨ ××¤××:\n;1:×ª×¡×××¨ ×¢× ×ª×××××ª ××××¨× (×¢×¨××× ×××××× ××× ××¡×× ×× XML, ××¤×ª×××ª * ××¦×××ª× ×ª×××, ×××').\n;2:×ª×¡×××¨ ××××¨× ×.\n;latest:×××©×ª××© ××ª×¡×××¨ ××××© ××××ª×¨ (××¨××¢ 2), ×××× ×××©×ª× ××ª ××× ××ª×¨××.", "apihelp-phpfm-summary": "××¤××× × ×ª×× ×× ××ª×¡×××¨ PHP ×××¡××¨ (×¢× ×××¤×¡× ××¤× ×Ö¾HTML).", "apihelp-rawfm-summary": "××¤××× ××ª ×× ×ª×× ××, ×××× ×××× ××× ×× ××¤×× ×©×××××ª, ××ª×¡×××¨ JSON (×¢× ×××¤×¡× ××¤× ×Ö¾HTML).", "apihelp-xml-summary": "××¤××× × ×ª×× ×× ××ª×¡×××¨ XML.", @@ -1549,6 +1567,7 @@ "apierror-assertnameduserfailed": "×××××§× ×©×××©×ª××© ××× \"$1\" × ××©××.", "apierror-assertuserfailed": "×××××§× ×©×××©×ª××© × ×× ×¡ ×××©××× × ××©××.", "apierror-autoblocked": "××ª×××ª ×Ö¾IP ×©×× × ××¡×× ××××××××ª, ×× ××× ×©×××©× ××©×ª××© ××¡××.", + "apierror-bad-badfilecontexttitle": "×××ª×¨×ª ×××ª×Ö¾×ª×§×× × ××¤×¨×××¨ $1badfilecontexttitle.", "apierror-badconfig-resulttoosmall": "××¢×¨× ×©× $wgAPIMaxResultSize ×××××§× ××× ×§×× ×××××××§ ××××¢ ××¡××¡× ×¢× ×ª××¦××.", "apierror-badcontinue": "×¤×¨×××¨ continue ×××ª×Ö¾×ª×§××. ××© ×××¢×××¨ ××ª ××¢×¨× ×××§××¨× ×©×××××¨× ××©××××ª× ××§××××ª.", "apierror-baddiff": "×× × ××ª× ×××××¨ ××ª ×××©××××. ××¨×¡× ×××ª ×× ×§××××ª ×× ×©×©×ª××× ×× ×§×××××ª, ×× ×©××× ×× ××¨×©×× ×××¦×× ×××ª×.", @@ -1572,6 +1591,7 @@ "apierror-bad-watchlist-token": "×¡××¤×§ ××¡×××× ×¨×©×××ª ××¢×§× ×××ª×Ö¾×ª×§××. × × ×××©×ª××© ×××¡×××× ×ª×§×× ×Ö¾[[Special:Preferences]].", "apierror-blockedfrommail": "× ××¡××ª ××©××××ª ××××´×.", "apierror-blocked": "× ××¡××ª ××¢×¨×××.", + "apierror-blocked-partial": "× ××¡××ª ××¢×¨×××ª ×××£ ×××.", "apierror-botsnotsupported": "××××©×§ ××× ×× × ×ª×× ×¢×××¨ ×××××.", "apierror-cannot-async-upload-file": "××¤×¨×××¨×× async ×Ö¾file ××× × ×××××× ×××××ª ××©×××××. ×× ××¨×¦×× × ×××¦×¢ ×¢×××× ××¡×× ××¨×× × ×©× ××§×××¥ ××××¢×× ×©××, ××© ×××¢×××ª ×××ª× ×ª×××× ××¡×××§ (××××¦×¢××ª ××¤×¨×××¨ stash) ××× ××¤×¨×¡× ××ª ××§×××¥ ××××¡××§ ××××¤× ××¡×× ××¨×× × (××××¦×¢××ª filekey ×Ö¾async).", "apierror-cannotreauthenticate": "××¤×¢××× ××××ª ××× × ×××× ×, ×× ×××××ª ×©×× ×× ××××× ×××××ª ×××××ª×ª.", @@ -1588,9 +1608,14 @@ "apierror-changeauth-norequest": "××¦××¨×ª ××§×©×ª ××©×× ×× × ××©××.", "apierror-chunk-too-small": "×××× ××¤×× ××××¢×¨× ××× {{PLURAL:$1|×××ª ×××|$1 ××ª××}} ××©××× ×¤×××× ×× ×¡××¤×××.", "apierror-cidrtoobroad": "××××× CIDR ×©× $1 ×©×¨×××× ×××ª×¨ ×Ö¾/$2 ××× × ×§×××××.", + "apierror-compare-maintextrequired": "××¤×¨×××¨ $1text-main × ××¨×© ×××©×¨ $1slots ×××× main (×× × ××ª× ×××××§ ××ª ×××©××¦×ª ××¨××©××ª).", "apierror-compare-no-title": "×× × ××ª× ××¢×©××ª ××ª××¨× ××¤× × ×©×××¨× ××× ×××ª×¨×ª. × × ×× ×¡××ª ××¦××× fromtitle ×× totitle.", "apierror-compare-nosuchfromsection": "××¤×¡×§× $1 ××× × ×§××××ª ××ª××× ×©× 'from'.", "apierror-compare-nosuchtosection": "××¤×¡×§× $1 ××× × ×§××××ª ××ª××× ×©× 'to'.", + "apierror-compare-nofromrevision": "××× ××¨×¡×ª \"from\". ××© ××¦××× fromrevâ, fromtitle, ×× fromid.", + "apierror-compare-notext": "××¤×¨×××¨ $1 ××× × ×××× ××©××© ××× $2.", + "apierror-compare-notorevision": "××× ××¨×¡×ª \"to\". ××© ××¦××× torevâ, totitle, ×× toid.", + "apierror-compare-relative-to-deleted": "×× × ××ª× ×××©×ª××© ×Ö¾torelative=$1 ×××¡××ª ×××¨×¡× ××××§×.", "apierror-compare-relative-to-nothing": "××× ××¨×¡×ª \"from\" ×¢×××¨ torelative ×©×ª××× ×××¡××ª.", "apierror-contentserializationexception": "××¡××¨×ª ××ª××× × ××©××: $1", "apierror-contenttoobig": "××ª××× ×©×¡××¤×§×ª ×××¨× ××××× ××¢×¨× ×××¨×× ×©× {{PLURAL:$1|×§××××××× ×××|$1 ×§×××××××××}}.", @@ -1619,6 +1644,7 @@ "apierror-invalidexpiry": "××× ×ª×¤××× ×××ª×Ö¾×ª×§×× \"$1\".", "apierror-invalid-file-key": "×× ××¤×ª× ×§×××¥ ×ª×§××.", "apierror-invalidlang": "×§×× ×©×¤× ×××ª×Ö¾×ª×§×× ××¤×¨×××¨ $1.", + "apierror-invalidmethod": "×©×××ª HTTP ×××ª×Ö¾×ª×§×× ×. × × ××©×§×× ×××©×ª××© ×Ö¾GET ×× ×Ö¾POST.", "apierror-invalidoldimage": "××¤×¨×××¨ oldimage × ×©×× ××ª×¡×××¨ ×××ª×Ö¾×ª×§××.", "apierror-invalidparammix-cannotusewith": "××¤×¨×××¨ $1 ××× × ×××× ××©××© ×¢× $2.", "apierror-invalidparammix-mustusewith": "××¤×¨×××¨ $1 ×××× ××©××© ×¨×§ ×¢× $2.", @@ -1638,6 +1664,7 @@ "apierror-mimesearchdisabled": "×××¤××© MIME ×××× ×××¦× ×§××¦×.", "apierror-missingcontent-pageid": "×ª××× ××¡×¨ ×¢×××¨ ×××× ×××£ $1.", "apierror-missingcontent-revid": "×ª××× ××¡×¨ ×¢×××¨ ×××× ×××¨×¡× $1.", + "apierror-missingcontent-revid-role": "×ª××× ××¡×¨ ××××¨ ×××× ××¨×¡× $1 ××ª×¤×§×× $2.", "apierror-missingparam-at-least-one-of": "××¨××© {{PLURAL:$2|××¤×¨×××¨|××¤×××ª ××× ×××¤×¨×××¨××}} $1.", "apierror-missingparam-one-of": "××¨××© {{PLURAL:$2|××¤×¨×××¨|××× ×××¤×¨×××¨××}} $1.", "apierror-missingparam": "××¤×¨×××¨ $1 ×¦×¨×× ×××××ª ×××××¨.", @@ -1746,6 +1773,8 @@ "apiwarn-badurlparam": "×× ××× ××¤×©×¨ ××¤×¢× × ××ª $1urlparam ×¢×××¨ $2. ××©×ª××©×× ×¨×§ ×Ö¾width ×Ö¾height.", "apiwarn-badutf8": "××¢×¨× ×©×××¢××¨ ×Ö¾$1 ×××× × ×ª×× ×× ×××ª×Ö¾×ª×§×× ×× ×× ×××ª×Ö¾×× ××¨××××. × ×ª×× ×× ××§×¡× ××××¨×× ×××××ª ×ª×§×× ××, ×× ××¨××× NFC ×××× ×ª××× ××§×¨× C0 ×××¢× HT (\\t)‏, LF (\\n)‏ ×Ö¾CR (\\r).", "apiwarn-checktoken-percentencoding": "× × ×××××§ ×©×¡××× ×× ××× \"+\" ×××¡×××× ××§××××× ×¢× ×××××× ××¦××¨× × ××× × ×Ö¾URL.", + "apiwarn-compare-no-next": "×××¨×¡× $2 ××× ×××¨×¡× ××××¨×× × ×©× $1, ××× ××¨×¡× ×¢×××¨ torelative=next ×××©××××.", + "apiwarn-compare-no-prev": "×××¨×¡× $2 ××× ×××¨×¡× ××××§×××ª ××××ª×¨ ×©× $1, ××× ××¨×¡× ×¢×××¨ torelative=prev ×××©××××.", "apiwarn-compare-nocontentmodel": "×× ××× ××¤×©×¨ ××§×××¢ ××ª ×××× ××ª×××, × × ×× ×©×× $1.", "apiwarn-deprecation-deletedrevs": "list=deletedrevs ×××¦××¨ ××ª××¨ ××××©×. × × ×××©×ª××© ×Ö¾ prop=deletedrevisions ×× ×Ö¾list=alldeletedrevisions ×××§×× ××.", "apiwarn-deprecation-httpsexpected": "××©××© HTTP ××©××× ×¦×¤×× HTTPS.", diff --git a/includes/api/i18n/hu.json b/includes/api/i18n/hu.json index 1211693b63..4258674e11 100644 --- a/includes/api/i18n/hu.json +++ b/includes/api/i18n/hu.json @@ -38,6 +38,9 @@ "apihelp-block-param-allowusertalk": "A felhasznÃ¡lÃ³ szerkeszthesse a sajÃ¡t vitalapjÃ¡t (a [[mw:Special:MyLanguage/Manual:$wgBlockAllowsUTEdit|$wgBlockAllowsUTEdit]] beÃ¡llÃtÃ¡stÃ³l fÃ¼gg).", "apihelp-block-param-reblock": "Jelenlegi blokk felÃ¼lÃrÃ¡sa, ha a felhasznÃ¡lÃ³ mÃ¡r blokkolva van.", "apihelp-block-param-watchuser": "A szerkesztÅ vagy IP-cÃm szerkesztÅi- Ã©s vitalapjÃ¡nak figyelÃ©se.", + "apihelp-block-param-tags": "A blokknaplÃ³ naplÃ³bejegyzÃ©sÃ©re Ã©rvÃ©nyesÃtendÅ vÃ¡ltoztatÃ¡scÃmkÃ©k.", + "apihelp-block-param-partial": "Teljes blokk helyett a felhasznÃ¡lÃ³ eltiltÃ¡sa bizonyos lapok vagy nÃ©vterek szerkesztÃ©sÃ©tÅl.", + "apihelp-block-param-pagerestrictions": "A felhasznÃ¡lÃ³ szÃ¡mÃ¡ra blokkolandÃ³ cÃmek listÃ¡ja. Csak akkor van hatÃ¡sa, ha a partial igaz.", "apihelp-block-example-ip-simple": "A 192.0.2.5 IP-cÃm blokkolÃ¡sa hÃ¡rom napra First strike indoklÃ¡ssal.", "apihelp-block-example-user-complex": "Vandal blokkolÃ¡sa hatÃ¡rozatlan idÅre Vandalism indoklÃ¡ssal, Ãºj fiÃ³k lÃ©trehozÃ¡sÃ¡nak Ã©s e-mail kÃ¼ldÃ©sÃ©nek megakadÃ¡lyozÃ¡sa.", "apihelp-checktoken-summary": "Egy [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] kÃ©rÃ©ssel szerzett token Ã©rvÃ©nyessÃ©gÃ©nek vizsgÃ¡lata.", diff --git a/includes/api/i18n/ja.json b/includes/api/i18n/ja.json index 5bccabfdab..c13a10ede0 100644 --- a/includes/api/i18n/ja.json +++ b/includes/api/i18n/ja.json @@ -44,6 +44,7 @@ "apihelp-block-param-reblock": "ãã®å©ç¨èããã§ã«ãããã¯ããã¦ããå ´åããããã¯ãä¸æ¸ããã¾ãã", "apihelp-block-param-watchuser": "ãã®å©ç¨èã¾ãã¯IPã¢ãã¬ã¹ã®å©ç¨èãã¼ã¸ã¨ãã¼ã¯ãã¼ã¸ãã¦ã©ãããã¾ãã", "apihelp-block-param-tags": "ãããã¯è¨é²ã®é ç®ã«é©ç¨ããå¤æ´ã¿ã°ã", + "apihelp-block-param-partial": "ãµã¤ãå¨ä½ã§ã¯ãªãç¹å®ã®ãã¼ã¸ã¾ãã¯ååç©ºéã§ã®ç·¨éããããã¯ãã¾ãã", "apihelp-block-example-ip-simple": "IPã¢ãã¬ã¹ 192.0.2.5 ã First strike ã¨ããçç±ã§3æ¥ãããã¯ãã", "apihelp-block-example-user-complex": "å©ç¨è Vandal ã Vandalism ã¨ããçç±ã§ç¡æéãããã¯ããæ°ããªã¢ã«ã¦ã³ãä½æã¨ã¡ã¼ã«ã®éä¿¡ãç¦æ¢ããã", "apihelp-changeauthenticationdata-summary": "ç¾å¨ã®å©ç¨èã®èªè¨¼ãã¼ã¿ãå¤æ´ãã¾ãã", @@ -65,13 +66,16 @@ "apihelp-compare-param-fromrev": "æ¯è¼ãã1ã¤ç®ã®çã", "apihelp-compare-param-frompst": "fromtext-{slot}ã«ä¿ååå¤æãè¡ãã¾ãã", "apihelp-compare-param-fromtext": "fromslots=mainãæå®ããä»£ããã«fromtext-main ãä½¿ç¨ãã¦ãã ããã", - "apihelp-compare-param-fromcontentmodel": "fromtextã®ã³ã³ãã³ãã¢ãã«ãæå®ããã¦ããªãå ´åã¯ãä»ã®ãã©ã¡ã¼ã¿ã«åºã¥ãã¦æ¨æ¸¬ããã¾ãã", + "apihelp-compare-param-fromcontentmodel": "fromslots=mainãæå®ããä»£ããã«fromcontentmodel-main ãä½¿ç¨ãã¦ãã ããã", + "apihelp-compare-param-fromcontentformat": "fromslots=mainãæå®ããä»£ããã«fromcontentformat-main ãä½¿ç¨ãã¦ãã ããã", "apihelp-compare-param-fromsection": "'from' ã®åå®¹ã®ãã¡æå®ãããç¯ã®ã¿ãä½¿ç¨ãã¾ãã", "apihelp-compare-param-totitle": "æ¯è¼ãã2ã¤ç®ã®ãã¼ã¸åã", "apihelp-compare-param-toid": "æ¯è¼ãã2ã¤ç®ã®ãã¼ã¸IDã", "apihelp-compare-param-torev": "æ¯è¼ãã2ã¤ç®ã®çã", "apihelp-compare-param-topst": "totextã«ä¿ååå¤æãè¡ãã¾ãã", - "apihelp-compare-param-tocontentmodel": "totext ã®ã³ã³ãã³ãã¢ãã«ãæå®ããã¦ããªãå ´åã¯ãä»ã®ãã©ã¡ã¼ã¿ã«åºã¥ãã¦æ¨æ¸¬ããã¾ãã", + "apihelp-compare-param-totext": "toslots=mainãæå®ããä»£ããã«totext-main ãä½¿ç¨ãã¦ãã ããã", + "apihelp-compare-param-tocontentmodel": "toslots=mainãæå®ããä»£ããã«tocontentmodel-main ãä½¿ç¨ãã¦ãã ããã", + "apihelp-compare-param-tocontentformat": "toslots=mainãæå®ããä»£ããã«tocontentformat-main ãä½¿ç¨ãã¦ãã ããã", "apihelp-compare-param-tosection": "'to' ã®åå®¹ã®ãã¡æå®ãããç¯ã®ã¿ãä½¿ç¨ãã¾ãã", "apihelp-compare-param-prop": "ã©ã®æå ±ãåå¾ããã:", "apihelp-compare-paramvalue-prop-diff": "å·®åHTMLã", @@ -1054,6 +1058,7 @@ "apierror-permissiondenied": "$1ã«å¿è¦ãªæ¨©éãããã¾ããã", "apierror-permissiondenied-generic": "ã¢ã¯ã»ã¹ãæå¦ããã¾ããã", "apierror-readonly": "ã¦ã£ãã¯ç¾å¨èªã¿åãå°ç¨ã¢ã¼ãã§ãã", + "apierror-revwrongpage": "ç $1 ã¯ $2 ã®çã§ã¯ããã¾ããã", "apierror-timeout": "ãµã¼ãã¼ãæ±ºããããæéåã«å¿çãã¾ããã§ããã", "apierror-unknownerror-editpage": "ä¸æãªç·¨éãã¼ã¸ã®ã¨ã©ã¼:$1", "apierror-unknownerror-nocode": "ä¸æãªã¨ã©ã¼ã§ãã", diff --git a/includes/api/i18n/ko.json b/includes/api/i18n/ko.json index b9f8868f2d..3ff6f2fdba 100644 --- a/includes/api/i18n/ko.json +++ b/includes/api/i18n/ko.json @@ -863,6 +863,7 @@ "apierror-invalidcategory": "ìë ¥í ë¶ë¥ ì´ë¦ì´ ì¬ë°ë¥´ì§ ììµëë¤.", "apierror-invalidexpiry": "ìëª»ë ë§ë£ ê¸°í \"$1\".", "apierror-invalid-file-key": "ì í¨í íì¼ í¤ê° ìëëë¤.", + "apierror-invalidmethod": "ì í¨íì§ ìì HTTP ë©ìëìëë¤. GET ëë POSTì ì¬ì©ì ê³ ë ¤íììì¤.", "apierror-invalidoldimage": "oldimage ë³ìì ì í¨íì§ ìì íìì´ ììµëë¤.", "apierror-invalidparammix-cannotusewith": "$1 ë³ìë $2ì(ê³¼) í¨ê» ì¬ì©í ì ììµëë¤.", "apierror-invalidsection": "section ë³ìë ì í¨í ì¹ì ID ëë newì´ì´ì¼ í©ëë¤.", diff --git a/includes/api/i18n/mk.json b/includes/api/i18n/mk.json index 562f2165b5..56826b4c25 100644 --- a/includes/api/i18n/mk.json +++ b/includes/api/i18n/mk.json @@ -6,7 +6,7 @@ "Vlad5250" ] }, - "apihelp-main-extended-description": "\n* [[mw:API:Main_page|ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°]]\n* [[mw:API:FAQ|Ð§ÐÐ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api ÐÐ¾ÑÑÐµÐ½ÑÐºÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Ð¡Ð¾Ð¾Ð¿ÑÑÐµÐ½Ð¸ÑÐ° Ð·Ð° ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R ÐÑÐµÑÐºÐ¸ Ð¸ Ð±Ð°ÑÐ°ÑÐ°]\n \nÐ¡ÑÐ°ÑÑÑ: Ð¡Ð¸ÑÐµ ÑÑÐ°Ð²ÐºÐ¸ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°Ð²Ð° Ð±Ð¸ ÑÑÐµÐ±Ð°Ð»Ð¾ Ð´Ð° ÑÐ°Ð±Ð¾ÑÐ°Ñ, Ð½Ð¾ ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ ÑÐµÐ¿Ð°Ðº Ðµ Ð²Ð¾ Ð°ÐºÑÐ¸Ð²Ð½Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ°, ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸ Ð´ÐµÐºÐ° Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð²Ð¾ ÑÐµÐºÐ¾Ðµ Ð²ÑÐµÐ¼Ðµ. ÐÐ±ÑÐ°Ð²Ð¸ÑÐµ Ð·Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð³Ð¸ Ð´Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµ Ð°ÐºÐ¾ ÑÐµ Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ Ð½Ð° [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ¸Ð¾Ñ ÑÐ¿Ð¸ÑÐ¾Ðº âthe mediawiki-api-announceâ].\n\nÐÐ¾Ð³ÑÐµÑÐ½Ð¸ Ð±Ð°ÑÐ°ÑÐ°: ÐÐ¾Ð³Ð° ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ ÑÐµ Ð´Ð¾Ð±Ð¸Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð¸ Ð±Ð°ÑÐ°ÑÐ°, ÑÐµ ÑÐµ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ HTTP-Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ ÑÐ¾ ÐºÐ»ÑÑÐ¾Ñ âMediaWiki-API-Errorâ Ð¸ Ð¿Ð¾ÑÐ¾Ð° Ð½Ð° Ð²ÑÐµÐ´Ð½Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð¸ ÑÐ¸ÑÑÐ°ÑÐ° Ð½Ð° Ð³ÑÐµÑÐºÐ°ÑÐ° ÑÑÐ¾ ÑÐµ ÑÐµ Ð¿Ð¾ÑÐ°Ð²Ð°Ñ ÑÐµ Ð¸Ð¼ Ð±Ð¸Ð´Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð° Ð¸ÑÑÐ°ÑÐ° Ð²ÑÐµÐ´Ð½Ð¾ÑÑ. ÐÐÐ²ÐµÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ ÑÐµ Ð½Ð°ÑÐ´ÐµÑÐµ Ð½Ð° [[mw:API:Errors_and_warnings|ÐÐ·Ð²ÑÑÐ½Ð¸Ðº: ÐÑÐµÑÐºÐ¸ Ð¸ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐ°]].", + "apihelp-main-extended-description": "\n* [[mw:API:Main_page|ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°]]\n* [[mw:API:FAQ|Ð§ÐÐ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api ÐÐ¾ÑÑÐµÐ½ÑÐºÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Ð¡Ð¾Ð¾Ð¿ÑÑÐµÐ½Ð¸ÑÐ° Ð·Ð° ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R ÐÑÐµÑÐºÐ¸ Ð¸ Ð±Ð°ÑÐ°ÑÐ°]\n \nÐ¡ÑÐ°ÑÑÑ: Ð¡Ð¸ÑÐµ ÑÑÐ°Ð²ÐºÐ¸ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°Ð²Ð° Ð±Ð¸ ÑÑÐµÐ±Ð°Ð»Ð¾ Ð´Ð° ÑÐ°Ð±Ð¾ÑÐ°Ñ, Ð½Ð¾ ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ ÑÐµÐ¿Ð°Ðº Ðµ Ð²Ð¾ Ð°ÐºÑÐ¸Ð²Ð½Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ°, ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸ Ð´ÐµÐºÐ° Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð²Ð¾ ÑÐµÐºÐ¾Ðµ Ð²ÑÐµÐ¼Ðµ. ÐÐ±ÑÐ°Ð²Ð¸ÑÐµ Ð·Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð³Ð¸ Ð´Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµ Ð°ÐºÐ¾ ÑÐµ Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ Ð½Ð° [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ¸Ð¾Ñ ÑÐ¿Ð¸ÑÐ¾Ðº âthe mediawiki-api-announceâ].\n\nÐÐ¾Ð³ÑÐµÑÐ½Ð¸ Ð±Ð°ÑÐ°ÑÐ°: ÐÐ¾Ð³Ð° ÐÐ·Ð²ÑÑÐ½Ð¸ÐºÐ¾Ñ ÑÐµ Ð´Ð¾Ð±Ð¸Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð¸ Ð±Ð°ÑÐ°ÑÐ°, ÑÐµ ÑÐµ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ HTTP-Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ ÑÐ¾ ÐºÐ»ÑÑÐ¾Ñ âMediaWiki-API-Errorâ Ð¸ Ð¿Ð¾ÑÐ¾Ð° Ð½Ð° Ð²ÑÐµÐ´Ð½Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð¸ ÑÐ¸ÑÑÐ°ÑÐ° Ð½Ð° Ð³ÑÐµÑÐºÐ°ÑÐ° ÑÑÐ¾ ÑÐµ ÑÐµ Ð¿Ð¾ÑÐ°Ð²Ð°Ñ ÑÐµ Ð¸Ð¼ Ð±Ð¸Ð´Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð° Ð¸ÑÑÐ°ÑÐ° Ð²ÑÐµÐ´Ð½Ð¾ÑÑ. ÐÐ¾Ð²ÐµÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ ÑÐµ Ð½Ð°ÑÐ´ÐµÑÐµ Ð½Ð° [[mw:API:Errors_and_warnings|ÐÐ·Ð²ÑÑÐ½Ð¸Ðº: ÐÑÐµÑÐºÐ¸ Ð¸ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐ°]].", "apihelp-main-param-action": "ÐÐ¾Ðµ Ð´ÐµÑÑÑÐ²Ð¾ Ð´Ð° ÑÐµ Ð¸Ð·Ð²ÑÑÐ¸.", "apihelp-main-param-format": "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð½Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ.", "apihelp-main-param-maxlag": "ÐÐ°ÑÐ³Ð¾Ð»ÐµÐ¼Ð¸Ð¾Ñ Ð´Ð¾Ð¿ÑÑÑÐµÐ½ Ð·Ð°Ð¾ÑÑÐ°ÑÐ¾Ðº Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ¸ ÐºÐ¾Ð³Ð° ÐÐµÐ´Ð¸ÑÐ°ÐÐ¸ÐºÐ¸ Ðµ Ð²Ð¾ÑÐ¿Ð¾ÑÑÐ°Ð²ÐµÐ½ Ð½Ð° Ð³ÑÐ¾Ð·Ð´ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½ Ð¾Ð´ Ð±Ð°Ð·Ð°ÑÐ°. ÐÐ° Ð´Ð° ÑÐ¿ÑÐµÑÐ¸ÑÐµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ Ð·Ð°Ð¾ÑÑÐ°ÑÐ¾ÑÐ¸ Ð¾Ð´ Ð´ÐµÑÑÑÐ²Ð°, Ð¾Ð²Ð¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ Ð¼Ñ Ð½Ð°Ð»Ð¾Ð¶ÑÐ²Ð° Ð½Ð° ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ñ Ð´Ð° Ð¿Ð¾ÑÐµÐºÐ° Ð´Ð¾Ð´ÐµÐºÐ° Ð·Ð°Ð¾ÑÑÐ°ÑÐ¾ÐºÐ¾Ñ Ð½Ðµ ÑÐµ Ð½Ð°Ð¼Ð°Ð»Ð¸ Ð¿Ð¾Ð´ ÑÐºÐ°Ð¶Ð°Ð½Ð°ÑÐ° Ð²ÑÐµÐ´Ð½Ð¾ÑÑ. ÐÐ¾ ÑÐ»ÑÑÐ°Ñ Ð½Ð° Ð¿ÑÐµÐ³Ð¾Ð»ÐµÐ¼ Ð·Ð°Ð¾ÑÑÐ°ÑÐ¾Ðº, ÑÐ¸ÑÑÐµÐ¼Ñ ÑÐ° Ð´Ð°Ð²Ð° Ð³ÑÐµÑÐºÐ°ÑÐ° ÑÐ¾ ÐºÐ¾Ð´ maxlag ÑÐ¾ Ð¿Ð¾ÑÐ°ÐºÐ° Ð¾Ð´ Ð¾Ð±Ð»Ð¸ÐºÐ¾Ñ ÐÐ¾ ÑÐµÐºÐ°Ð¼ $host: Ð¸Ð¼Ð° Ð·Ð°Ð¾ÑÑÐ°ÑÐ¾Ðº Ð¾Ð´ $lag ÑÐµÐºÑÐ½Ð´Ð¸. ÐÐ¾Ð³Ð». [[mw:Manual:Maxlag_parameter|ÐÑÐ¸ÑÐ°ÑÐ½Ð¸Ðº: ÐÐ°ÑÐ°Ð¼ÐµÑÐ°Ñ Maxlag]]", @@ -81,7 +81,7 @@ "apihelp-edit-param-tags": "ÐÐ·Ð½Ð°ÐºÐ¸ Ð·Ð° Ð¸Ð·Ð¼ÐµÐ½Ð° ÑÑÐ¾ ÑÐµ Ð¾Ð´Ð½ÐµÑÑÐ²Ð°Ð°Ñ Ð½Ð° Ð¿ÑÐµÑÐ°Ð±Ð¾ÑÐºÐ°ÑÐ°.", "apihelp-edit-param-minor": "Ð¡Ð¸ÑÐ½Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµ.", "apihelp-edit-param-notminor": "ÐÐµÑÐ¸ÑÐ½Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµ.", - "apihelp-edit-param-bot": "ÐÐ·Ð½Ð°ÑÐ¸ Ð³Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµÐ²Ð¾ ÐºÐ°ÐºÐ¾ Ð±Ð¾ÑÐ¾Ð²ÑÐºÐ¾.", + "apihelp-edit-param-bot": "ÐÐ·Ð½Ð°ÑÐ¸ Ð³Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµÑÐ¾ ÐºÐ°ÐºÐ¾ Ð±Ð¾ÑÐ¾Ð²ÑÐºÐ¾.", "apihelp-edit-param-basetimestamp": "ÐÐ°ÑÑÐ¼ Ð¸ Ð²ÑÐµÐ¼Ðµ Ð½Ð° Ð¿ÑÐµÑÐ°Ð±Ð¾ÑÐºÐ°ÑÐ° Ð½Ð° Ð±Ð°Ð·Ð°ÑÐ°, ÐºÐ¾Ð¸ ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Ð·Ð° ÑÑÐ²ÑÐ´ÑÐ²Ð°ÑÐµ Ð½Ð° ÑÐ¿ÑÐ¾ÑÐ¸ÑÑÐ°Ð²ÐµÐ½Ð¾ÑÑÐ¸ Ð²Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµÑÐ¾. ÐÐ¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð´Ð¾Ð±Ð¸Ðµ Ð¿ÑÐµÐºÑ [[Special:ApiHelp/query+revisions|action=query&prop=revisions&rvprop=timestamp]].", "apihelp-edit-param-starttimestamp": "ÐÐ°ÑÑÐ¼ Ð¸ Ð²ÑÐµÐ¼Ðµ ÐºÐ¾Ð³Ð° ÑÑÐµ Ð¿Ð¾ÑÐ½Ð°Ð»Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµÑÐ¾, ÐºÐ¾Ð¸ ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Ð·Ð° ÑÑÐ²ÑÐ´ÑÐ²Ð°ÑÐµ Ð½Ð° ÑÐ¿ÑÐ¾ÑÐ¸ÑÑÐ°Ð²ÐµÐ½Ð¾ÑÑÐ¸ Ð²Ð¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐ°ÑÐ°. Ð¡Ð¾Ð¾Ð´Ð²ÐµÑÐ½Ð°ÑÐ° Ð²ÑÐµÐ´Ð½Ð¾ÑÑ ÑÐµ Ð´Ð¾Ð±Ð¸Ð²Ð° ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ [[Special:ApiHelp/main|curtimestamp]] ÐºÐ¾Ð³Ð° ÑÐµ Ð¿Ð¾ÑÐ½ÐµÑÐµ ÑÐ¾ ÑÑÐµÐ´ÑÐ²Ð°ÑÐµ (Ð½Ð° Ð¿Ñ. ÐºÐ¾Ð³Ð° ÑÐµ ÑÐµ Ð²ÑÐ¸ÑÐ° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°ÑÐ° ÑÑÐ¾ ÑÐµ ÑÐ° ÑÑÐµÐ´ÑÐ²Ð°ÑÐµ).", "apihelp-edit-param-recreate": "ÐÐ°Ð½ÐµÐ¼Ð°ÑÐ¸ Ð³Ð¸ Ð³ÑÐµÑÐºÐ¸ÑÐµ ÑÑÐ¾ ÑÐµ Ð¿Ð¾ÑÐ°Ð²ÑÐ²Ð°Ð°Ñ Ð²Ð¾ Ð²ÑÑÐºÐ° ÑÐ¾ ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° ÑÑÐ¾ Ðµ Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð½Ð° Ð²Ð¾ Ð¼ÐµÑÑÐ²ÑÐµÐ¼Ðµ.", @@ -359,11 +359,11 @@ "apihelp-json-param-callback": "ÐÐºÐ¾ Ðµ ÑÐºÐ°Ð¶Ð°Ð½Ð¾, Ð³Ð¾ Ð¾Ð±Ð²Ð¸Ð²Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ Ð²Ð¾ Ð´Ð°Ð´ÐµÐ½ Ð¿Ð¾Ð²Ð¸Ðº Ð½Ð° ÑÑÐ½ÐºÑÐ¸ÑÐ°. ÐÐ° Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ, ÑÐµ ÑÐµ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐ°Ñ ÑÐ¸ÑÐµ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ ÑÑÐ¾ ÑÐµ Ð¾Ð´Ð½ÐµÑÑÐ²Ð°Ð°Ñ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ.", "apihelp-json-param-utf8": "ÐÐºÐ¾ Ðµ ÑÐºÐ°Ð¶Ð°Ð½Ð¾, Ð³Ð¸ ÑÐ¸ÑÑÐ¸ÑÐ° Ð½Ð°ÑÐ²ÐµÑÐµÑÐ¾ (Ð½Ð¾ Ð½Ðµ ÑÐ¸ÑÐµ) Ð½Ðµ-ASCII Ð·Ð½Ð°ÑÐ¸ ÐºÐ°ÐºÐ¾ UTF-8 Ð½Ð°Ð¼ÐµÑÑÐ¾ Ð´Ð° Ð³Ð¸ Ð·Ð°Ð¼ÐµÐ½ÑÐ²Ð° ÑÐ¾ ÑÐµÐºÑÐ°Ð´ÐµÑÐ¸Ð¼Ð°Ð»Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ð´Ð½Ð¸ Ð½Ð¸Ð·Ð¸. ÐÐ²Ð° Ðµ ÑÑÐ°Ð½Ð´Ð°ÑÐ´Ð½Ð¾ ÐºÐ¾Ð³Ð° formatversion Ð½Ðµ Ðµ 1.", "apihelp-json-param-ascii": "ÐÐºÐ¾ Ðµ ÑÐºÐ°Ð¶Ð°Ð½Ð¾, Ð³Ð¸ ÑÐ¸ÑÑÐ¸ÑÐ° ÑÐ¸ÑÐµ Ð½Ðµ-ASCII Ð·Ð½Ð°ÑÐ¸ ÐºÐ°ÐºÐ¾ ÑÐµÐºÑÐ°Ð´ÐµÑÐ¸Ð¼Ð°Ð»Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ð´Ð½Ð¸ Ð½Ð¸Ð·Ð¸. ÐÐ²Ð° Ðµ ÑÑÐ°Ð½Ð´Ð°ÑÐ´Ð½Ð¾ ÐºÐ¾Ð³Ð° formatversion is 1.", - "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ°ÑÐµ Ð½Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ:\n;1:ÐÐ°Ð·Ð°Ð´Ð½Ð¾-ÑÐºÐ»Ð°Ð´ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ (Ð±ÑÐ»Ð¾Ð²Ð¸ Ð²Ð¾ XML-ÑÑÐ¸Ð», ÐºÐ»ÑÑÐµÐ²Ð¸ * Ð·Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½ÑÐºÐ¸ ÑÐ°Ð·Ð»Ð¸ Ð¸ ÑÐ½.).\n;2:ÐÑÐ¾Ð±ÐµÐ½ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐ¾ÐµÐ´Ð¸Ð½Ð¾ÑÑÐ¸ÑÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð°Ñ!\n;Ð½Ð°ÑÐ½Ð¾Ð²:ÐÐ¾ÑÐ¸ÑÑÐµÑÐµ Ð½Ð° Ð½Ð°ÑÐ½Ð¾Ð²Ð¸Ð¾Ñ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐºÐ¾Ð²Ð½Ð¾ 2), Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐµ.", + "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ°ÑÐµ Ð½Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ:\n;1:ÐÐ°Ð·Ð°Ð´Ð½Ð¾-ÑÐºÐ»Ð°Ð´ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ (Ð±ÑÐ»Ð¾Ð²Ð¸ Ð²Ð¾ XML-ÑÑÐ¸Ð», ÐºÐ»ÑÑÐµÐ²Ð¸ * Ð·Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½ÑÐºÐ¸ ÑÐ°Ð·Ð»Ð¸ Ð¸ ÑÐ½.).\n;2:ÐÑÐ¾Ð±ÐµÐ½ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ.\n;latest:ÐÐ¾ÑÐ¸ÑÑÐµÑÐµ Ð½Ð° Ð½Ð°ÑÐ½Ð¾Ð²Ð¸Ð¾Ñ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐºÐ¾Ð²Ð½Ð¾ 2), Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐµ.", "apihelp-jsonfm-summary": "ÐÐ°Ð²Ð°Ñ Ð³Ð¾ Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ Ð²Ð¾ JSON-ÑÐ¾ÑÐ¼Ð°Ñ (Ð¿Ð¾Ð´Ð¾Ð±ÑÐµÐ½ Ð¸ÑÐ¿Ð¸Ñ Ð²Ð¾ HTML).", "apihelp-none-summary": "ÐÐµ Ð´Ð°Ð²Ð°Ñ Ð¸Ð·Ð²Ð¾Ð´.", "apihelp-php-summary": "ÐÐ°Ð²Ð°Ñ Ð³Ð¾ Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ Ð²Ð¾ ÑÐµÑÐ¸ÑÐ°Ð»Ð¸Ð·Ð¸ÑÐ°Ð½ PHP-ÑÐ¾ÑÐ¼Ð°Ñ.", - "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ°ÑÐµ Ð½Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ:\n;1:ÐÐ°Ð·Ð°Ð´Ð½Ð¾-ÑÐºÐ»Ð°Ð´ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ (Ð±ÑÐ»Ð¾Ð²Ð¸ Ð²Ð¾ XML-ÑÑÐ¸Ð», ÐºÐ»ÑÑÐµÐ²Ð¸ * Ð·Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½ÑÐºÐ¸ ÑÐ°Ð·Ð»Ð¸ Ð¸ ÑÐ½.).\n;2:ÐÑÐ¾Ð±ÐµÐ½ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐ¾ÐµÐ´Ð¸Ð½Ð¾ÑÑÐ¸ÑÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð°Ñ!\n;Ð½Ð°ÑÐ½Ð¾Ð²:ÐÐ¾ÑÐ¸ÑÑÐµÑÐµ Ð½Ð° Ð½Ð°ÑÐ½Ð¾Ð²Ð¸Ð¾Ñ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐºÐ¾Ð²Ð½Ð¾ 2), Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐµ.", + "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ°ÑÐµ Ð½Ð° Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ:\n;1:ÐÐ°Ð·Ð°Ð´Ð½Ð¾-ÑÐºÐ»Ð°Ð´ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ (Ð±ÑÐ»Ð¾Ð²Ð¸ Ð²Ð¾ XML-ÑÑÐ¸Ð», ÐºÐ»ÑÑÐµÐ²Ð¸ * Ð·Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½ÑÐºÐ¸ ÑÐ°Ð·Ð»Ð¸ Ð¸ ÑÐ½.).\n;2:ÐÑÐ¾Ð±ÐµÐ½ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½ ÑÐ¾ÑÐ¼Ð°Ñ.\n;latest:ÐÐ¾ÑÐ¸ÑÑÐµÑÐµ Ð½Ð° Ð½Ð°ÑÐ½Ð¾Ð²Ð¸Ð¾Ñ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐºÐ¾Ð²Ð½Ð¾ 2), Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ´ÑÐ²Ð°ÑÐµ.", "apihelp-phpfm-summary": "ÐÐ°Ð²Ð°Ñ Ð³Ð¾ Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ Ð²Ð¾ ÑÐµÑÐ¸ÑÐ°Ð»Ð¸Ð·Ð¸ÑÐ°Ð½ PHP-ÑÐ¾ÑÐ¼Ð°Ñ (Ð¿Ð¾Ð´Ð¾Ð±ÑÐµÐ½ Ð¸ÑÐ¿Ð¸Ñ Ð²Ð¾ HTML).", "apihelp-rawfm-summary": "ÐÐ°Ð²Ð°Ñ Ð³Ð¾ Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ ÑÐ¾ ÐµÐ»ÐµÐ¼ÐµÐ½ÑÐ¸ Ð·Ð° Ð¾ÑÑÑÑÐ°Ð½ÑÐ²Ð°ÑÐµ Ð³ÑÐµÑÐºÐ¸ Ð²Ð¾ JSON-ÑÐ¾ÑÐ¼Ð°Ñ (Ð¿Ð¾Ð´Ð¾Ð±ÑÐµÐ½ Ð¸ÑÐ¿Ð¸Ñ Ð²Ð¾ HTML).", "apihelp-xml-summary": "ÐÐ°Ð²Ð°Ñ Ð³Ð¾ Ð¸Ð·Ð²Ð¾Ð´Ð¾Ñ Ð²Ð¾ XML-ÑÐ¾ÑÐ¼Ð°Ñ.", diff --git a/includes/api/i18n/nb.json b/includes/api/i18n/nb.json index 5e30c1a094..3ba6228cf9 100644 --- a/includes/api/i18n/nb.json +++ b/includes/api/i18n/nb.json @@ -24,7 +24,7 @@ "apihelp-main-param-origin": "NÃ¥r man aksesserer API-en som bruker en domene-kryssende AJAX-forespÃ¸rsel (CORS), sett denne til det opprinnelige domenet. Denne mÃ¥ tas med i alle pre-flight-forespÃ¸rsler, og derfor vÃ¦re en del av spÃ¸rre-URI-en (ikke POST-kroppen).\n\nFor autentiserte forespÃ¸rsler mÃ¥ denne stemme helt med en av de opprinnelige i Origin-headeren, slik at den mÃ¥ settes til noe a la https://en.wikipedia.org eller https://meta.wikimedia.org. Hvis denne parameteren ikke stemmer med Origin-headeren, returneres et 403-svar. Hvis denne parameteren stemmer med Origin-headeren og originalen er hvitlistet, vil Access-Control-Allow-Origin og Access-Control-Allow-Credentials-headere bli satt.\n\nFor ikke-autentiserte forepÃ¸rsler, spesifiser *. Denne vil gjÃ¸re at Access-Control-Allow-Origin-headeren blir satt, men Access-Control-Allow-Credentials blir false og alle bruerspesifikke data blir begrenset.", "apihelp-main-param-uselang": "SprÃ¥k Ã¥ bruke for meldingsoversettelser. [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]] med siprop=languages returnerer en liste over sprÃ¥kkoder, eller spesifiser user for Ã¥ bruke den nÃ¥vÃ¦rende brukerens sprÃ¥kpreferanser, eller spesifiser content for Ã¥ bruke denne wikiens innholdssprÃ¥k.", "apihelp-main-param-errorformat": "Formater som kan brukes for advarsels- og feiltekster.\n; plaintext: Wikitext der HTML-tagger er fjernet og elementer byttet ut.\n; wikitext: Ubehandlet wikitext.\n; html: HTML.\n; raw: MeldingsnÃ¸kler og -parametre.\n; none: Ingen tekst, bare feilkoder.\n; bc: Format brukt fÃ¸r MediaWiki 1.29. errorlang og errorsuselocal ses bort fra.", - "apihelp-main-param-errorlang": "SprÃ¥k som skal brukes for advarsler og feil. [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]] med siprop=languages/ returnerer ei liste over sprÃ¥kkoder, eller angi content for Ã¥ bruke wikiens innholdssprÃ¥k, eller angi uselang for Ã¥ bruke samme verdi som uselang-parameteren.", + "apihelp-main-param-errorlang": "SprÃ¥k som skal brukes for advarsler og feil. [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]] med siprop=languages returnerer ei liste over sprÃ¥kkoder, eller angi content for Ã¥ bruke wikiens innholdssprÃ¥k, eller angi uselang for Ã¥ bruke samme verdi som uselang-parameteren.", "apihelp-main-param-errorsuselocal": "Hvis gitt, vil feiltekster bruke lokalt tilpassede meldinger fra {{ns:MediaWiki}}-navnerommet.", "apihelp-block-summary": "Blokker en bruker.", "apihelp-block-param-user": "Brukernavn, IP-adresse eller IP-intervall som skal blokkeres. Kan ikke brukes sammen med $1userid", diff --git a/includes/api/i18n/nl.json b/includes/api/i18n/nl.json index d7735f64e9..c77d82de9a 100644 --- a/includes/api/i18n/nl.json +++ b/includes/api/i18n/nl.json @@ -16,7 +16,8 @@ "Lemondoge", "Hex", "Mainframe98", - "Southparkfan" + "Southparkfan", + "Elroy" ] }, "apihelp-main-extended-description": "\n* [[mw:Special:MyLanguage/API:Main_page|Documentatie]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api E-maillijst]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API-aankondigingen]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bugs & verzoeken]\n \nStatus: De MediaWiki API is een stabiele interface die actief ondersteund en verbeterd wordt. Hoewel we het proberen te voorkomen, is het mogelijk dat er soms wijzigingen worden aangebracht die bepaalde API-verzoek kunnen verhinderen; abonneer u op de [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ e-maillijst mediawiki-api-announce] voor meldingen over wijzigingen.\n\nFoutieve verzoeken: als de API foutieve verzoeken ontvangt, wordt er geantwoord met een HTTP-header met de sleutel \"MediaWiki-API-Error\" en daarna worden de waarde van de header en de foutcode op dezelfde waarde ingesteld. Zie [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Foutmeldingen en waarschuwingen]] voor meer informatie.\n\nTesten: u kunt [[Special:ApiSandbox|eenvoudig API-verzoeken testen]].", @@ -460,6 +461,7 @@ "apierror-import-unknownerror": "Onbekende fout trad op tijdens het importeren: $1.", "apierror-integeroutofrange-belowminimum": "$1 mag niet minder zijn dan $2 (ingesteld op $3).", "apierror-invalidcategory": "De opgegeven categorienaam is niet geldig.", + "apierror-invalidmethod": "Ongeldige http-methode. Overweeg de methodes GET of POST.", "apierror-invalidtitle": "Ongeldige titel \"$1\".", "apierror-invaliduser": "Ongeldige gebruikersnaam \"$1\".", "apierror-invaliduserid": "Gebruikers-ID $1 is ongeldig.", diff --git a/includes/api/i18n/pl.json b/includes/api/i18n/pl.json index 7b29b1f04e..3740243775 100644 --- a/includes/api/i18n/pl.json +++ b/includes/api/i18n/pl.json @@ -14,7 +14,8 @@ "Matma Rex", "Sethakill", "Woytecr", - "InternerowyGoÅÄb" + "InternerowyGoÅÄb", + "CiaPan" ] }, "apihelp-main-extended-description": "\n* [[mw:Special:MyLanguage/API:Main_page|Dokumentacja]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Lista dyskusyjna]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce OgÅoszenia dotyczÄce API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R BÅÄdy i propozycje]\n \nStan: Wszystkie funkcje opisane na tej stronie powinny dziaÅaÄ, ale API nadal jest aktywnie rozwijane i mogÄ siÄ zmieniÄ w dowolnym czasie. Subskrybuj [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ listÄ dyskusyjnÄ mediawiki-api-announce], aby mÃ³c na bieÅ¼Äco dowiadywaÄ siÄ o aktualizacjach.\n\nBÅÄdne Å¼Ädania: Gdy zostanie wysÅane bÅÄdne Å¼Ädanie do API, zostanie wysÅany w odpowiedzi nagÅÃ³wek HTTP z kluczem \"MediaWiki-API-Error\" i zarÃ³wno jego wartoÅÄ jak i wartoÅÄ kodu bÅÄdu wysÅanego w odpowiedzi bÄdÄ miaÅy takÄ samÄ wartoÅÄ. Aby uzyskaÄ wiÄcej informacji, zobacz [[mw:Special:MyLanguage/API:Errors_and_warnings|API: BÅÄdy i ostrzeÅ¼enia]].\n\nTestowanie: Aby Åatwo testowaÄ Å¼Ädania API, zobacz [[Special:ApiSandbox]].", @@ -42,6 +43,8 @@ "apihelp-block-param-reblock": "JeÅ¼eli ten uÅ¼ytkownik jest juÅ¼ zablokowany, nadpisz blokadÄ.", "apihelp-block-param-watchuser": "Obserwuj stronÄ uÅ¼ytkownika lub IP oraz ich strony dyskusji.", "apihelp-block-param-tags": "Zmieniaj tagi by potwierdziÄ wejÅcie do bloku logÃ³w.", + "apihelp-block-param-partial": "Zablokuj uÅ¼ytkownikowi dostÄp do wybranych stron lub przestrzeni nazw zamiast do caÅej witryny.", + "apihelp-block-param-pagerestrictions": "Lista tytuÅÃ³w stron do zablokowania uÅ¼ytkownikowi moÅ¼liwoÅci edycji. Ma zastosowanie tylko gdy 'partial' (czÄÅciowa) jest ustawione na true (prawda).", "apihelp-block-example-ip-simple": "Zablokuj IP 192.0.2.5 na 3 dni z powodem First strike.", "apihelp-block-example-user-complex": "Zablokuj uÅ¼ytkownika Vandal na zawsze z powodem Vandalism i uniemoÅ¼liw utworzenie nowego konta oraz wysyÅanie emaili.", "apihelp-changeauthenticationdata-summary": "ZmieÅ dane logowania bieÅ¼Äcego uÅ¼ytkownika.", @@ -223,7 +226,7 @@ "apihelp-opensearch-summary": "Przeszukaj wiki przy uÅ¼yciu protokoÅu OpenSearch.", "apihelp-opensearch-param-search": "Wyszukaj tekst.", "apihelp-opensearch-param-limit": "Maksymalna liczba zwracanych wynikÃ³w.", - "apihelp-opensearch-param-namespace": "Przestrzenie nazw do przeszukania.", + "apihelp-opensearch-param-namespace": "Przestrzenie nazw do przeszukania. Pomijane jeÅli $1search zaczyna siÄ od poprawnego przedrostka przestrzeni nazw.", "apihelp-opensearch-param-suggest": "Nic nie robi, jeÅ¼eli [[mw:Special:MyLanguage/Manual:$wgEnableOpenSearchSuggest|$wgEnableOpenSearchSuggest]] ustawiono na false.", "apihelp-opensearch-param-redirects": "Jak obsÅugiwaÄ przekierowania:\n;return:ZwrÃ³Ä samo przekierowanie.\n;resolve:ZwrÃ³Ä stronÄ docelowÄ. MoÅ¼e zwrÃ³ciÄ mniej niÅ¼ wynikÃ³w okreÅlonych w $1limit.\nZ powodÃ³w historycznych, domyÅlnie jest to \"return\" dla $1format=json, a \"resolve\" dla innych formatÃ³w.", "apihelp-opensearch-param-format": "Format danych wyjÅciowych.", @@ -381,6 +384,7 @@ "apihelp-query+blocks-paramvalue-prop-expiry": "Dodaje znacznik czasu wygaÅniÄcia blokady.", "apihelp-query+blocks-paramvalue-prop-reason": "Dodaje powÃ³d zablokowania.", "apihelp-query+blocks-paramvalue-prop-range": "Dodaje zakres adresÃ³w IP, na ktÃ³ry zastosowano blokadÄ.", + "apihelp-query+blocks-paramvalue-prop-restrictions": "Dodaje czÄÅciowe ograniczenia jeÅli blokada nie jest caÅoÅciowa.", "apihelp-query+blocks-example-simple": "Listuj blokady.", "apihelp-query+categories-summary": "Lista kategorii, do ktÃ³rych naleÅ¼Ä strony", "apihelp-query+categories-paramvalue-prop-timestamp": "Dodaje znacznik czasu dodania kategorii.", @@ -440,12 +444,12 @@ "apihelp-query+imageusage-example-simple": "PokaÅ¼ strony, ktÃ³re korzystajÄ z [[:File:Albert Einstein Head.jpg]].", "apihelp-query+info-summary": "PokaÅ¼ podstawowe informacje o stronie.", "apihelp-query+info-paramvalue-prop-watchers": "Liczba obserwujÄcych, jeÅli jest to dozwolone.", - "apihelp-query+info-paramvalue-prop-readable": "Czy uÅ¼ytkownik moÅ¼e przeczytaÄ tÄ stronÄ.", + "apihelp-query+info-paramvalue-prop-readable": "Czy uÅ¼ytkownik moÅ¼e przeczytaÄ tÄ stronÄ. Zamiast tego uÅ¼yj intestactions=read.", "apihelp-query+iwbacklinks-param-prefix": "Prefix interwiki.", "apihelp-query+iwbacklinks-param-limit": "ÅÄczna liczba stron do zwrÃ³cenia.", "apihelp-query+iwbacklinks-paramvalue-prop-iwprefix": "Dodaje prefiks interwiki.", "apihelp-query+iwbacklinks-paramvalue-prop-iwtitle": "Dodaje tytuÅ interwiki.", - "apihelp-query+iwlinks-summary": "WyÅwietla wszystkie liki interwiki z danych stron.", + "apihelp-query+iwlinks-summary": "WyÅwietla wszystkie linki interwiki z danych stron.", "apihelp-query+iwlinks-paramvalue-prop-url": "Dodaje peÅny adres URL.", "apihelp-query+iwlinks-param-limit": "ÅÄczna liczba linkÃ³w interwiki do zwrÃ³cenia.", "apihelp-query+langbacklinks-param-limit": "ÅÄczna liczba stron do zwrÃ³cenia.", @@ -470,7 +474,7 @@ "apihelp-query+pageswithprop-example-simple": "Lista pierwszych 10 stron za pomocÄ {{DISPLAYTITLE:}}.", "apihelp-query+pageswithprop-example-generator": "Pobierz dodatkowe informacje o pierwszych 10 stronach wykorzystujÄc __NOTOC__.", "apihelp-query+prefixsearch-param-search": "Wyszukaj tekst.", - "apihelp-query+prefixsearch-param-namespace": "Przestrzenie nazw do przeszukania.", + "apihelp-query+prefixsearch-param-namespace": "Przestrzenie nazw do przeszukania. Pomijane jeÅli $1search zaczyna siÄ od poprawnego przedrostka przestrzeni nazw.", "apihelp-query+prefixsearch-param-limit": "Maksymalna liczba zwracanych wynikÃ³w.", "apihelp-query+prefixsearch-param-offset": "Liczba wynikÃ³w do pominiÄcia.", "apihelp-query+protectedtitles-summary": "Lista wszystkich tytuÅÃ³w zabezpieczonych przed tworzeniem.", diff --git a/includes/api/i18n/pt-br.json b/includes/api/i18n/pt-br.json index df7ab405ba..1af3ce9cae 100644 --- a/includes/api/i18n/pt-br.json +++ b/includes/api/i18n/pt-br.json @@ -1464,11 +1464,11 @@ "apihelp-json-param-callback": "Se especificado, envolve a saÃda para uma determinada chamada de funÃ§Ã£o. Por seguranÃ§a, todos os dados especÃficos do usuÃ¡rio serÃ£o restritos.", "apihelp-json-param-utf8": "Se especificado, codifica a maioria (mas nÃ£o todos) caracteres nÃ£o-ASCII como UTF-8 em vez de substituÃ-los por sequÃªncias de escape hexadecimais. PadrÃ£o quando formatversion nÃ£o Ã© 1.", "apihelp-json-param-ascii": "Se especificado, codifica todos os nÃ£o-ASCII usando sequÃªncias de escape hexadecimais. PadrÃ£o quando formatversion Ã© 1.", - "apihelp-json-param-formatversion": "FormataÃ§Ã£o de saÃda:\n;1:formato compatÃvel com versÃµes anteriores (XML-style booleans, * chaves para nÃ³s de conteÃºdo, etc.).\n;2: formato moderno experimental. Detalhes podem ser alterados!\n;mais recente: use o formato mais recente (atualmente 2), pode mudar sem aviso prÃ©vio.", + "apihelp-json-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno.\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", "apihelp-jsonfm-summary": "Dados de saÃda no formato JSON (pretty-print em HTML).", "apihelp-none-summary": "Nenhuma saÃda.", "apihelp-php-summary": "Dados de saÃda no formato PHP serializado.", - "apihelp-php-param-formatversion": "FormataÃ§Ã£o de saÃda:\n;1:formato compatÃvel com versÃµes anteriores (XML-style booleans, * chaves para nÃ³s de conteÃºdo, etc.).\n;2: formato moderno experimental. Detalhes podem ser alterados!\n;mais recente: use o formato mais recente (atualmente 2), pode mudar sem aviso prÃ©vio.", + "apihelp-php-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno.\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", "apihelp-phpfm-summary": "Dados de saÃda em formato serializado em PHP (pretty-print em HTML).", "apihelp-rawfm-summary": "Dados de saÃda, incluindo elementos de depuraÃ§Ã£o, no formato JSON (pretty-print em HTML).", "apihelp-xml-summary": "Dados de saÃda em formato XML.", @@ -1614,6 +1614,7 @@ "apierror-compare-nofromrevision": "NÃ£o foi especificada uma revisÃ£o 'from'. Especificar fromrev, fromtitle ou fromid.", "apierror-compare-notext": "O parÃ¢metro $1 nÃ£o pode ser usado sem $2.", "apierror-compare-notorevision": "NÃ£o foi especificada uma revisÃ£o 'to'. Especificar torev, totitle ou toid.", + "apierror-compare-relative-to-deleted": "NÃ£o pode usar torelative=$1 com relaÃ§Ã£o a uma revisÃ£o eliminada.", "apierror-compare-relative-to-nothing": "Nenhuma revisÃ£o 'from' para torelative para ser relativa Ã .", "apierror-contentserializationexception": "Falha na serializaÃ§Ã£o de conteÃºdo: $1", "apierror-contenttoobig": "O conteÃºdo fornecido excede o limite de tamanho do artigo de $1 {{PLURAL: $1|kilobyte|kilobytes}}.", @@ -1642,6 +1643,7 @@ "apierror-invalidexpiry": "Tempo de expiraÃ§Ã£o \"$1\" nÃ£o vÃ¡lido.", "apierror-invalid-file-key": "NÃ£o Ã© uma chave de arquivo vÃ¡lida.", "apierror-invalidlang": "CÃ³digo de idioma invÃ¡lido para o parÃ¢metro $1.", + "apierror-invalidmethod": "MÃ©todo HTTP invÃ¡lido. Considere o uso de GET ou POST.", "apierror-invalidoldimage": "O parÃ¢metro oldimage possui um formato invÃ¡lido.", "apierror-invalidparammix-cannotusewith": "O parÃ¢metro $1 nÃ£o pode ser usado com $2.", "apierror-invalidparammix-mustusewith": "O parÃ¢metro $1 sÃ³ pode ser usado com $2.", @@ -1770,6 +1772,8 @@ "apiwarn-badurlparam": "NÃ£o foi possÃvel analisar $1urlparam por $2. Usando apenas largura e altura.", "apiwarn-badutf8": "O valor passado para $1 contÃ©m dados invÃ¡lidos ou nÃ£o normalizados. Os dados textuais devem ser vÃ¡lidos, NFC-normalizado Unicode sem caracteres de controle C0 diferentes de HT (\\t), LF (\\n) e CR (\\r).", "apiwarn-checktoken-percentencoding": "Verificar se os sÃmbolos, como \"+\" no token, estÃ£o codificados corretamente na URL.", + "apiwarn-compare-no-next": "A revisÃ£o $2 Ã© a revisÃ£o mais recente de $1, nÃ£o hÃ¡ nenhuma revisÃ£o seguinte para comparar com torelative=next.", + "apiwarn-compare-no-prev": "A revisÃ£o $2 Ã© a revisÃ£o mais antiga de $1, nÃ£o hÃ¡ nenhuma revisÃ£o anterior para comparar com torelative=prev.", "apiwarn-compare-nocontentmodel": "Nenhum modelo de conteÃºdo pode ser determinado, assumindo $1.", "apiwarn-deprecation-deletedrevs": "list=deletedrevs foi depreciado. Por favor, use prop=deletedrevisions ou list=alldeletedrevisions em vez.", "apiwarn-deprecation-httpsexpected": "HTTP usado quando o HTTPS era esperado.", diff --git a/includes/api/i18n/pt.json b/includes/api/i18n/pt.json index c1e10ca526..02ae87c21d 100644 --- a/includes/api/i18n/pt.json +++ b/includes/api/i18n/pt.json @@ -1459,11 +1459,11 @@ "apihelp-json-param-callback": "Se especificado, envolve o resultado de saÃda na forma de uma chamada para uma funÃ§Ã£o. Por seguranÃ§a, todos os dados especÃficos do utilizador estarÃ£o restringidos.", "apihelp-json-param-utf8": "Se especificado, codifica a maioria dos caracteres nÃ£o ASCII (mas nÃ£o todos) em UTF-8, em vez de substitui-los por sequÃªncias de escape hexadecimais. Ã o comportamento padrÃ£o quando formatversion nÃ£o tem o valor 1.", "apihelp-json-param-ascii": "Se especificado, codifica todos caracteres nÃ£o ASCII usando sequÃªncias de escape hexadecimais. Ã o comportamento padrÃ£o quando formatversion tem o valor 1.", - "apihelp-json-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno experimental. As especificaÃ§Ãµes podem mudar!\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", + "apihelp-json-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno.\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", "apihelp-jsonfm-summary": "Produzir os dados de saÃda em formato JSON (realce sintÃ¡tico em HTML).", "apihelp-none-summary": "NÃ£o produzir nada.", "apihelp-php-summary": "Produzir os dados de saÃda em formato PHP seriado.", - "apihelp-php-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno experimental. As especificaÃ§Ãµes podem mudar!\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", + "apihelp-php-param-formatversion": "FormataÃ§Ã£o do resultado de saÃda:\n;1:Formato compatÃvel com versÃµes anteriores (boolianos ao estilo XML, * chaves para nodos de conteÃºdo, etc.).\n;2:Formato moderno.\n;latest:Usar o formato mais recente (atualmente 2), mas pode ser alterado sem aviso prÃ©vio.", "apihelp-phpfm-summary": "Produzir os dados de saÃda em formato PHP seriado (realce sintÃ¡tico em HTML).", "apihelp-rawfm-summary": "Produzir os dados de saÃda, incluindo elementos para despiste de erros, em formato JSON (realce sintÃ¡tico em HTML).", "apihelp-xml-summary": "Produzir os dados de saÃda em formato XML.", @@ -1544,7 +1544,7 @@ "api-help-permissions-granted-to": "{{PLURAL:$1|Concedida a|Concedidas a}}: $2", "api-help-right-apihighlimits": "Usar limites mais altos em consultas da API (consultas lentas: $1; consultas rÃ¡pidas: $2). Os limites para consultas lentas tambÃ©m se aplicam a parÃ¢metros com vÃ¡rios valores.", "api-help-open-in-apisandbox": "[abrir na pÃ¡gina de testes]", - "api-help-authmanager-general-usage": "O procedimento geral para usar este mÃ³dulo Ã©:\n# Obtenha os campos disponÃveis usando [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] com amirequestsfor=$4 e uma chave $5 obtida de [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Apresente os campos ao utilizador e obtenha os dados fornecidos por este.\n# Publique-os para este mÃ³dulo, fornecendo $1returnurl e quaisquer campos relevantes.\n# Verifique o valor de status na resposta.\n#* Se recebeu PASS ou FAIL, terminou. A operaÃ§Ã£o terÃ¡ tido sucesso ou falhado.\n#* Se recebeu UI, apresente os novos campos ao utilizador e obtenha os dados fornecidos por este. Depois publique-os para este mÃ³dulo com $1continue e os campos relevantes preenchidos, e repita o passo 4.\n#* Se recebeu REDIRECT, encaminhe o utilizador para redirecttarget e aguarde o retorno para o URL $1returnurl. Depois publique para este mÃ³dulo com $1continue quaisquer campos que tenham sido passados ao URL de retorno, e repita o passo 4.\n#* Se recebeu RESTART, isto significa que a autenticaÃ§Ã£o funcionou mas nÃ£o temos uma conta de utilizador associada. Pode dar-lhe o tratamento de UI ou FAIL.", + "api-help-authmanager-general-usage": "O procedimento geral para usar este mÃ³dulo Ã©:\n# Obtenha os campos disponÃveis usando [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] com amirequestsfor=$4 e uma chave $5 obtida de [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Apresente os campos ao utilizador e obtenha os dados fornecidos por este.\n# Publique-os para este mÃ³dulo, fornecendo $1returnurl e quaisquer campos relevantes.\n# Verifique o valor de status na resposta.\n#* Se recebeu PASS ou FAIL, terminou. A operaÃ§Ã£o terÃ¡ tido Ãªxito ou falhado.\n#* Se recebeu UI, apresente os novos campos ao utilizador e obtenha os dados fornecidos por este. Depois publique-os para este mÃ³dulo com $1continue e os campos relevantes preenchidos, e repita o passo 4.\n#* Se recebeu REDIRECT, encaminhe o utilizador para redirecttarget e aguarde o retorno para o URL $1returnurl. Depois publique para este mÃ³dulo com $1continue quaisquer campos que tenham sido passados ao URL de retorno, e repita o passo 4.\n#* Se recebeu RESTART, isto significa que a autenticaÃ§Ã£o funcionou mas nÃ£o temos uma conta de utilizador associada. Pode dar-lhe o tratamento de UI ou FAIL.", "api-help-authmanagerhelper-requests": "Usar sÃ³ estes pedidos de autenticaÃ§Ã£o, com o id devolvido por [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] com amirequestsfor=$1 ou por uma resposta anterior deste mÃ³dulo.", "api-help-authmanagerhelper-request": "Usar este pedido de autenticaÃ§Ã£o, com o id devolvido por [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] com amirequestsfor=$1.", "api-help-authmanagerhelper-messageformat": "Formato a usar nas mensagens de saÃda.", @@ -1609,6 +1609,7 @@ "apierror-compare-nofromrevision": "NÃ£o foi especificada uma revisÃ£o 'from'. Especificar fromrev, fromtitle ou fromid.", "apierror-compare-notext": "O parÃ¢metro $1 nÃ£o pode ser usado sem $2.", "apierror-compare-notorevision": "NÃ£o foi especificada uma revisÃ£o 'to'. Especificar torev, totitle ou toid.", + "apierror-compare-relative-to-deleted": "NÃ£o pode usar torelative=$1 com relaÃ§Ã£o a uma revisÃ£o eliminada.", "apierror-compare-relative-to-nothing": "NÃ£o existe uma revisÃ£o 'from' em relaÃ§Ã£o Ã qual torelative possa ser relativo.", "apierror-contentserializationexception": "A seriaÃ§Ã£o do conteÃºdo falhou: $1", "apierror-contenttoobig": "O conteÃºdo que forneceu excede o tamanho mÃ¡ximo dos artigos que Ã© $1 {{PLURAL:$1|kilobyte|kilobytes}}.", @@ -1637,6 +1638,7 @@ "apierror-invalidexpiry": "A hora de expiraÃ§Ã£o \"$1\" Ã© invÃ¡lida.", "apierror-invalid-file-key": "NÃ£o Ã© uma chave de ficheiro vÃ¡lida.", "apierror-invalidlang": "CÃ³digo de lÃngua invÃ¡lido para o parÃ¢metro $1.", + "apierror-invalidmethod": "MÃ©todo HTTP invÃ¡lido. Use GET ou POST.", "apierror-invalidoldimage": "O parÃ¢metro oldimage tem um formato invÃ¡lido.", "apierror-invalidparammix-cannotusewith": "O parÃ¢metro $1 nÃ£o pode ser usado com $2.", "apierror-invalidparammix-mustusewith": "O parÃ¢metro $1 sÃ³ pode ser usado com $2.", @@ -1765,6 +1767,8 @@ "apiwarn-badurlparam": "NÃ£o foi possÃvel analisar $1urlparam para $2. SerÃ£o utilizadas somente a largura e a altura.", "apiwarn-badutf8": "O valor passado para $1 contÃ©m dados invÃ¡lidos ou nÃ£o normalizados. Os dados textuais devem estar em formato Unicode vÃ¡lido, normalizado em NFC, sem caracteres de controlo C0 exceto HT (\\t), LF (\\n) e CR (\\r).", "apiwarn-checktoken-percentencoding": "Verifique que sÃmbolos como \"+\" na chave estÃ£o devidamente codificados com percentagem no URL.", + "apiwarn-compare-no-next": "A revisÃ£o $2 Ã© a revisÃ£o mais recente de $1, nÃ£o hÃ¡ nenhuma revisÃ£o seguinte para comparar com torelative=next.", + "apiwarn-compare-no-prev": "A revisÃ£o $2 Ã© a revisÃ£o mais antiga de $1, nÃ£o hÃ¡ nenhuma revisÃ£o anterior para comparar com torelative=prev.", "apiwarn-compare-nocontentmodel": "NÃ£o foi possÃvel determinar nenhum modelo de conteÃºdo; serÃ¡ assumido $1.", "apiwarn-deprecation-deletedrevs": "list=deletedrevs foi descontinuado. Em substituiÃ§Ã£o, use prop=deletedrevisions ou list=alldeletedrevisions, por favor.", "apiwarn-deprecation-httpsexpected": "Foi usado HTTP quando era esperado HTTPS.", diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json index 83427bafd8..6437adfcd0 100644 --- a/includes/api/i18n/qqq.json +++ b/includes/api/i18n/qqq.json @@ -1618,6 +1618,7 @@ "apierror-compare-nofromrevision": "{{doc-apierror}}", "apierror-compare-notext": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter that is not allowed without totext-{role}/fromtext-{role}.\n* $2 - The specific totext-{role}/fromtext-{role} parameter that must be present.", "apierror-compare-notorevision": "{{doc-apierror}}", + "apierror-compare-relative-to-deleted": "{{doc-apierror}}", "apierror-compare-relative-to-nothing": "{{doc-apierror}}", "apierror-contentserializationexception": "{{doc-apierror}}\n\nParameters:\n* $1 - Exception text, may end with punctuation. Currently this is probably English, hopefully we'll fix that in the future.", "apierror-contenttoobig": "{{doc-apierror}}\n\nParameters:\n* $1 - Maximum article size in kilobytes.", @@ -1646,6 +1647,7 @@ "apierror-invalidexpiry": "{{doc-apierror}}\n\nParameters:\n* $1 - Value provided.", "apierror-invalid-file-key": "{{doc-apierror}}", "apierror-invalidlang": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name.", + "apierror-invalidmethod": "{{doc-apierror}}\n\nShown when a user tries to access the API using an HTTP method that is not supported", "apierror-invalidoldimage": "{{doc-apierror}}", "apierror-invalidparammix-cannotusewith": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name or \"parameter=value\" text.\n* $2 - Parameter name or \"parameter=value\" text.", "apierror-invalidparammix-mustusewith": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name or \"parameter=value\" text.\n* $2 - Parameter name or \"parameter=value\" text.", @@ -1775,6 +1777,8 @@ "apiwarn-badurlparam": "{{doc-apierror}}\n\nParameters:\n* $1 - Module parameter prefix, e.g. \"bl\".\n* $2 - Image title.", "apiwarn-badutf8": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name.\n{{doc-important|Do not translate \"\\t\", \"\\n\", and \"\\r\"}}", "apiwarn-checktoken-percentencoding": "{{doc-apierror}}", + "apiwarn-compare-no-next": "{{doc-apierror}}\n\nParameters:\n* $1 - Title of the page.\n* $2 - Revision ID.", + "apiwarn-compare-no-prev": "{{doc-apierror}}\n\nParameters:\n* $1 - Title of the page.\n* $2 - Revision ID.", "apiwarn-compare-nocontentmodel": "{{doc-apierror}}\n\nParameters:\n* $1 - Content model being assumed.", "apiwarn-deprecation-deletedrevs": "{{doc-apierror}}", "apiwarn-deprecation-httpsexpected": "{{doc-apierror}}", diff --git a/includes/api/i18n/ru.json b/includes/api/i18n/ru.json index 6a239f6e17..0206463104 100644 --- a/includes/api/i18n/ru.json +++ b/includes/api/i18n/ru.json @@ -862,7 +862,7 @@ "apihelp-query+info-paramvalue-prop-notificationtimestamp": "ÐÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¼ÐµÑÐºÐ° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¿Ð¸ÑÐºÐ° Ð½Ð°Ð±Ð»ÑÐ´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.", "apihelp-query+info-paramvalue-prop-subjectid": "ÐÐ´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ.", "apihelp-query+info-paramvalue-prop-url": "ÐÐ¾Ð·Ð²ÑÐ°ÑÐ°ÐµÑ Ð¿Ð¾Ð»Ð½ÑÑ ÑÑÑÐ»ÐºÑ, ÑÑÑÐ»ÐºÑ Ð½Ð° ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð¸ ÐºÐ°Ð½Ð¾Ð½Ð¸ÑÐ½ÑÑ ÑÑÑÐ»ÐºÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.", - "apihelp-query+info-paramvalue-prop-readable": "ÐÐ¾Ð¶ÐµÑ Ð»Ð¸ ÑÑÐ°ÑÑÐ½Ð¸Ðº Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑ ÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ.", + "apihelp-query+info-paramvalue-prop-readable": "ÐÐ¾Ð¶ÐµÑ Ð»Ð¸ ÑÑÐ°ÑÑÐ½Ð¸Ðº Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑ ÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ. ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Ð²Ð¼ÐµÑÑÐ¾ ÑÑÐ¾Ð³Ð¾ intestactions=read.", "apihelp-query+info-paramvalue-prop-preload": "Ð¢ÐµÐºÑÑ, Ð²Ð¾Ð·Ð²ÑÐ°ÑÑÐ½Ð½ÑÐ¹ EditFormPreloadText.", "apihelp-query+info-paramvalue-prop-displaytitle": "ÐÐ¾Ð·Ð²ÑÐ°ÑÐ°ÐµÑ ÑÑÐ¸Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° ÑÑÑÐ°Ð½Ð¸ÑÑ.", "apihelp-query+info-paramvalue-prop-varianttitles": "ÐÑÐ´Ð°ÑÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼ÑÐ¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð²Ð¾ Ð²ÑÐµÑ Ð²Ð°ÑÐ¸Ð°Ð½ÑÐ°Ñ ÑÐ·ÑÐºÐ° ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ°.", @@ -1453,11 +1453,11 @@ "apihelp-json-param-callback": "ÐÑÐ»Ð¸ Ð·Ð°Ð´Ð°Ð½Ð¾, Ð¾Ð±Ð¾ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð²ÑÐ²Ð¾Ð´ Ð² Ð²ÑÐ·Ð¾Ð² Ð´Ð°Ð½Ð½Ð¾Ð¹ ÑÑÐ½ÐºÑÐ¸Ð¸. ÐÐ· ÑÐ¾Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸, Ð²ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð°.", "apihelp-json-param-utf8": "ÐÑÐ»Ð¸ Ð·Ð°Ð´Ð°Ð½Ð¾, ÐºÐ¾Ð´Ð¸ÑÑÐµÑ Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð¾ (Ð½Ð¾ Ð½Ðµ Ð²ÑÐµ) Ð½Ðµ-ASCII ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð² UTF-8 Ð²Ð¼ÐµÑÑÐ¾ Ð·Ð°Ð¼ÐµÐ½Ñ Ð¸Ñ Ð½Ð° ÑÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐµ ÐºÐ¾Ð´Ñ. ÐÑÐ¸Ð¼ÐµÐ½ÑÐµÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ, ÐºÐ¾Ð³Ð´Ð° formatversion Ð½Ðµ ÑÐ°Ð²Ð½Ð¾ 1.", "apihelp-json-param-ascii": "ÐÑÐ»Ð¸ Ð·Ð°Ð´Ð°Ð½Ð¾, Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ Ð²ÑÐµ Ð½Ðµ-ASCII-ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ Ð½Ð° ÑÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐµ ÐºÐ¾Ð´Ñ. ÐÑÐ¸Ð¼ÐµÐ½ÑÐµÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ, ÐºÐ¾Ð³Ð´Ð° formatversion ÑÐ°Ð²Ð½Ð¾ 1.", - "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð²ÑÐ²Ð¾Ð´Ð°:\n;1: ÐÐ±ÑÐ°ÑÐ½Ð¾ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð»Ð¾Ð³Ð¸ÑÐµÑÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð² ÑÑÐ¸Ð»Ðµ XML, ÐºÐ»ÑÑÐ¸ * Ð´Ð»Ñ ÑÐ·Ð»Ð¾Ð² Ð´Ð°Ð½Ð½ÑÑ, Ð¸ ÑÐ°Ðº Ð´Ð°Ð»ÐµÐµ).\n;2: ÐÐºÑÐ¿ÐµÑÐ¸Ð¼ÐµÐ½ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐµÑÐ°Ð»Ð¸ Ð¼Ð¾Ð³ÑÑ Ð¼ÐµÐ½ÑÑÑÑÑ!\n;latest: ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐ¹ÑÐ°Ñ 2), Ð¼Ð¾Ð¶ÐµÑ Ð¼ÐµÐ½ÑÑÑÑÑ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ.", + "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð²ÑÐ²Ð¾Ð´Ð°:\n;1: ÐÐ±ÑÐ°ÑÐ½Ð¾ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð»Ð¾Ð³Ð¸ÑÐµÑÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð² ÑÑÐ¸Ð»Ðµ XML, ÐºÐ»ÑÑÐ¸ * Ð´Ð»Ñ ÑÐ·Ð»Ð¾Ð² Ð´Ð°Ð½Ð½ÑÑ, Ð¸ ÑÐ°Ðº Ð´Ð°Ð»ÐµÐµ).\n;2: Ð¡Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ. \n;latest: ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐ¹ÑÐ°Ñ 2), Ð¼Ð¾Ð¶ÐµÑ Ð¼ÐµÐ½ÑÑÑÑÑ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ.", "apihelp-jsonfm-summary": "ÐÑÐ²Ð¾Ð´Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ JSON (Ð¾ÑÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¼ Ð² HTML).", "apihelp-none-summary": "ÐÐ¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð²ÑÐ²Ð¾Ð´Ð¸ÑÑ.", "apihelp-php-summary": "ÐÑÐ²Ð¾Ð´Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐµÑÐ¸Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¼ ÑÐ¾ÑÐ¼Ð°ÑÐµ PHP.", - "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð²ÑÐ²Ð¾Ð´Ð°:\n;1: ÐÐ±ÑÐ°ÑÐ½Ð¾ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð»Ð¾Ð³Ð¸ÑÐµÑÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð² ÑÑÐ¸Ð»Ðµ XML, ÐºÐ»ÑÑÐ¸ * Ð´Ð»Ñ ÑÐ·Ð»Ð¾Ð² Ð´Ð°Ð½Ð½ÑÑ, Ð¸ ÑÐ°Ðº Ð´Ð°Ð»ÐµÐµ).\n;2: ÐÐºÑÐ¿ÐµÑÐ¸Ð¼ÐµÐ½ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ¾Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐµÑÐ°Ð»Ð¸ Ð¼Ð¾Ð³ÑÑ Ð¼ÐµÐ½ÑÑÑÑÑ!\n;latest: ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐ¹ÑÐ°Ñ 2), Ð¼Ð¾Ð¶ÐµÑ Ð¼ÐµÐ½ÑÑÑÑÑ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ.", + "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð²ÑÐ²Ð¾Ð´Ð°:\n;1: ÐÐ±ÑÐ°ÑÐ½Ð¾ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð»Ð¾Ð³Ð¸ÑÐµÑÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð² ÑÑÐ¸Ð»Ðµ XML, ÐºÐ»ÑÑÐ¸ * Ð´Ð»Ñ ÑÐ·Ð»Ð¾Ð² Ð´Ð°Ð½Ð½ÑÑ, Ð¸ ÑÐ°Ðº Ð´Ð°Ð»ÐµÐµ).\n;2: Ð¡Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ.\n;latest: ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (ÑÐµÐ¹ÑÐ°Ñ 2), Ð¼Ð¾Ð¶ÐµÑ Ð¼ÐµÐ½ÑÑÑÑÑ Ð±ÐµÐ· Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ.", "apihelp-phpfm-summary": "ÐÑÐ²Ð¾Ð´Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐµÑÐ¸Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¼ ÑÐ¾ÑÐ¼Ð°ÑÐµ PHP (Ð¾ÑÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¼ Ð² HTML).", "apihelp-rawfm-summary": "ÐÑÐ²Ð¾Ð´Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ, Ð²ÐºÐ»ÑÑÐ°Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ Ð¾ÑÐ»Ð°Ð´ÐºÐ¸, Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ JSON (Ð¾ÑÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¼ Ð² HTML).", "apihelp-xml-summary": "ÐÑÐ²Ð¾Ð´Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ XML.", diff --git a/includes/api/i18n/sv.json b/includes/api/i18n/sv.json index 811ccc7a74..bf5d89e2a0 100644 --- a/includes/api/i18n/sv.json +++ b/includes/api/i18n/sv.json @@ -557,5 +557,7 @@ "apierror-systemblocked": "Du har blockerats automatiskt av MediaWiki.", "apierror-timeout": "Servern svarade inte inom fÃ¶rvÃ¤ntad tid.", "apierror-unknownformat": "OkÃ¤nt format \"$1\".", + "apiwarn-compare-no-next": "Sidversion $2 Ã¤r den senaste sidversionen av $1, det finns ingen sidversion fÃ¶r torelative=next att jÃ¤mfÃ¶ra med.", + "apiwarn-compare-no-prev": "Sidversionen $2 Ã¤r den tidigaste sidversion fÃ¶r $1, det finns ingen sidversion fÃ¶r torelative=prev att jÃ¤mfÃ¶ra med.", "api-feed-error-title": "Fel ($1)" } diff --git a/includes/api/i18n/uk.json b/includes/api/i18n/uk.json index 21601c1bd9..2a6680199e 100644 --- a/includes/api/i18n/uk.json +++ b/includes/api/i18n/uk.json @@ -14,7 +14,8 @@ "AS", "Umherirrender", "Choomaq", - "Zoranzoki21" + "Zoranzoki21", + "Vlad5250" ] }, "apihelp-main-extended-description": "\n* [[mw:Special:MyLanguage/API:Main_page|ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÑÑ]]\n* [[mw:Special:MyLanguage/API:FAQ|Ð§Ð°ÐÐ¸]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑÐ¾Ð·ÑÐ¸Ð»ÐºÐ¸]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce ÐÐ³Ð¾Ð»Ð¾ÑÐµÐ½Ð½Ñ API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R ÐÐ°ÒÐ¸ Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸]\n \nÐ¡ÑÐ°ÑÑÑ: Ð£ÑÑ ÑÑÐ½ÐºÑÑÑ, Ð²ÐºÐ°Ð·Ð°Ð½Ñ Ð½Ð° ÑÑÐ¹ ÑÑÐ¾ÑÑÐ½ÑÑ, Ð¼Ð°ÑÑÑ Ð¿ÑÐ°ÑÑÐ²Ð°ÑÐ¸, Ð°Ð»Ðµ API Ð´Ð°Ð»Ñ Ð¿ÐµÑÐµÐ±ÑÐ²Ð°Ñ Ð² Ð°ÐºÑÐ¸Ð²Ð½ÑÐ¹ ÑÐ¾Ð·ÑÐ¾Ð±ÑÑ Ñ Ð¼Ð¾Ð¶Ðµ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ÑÑ Ñ Ð±ÑÐ´Ñ-ÑÐºÐ¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ. ÐÑÐ´Ð¿Ð¸ÑÑÑÑÑÑ Ð½Ð° [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ¾Ð·ÑÐ¸Ð»ÐºÐ¸ mediawiki-api-announce], ÑÐ¾Ð± Ð¿Ð¾Ð¼ÑÑÐ°ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ.\n\nÐ¥Ð¸Ð±Ð½Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸: ÐÐ¾Ð»Ð¸ Ð´Ð¾ API Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÑÑÑÑ ÑÐ¸Ð±Ð½Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸, Ð±ÑÐ´Ðµ Ð²ÑÐ´ÑÑÐ»Ð°Ð½Ð¾ HTTP-ÑÐ°Ð¿ÐºÑ Ð· ÐºÐ»ÑÑÐµÐ¼ Â«MediaWiki-API-ErrorÂ», Ð° ÑÐ¾Ð´Ñ Ñ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ ÑÐ°Ð¿ÐºÐ¸, Ñ ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸, Ð½Ð°Ð´ÑÑÐ»Ð°Ð½Ñ Ð½Ð°Ð·Ð°Ð´, Ð±ÑÐ´ÑÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð· ÑÐ¸Ð¼ Ð¶Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½ÑÐ¼. ÐÑÐ»ÑÑÐµ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð´Ð¸Ð². Ð½Ð° ÑÑÐ¾ÑÑÐ½ÑÑ [[mw:Special:MyLanguage/API:Errors_and_warnings|API: ÐÐ¾Ð¼Ð¸Ð»ÐºÐ¸ Ð¹ Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ]].\n\nÐ¢ÐµÑÑÑÐ²Ð°Ð½Ð½Ñ: ÐÐ»Ñ Ð·ÑÑÑÐ½Ð¾ÑÑÑ ÑÐµÑÑÑÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸ÑÑÐ² API, Ð´Ð¸Ð². [[Special:ApiSandbox]].", @@ -1457,11 +1458,11 @@ "apihelp-json-param-callback": "Ð¯ÐºÑÐ¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾, Ð¾Ð³Ð¾ÑÑÐ°Ñ Ð²Ð¸Ð²ÑÐ´ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ¾Ð¼ Ð´Ð°Ð½Ð¾Ñ ÑÑÐ½ÐºÑÑÑ. Ð Ð¼ÑÑÐºÑÐ²Ð°Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, ÑÑÑ ÑÐ¿ÐµÑÐ¸ÑÑÑÐ½Ñ Ð´Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð´Ð°Ð½Ñ Ð±ÑÐ´Ðµ ÑÑÑÐ¸Ð¼Ð°Ð½Ð¾.", "apihelp-json-param-utf8": "Ð¯ÐºÑÐ¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾, ÐºÐ¾Ð´ÑÑ Ð±ÑÐ»ÑÑÑÑÑÑ (Ð°Ð»Ðµ Ð½Ðµ Ð²ÑÑ) Ð½Ðµ-ASCII ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² ÑÐº UTF-8, Ð·Ð°Ð¼ÑÑÑÑ Ð·Ð°Ð¼ÑÐ½Ð¸ ÑÑ ÑÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ ÐµÐºÑÐ°Ð½ÑÑÑÐ¸Ð¼Ð¸ Ð¿Ð¾ÑÐ»ÑÐ´Ð¾Ð²Ð½Ð¾ÑÑÑÐ¼Ð¸. ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼ ÐºÐ¾Ð»Ð¸ formatversion Ð½Ðµ Ñ 1.", "apihelp-json-param-ascii": "Ð¯ÐºÑÐ¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾, ÐºÐ¾Ð´ÑÑ Ð²ÑÑ Ð½Ðµ-ASCII Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÐ¸ ÑÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ñ ÐµÐºÑÐ°Ð½ÑÑÑÑ Ð¿Ð¾ÑÐ»ÑÐ´Ð¾Ð²Ð½Ð¾ÑÑÑ. ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼ ÐºÐ¾Ð»Ð¸ formatversion Ñ 1.", - "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ:\n;1:Ð¤Ð¾ÑÐ¼Ð°Ñ Ð·Ð²Ð¾ÑÐ¾ÑÐ½Ð¾Ñ ÑÑÐ¼ÑÑÐ½Ð¾ÑÑÑ (Ð±ÑÐ»ÐµÐ²Ð¸ XML-ÑÑÐ¸Ð»Ñ, * ÐºÐ»ÑÑÑ Ð´Ð»Ñ Ð²ÑÐ·Ð»ÑÐ² Ð²Ð¼ÑÑÑÑ ÑÐ¾ÑÐ¾).\n;2:ÐÐºÑÐ¿ÐµÑÐ¸Ð¼ÐµÐ½ÑÐ°Ð»ÑÐ½Ð¸Ð¹ ÑÑÑÐ°ÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐµÑÐ°Ð»Ñ Ð¼Ð¾Ð¶ÑÑÑ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ.\n;latest:ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð¹Ð¾ÑÑÐ°Ð½Ð½ÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð½Ð°ÑÐ°Ð·Ñ 2). ÐÐ¾Ð¶Ðµ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ Ð±ÐµÐ· Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ.", + "apihelp-json-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ:\n;1:Ð¤Ð¾ÑÐ¼Ð°Ñ Ð·Ð²Ð¾ÑÐ¾ÑÐ½Ð¾Ñ ÑÑÐ¼ÑÑÐ½Ð¾ÑÑÑ (Ð±ÑÐ»ÐµÐ²Ð¸ XML-ÑÑÐ¸Ð»Ñ, * ÐºÐ»ÑÑÑ Ð´Ð»Ñ Ð²ÑÐ·Ð»ÑÐ² Ð²Ð¼ÑÑÑÑ ÑÐ¾ÑÐ¾).\n;2:Ð¡ÑÑÐ°ÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ.\n;latest:ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð¹Ð¾ÑÑÐ°Ð½Ð½ÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð½Ð°ÑÐ°Ð·Ñ 2). ÐÐ¾Ð¶Ðµ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ Ð±ÐµÐ· Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ.", "apihelp-jsonfm-summary": "ÐÐ¸Ð²ÐµÑÑÐ¸ Ð´Ð°Ð½Ñ Ñ ÑÐ¾ÑÐ¼Ð°ÑÑ JSON (Ð²Ð¸Ð²ÑÐ´ Ð²ÑÐ´ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð²Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´Ñ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ HTML).", "apihelp-none-summary": "ÐÑÑÐ¾Ð³Ð¾ Ð½Ðµ Ð²Ð¸Ð²Ð¾Ð´Ð¸ÑÐ¸.", "apihelp-php-summary": "ÐÐ¸Ð²Ð¾Ð´Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ñ ÑÐ¾ÑÐ¼Ð°ÑÑ ÑÐµÑÑÐ°Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ PHP.", - "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ:\n;1:Ð¤Ð¾ÑÐ¼Ð°Ñ Ð·Ð²Ð¾ÑÐ¾ÑÐ½Ð¾Ñ ÑÑÐ¼ÑÑÐ½Ð¾ÑÑÑ (Ð±ÑÐ»ÐµÐ²Ð¸ XML-ÑÑÐ¸Ð»Ñ, * ÐºÐ»ÑÑÑ Ð´Ð»Ñ Ð²ÑÐ·Ð»ÑÐ² Ð²Ð¼ÑÑÑÑ ÑÐ¾ÑÐ¾).\n;2:ÐÐºÑÐ¿ÐµÑÐ¸Ð¼ÐµÐ½ÑÐ°Ð»ÑÐ½Ð¸Ð¹ ÑÑÑÐ°ÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ. ÐÐµÑÐ°Ð»Ñ Ð¼Ð¾Ð¶ÑÑÑ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ.\n;latest:ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð¹Ð¾ÑÑÐ°Ð½Ð½ÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð½Ð°ÑÐ°Ð·Ñ 2). ÐÐ¾Ð¶Ðµ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ Ð±ÐµÐ· Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ.", + "apihelp-php-param-formatversion": "Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ:\n;1:Ð¤Ð¾ÑÐ¼Ð°Ñ Ð·Ð²Ð¾ÑÐ¾ÑÐ½Ð¾Ñ ÑÑÐ¼ÑÑÐ½Ð¾ÑÑÑ (Ð±ÑÐ»ÐµÐ²Ð¸ XML-ÑÑÐ¸Ð»Ñ, * ÐºÐ»ÑÑÑ Ð´Ð»Ñ Ð²ÑÐ·Ð»ÑÐ² Ð²Ð¼ÑÑÑÑ ÑÐ¾ÑÐ¾).\n;2:Ð¡ÑÑÐ°ÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ.\n;latest:ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð¹Ð¾ÑÑÐ°Ð½Ð½ÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ (Ð½Ð°ÑÐ°Ð·Ñ 2). ÐÐ¾Ð¶Ðµ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ÑÑ Ð±ÐµÐ· Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ.", "apihelp-phpfm-summary": "ÐÐ¸Ð²Ð¾Ð´Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ñ ÑÐ¾ÑÐ¼Ð°ÑÑ ÑÐµÑÑÐ°Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ PHP (Ð²Ð¸Ð²ÑÐ´ Ð²ÑÐ´ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð²Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´Ñ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ HTML).", "apihelp-rawfm-summary": "ÐÐ¸Ð²Ð¾Ð´Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ, Ð²ÐºÐ»ÑÑÐ½Ð¾ Ð· ÐµÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ð¼Ð¸ Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ, Ñ ÑÐ¾ÑÐ¼Ð°ÑÑ JSON (Ð²Ð¸Ð²ÑÐ´ Ð²ÑÐ´ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð²Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´Ñ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ HTML).", "apihelp-xml-summary": "ÐÐ¸Ð²Ð¾Ð´Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ñ ÑÐ¾ÑÐ¼Ð°ÑÑ XML.", diff --git a/includes/api/i18n/zh-hant.json b/includes/api/i18n/zh-hant.json index 0c9a0bd8a5..ab32bcb4ef 100644 --- a/includes/api/i18n/zh-hant.json +++ b/includes/api/i18n/zh-hant.json @@ -46,22 +46,28 @@ "apihelp-block-param-watchuser": "ç£è¦ä½¿ç¨èæ IP ä½åçä½¿ç¨èé é¢èå°è©±é é¢ã", "apihelp-block-param-tags": "å¨å°éæ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", "apihelp-block-param-partial": "å°éä½¿ç¨èè¨ªåç¹æ®é é¢æå½åç©ºéï¼èä¸æ¯æ´åç¶²ç«ã", + "apihelp-block-param-pagerestrictions": "å°éä½¿ç¨èååºç·¨è¼¯çæ¨é¡æ¸å®ãåå¨ãpartialãè¢«è¨å®çº true æå¥ç¨ã", "apihelp-block-example-ip-simple": "å°é IP ä½å 192.0.2.5 ä¸å¤©ï¼åå çº First strikeã", "apihelp-block-example-user-complex": "æ°¸ä¹å°é IP ä½å Vandalï¼åå çº Vandalismã", "apihelp-changeauthenticationdata-summary": "çºç®åä½¿ç¨èè®æ´èº«åæ ¸å°è³æã", "apihelp-changeauthenticationdata-example-password": "åè©¦æ´æ¹ç®åä½¿ç¨èçå¯ç¢¼è³ ExamplePasswordã", - "apihelp-checktoken-summary": "æª¢æ¥ä¾èª [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] çå¯é°æææ§ã", + "apihelp-checktoken-summary": "æª¢æ¥ä¾èª [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] çæ¬ææææ§ã", "apihelp-checktoken-param-type": "è¦æ¸¬è©¦çå¯é°é¡åã", - "apihelp-checktoken-param-token": "è¦æ¸¬è©¦çå¯é°ã", - "apihelp-checktoken-param-maxtokenage": "å¯é°çæææéï¼ä»¥ç§çºå®ä½ã", - "apihelp-checktoken-example-simple": "æ¸¬è©¦ csrf å¯é°çæææ§ã", + "apihelp-checktoken-param-token": "è¦æ¸¬è©¦çæ¬æã", + "apihelp-checktoken-param-maxtokenage": "æ¬æçæææéï¼ä»¥ç§çºå®ä½ã", + "apihelp-checktoken-example-simple": "æ¸¬è©¦ csrf æ¬æçæææ§ã", "apihelp-clearhasmsg-summary": "æ¸é¤ç®åä½¿ç¨èç hasmsg æ¨è¨ã", "apihelp-clearhasmsg-example-1": "æ¸é¤ç®åä½¿ç¨èç hasmsg æ¨è¨ã", + "apihelp-clientlogin-summary": "ä½¿ç¨äºåæµç¨ä¾ç»å¥ wikiã", + "apihelp-clientlogin-example-login": "éå§ä»¥ä½¿ç¨è Example èå¯ç¢¼ ExamplePassword ä¾ç»å¥è³ wiki çéç¨ã", + "apihelp-clientlogin-example-login2": "å¨ UI åæééèªèå¾ç¹¼çºç»å¥ï¼æä¾ 987654 ç OATHTokenã", "apihelp-compare-summary": "æ¯è¼ 2 åé é¢éçå·®ç°ã", "apihelp-compare-extended-description": "\"from\" ä»¥å \"to\" çä¿®è¨ç·¨èï¼é é¢æ¨é¡æé é¢ ID çºå¿å¡«ã", "apihelp-compare-param-fromtitle": "è¦æ¯å°çç¬¬ä¸åæ¨é¡ã", "apihelp-compare-param-fromid": "è¦æ¯å°çç¬¬ä¸åé é¢ IDã", "apihelp-compare-param-fromrev": "è¦æ¯å°çç¬¬ä¸åä¿®è¨ã", + "apihelp-compare-param-frompst": "å¨ fromtext-{slot} é²è¡é åå²åè½æã", + "apihelp-compare-param-fromcontentmodel-{slot}": "fromtext-{slot} å§å®¹æ¨¡çµãè¥ä¸æä¾ï¼åææ ¹æå¶å®åæ¸çæ¸¬ã", "apihelp-compare-param-fromcontentformat-{slot}": "fromtext-{slot} çå§å®¹åºååæ ¼å¼ã", "apihelp-compare-param-fromtext": "æå® fromslots=main ä¸¦æ¹ç¨ fromtext-mainã", "apihelp-compare-param-fromcontentmodel": "æå® fromslots=main ä¸¦æ¹ä½¿ç¨ fromcontentmodel-mainã", @@ -70,6 +76,7 @@ "apihelp-compare-param-toid": "è¦æ¯å°çç¬¬äºåé é¢ IDã", "apihelp-compare-param-torev": "è¦æ¯å°çç¬¬äºåä¿®è¨ã", "apihelp-compare-param-topst": "å¨ totext å·è¡é åä¿åè½æã", + "apihelp-compare-param-tocontentmodel-{slot}": "totext-{slot} å§å®¹æ¨¡çµãè¥ä¸æä¾ï¼åæåºæ¼å¶å®åæ¸ä¾çæ¸¬ã", "apihelp-compare-param-tocontentformat-{slot}": "totext-{slot} çå§å®¹åºååæ ¼å¼ã", "apihelp-compare-param-totext": "æå® toslots=main ä¸¦æ¹ç¨ totext-mainã", "apihelp-compare-param-tocontentmodel": "æå® toslots=main ä¸¦æ¹ä½¿ç¨ tocontentmodel-mainã", @@ -85,10 +92,11 @@ "apihelp-compare-paramvalue-prop-size": "ãfromãèãtoãä¿®è¨çå¤§å°ã", "apihelp-compare-example-1": "å»ºç«ä¿®è¨ 1 è 1 çå·®ç°æª", "apihelp-createaccount-summary": "å»ºç«æ°ä½¿ç¨èå¸³èã", + "apihelp-createaccount-example-create": "éå§å»ºç«ä½¿ç¨è Example èå¯ç¢¼ ExamplePassword çéç¨ã", "apihelp-createaccount-param-name": "ä½¿ç¨èåç¨±ã", "apihelp-createaccount-param-password": "å¯ç¢¼ (è¥æè¨å® $1mailpassword åå¯ç¥é)ã", "apihelp-createaccount-param-domain": "å¤é¨èº«åæ ¸å°ä½¿ç¨çç¶²å (å¯æå¯ç¡)ã", - "apihelp-createaccount-param-token": "å¨ç¬¬ä¸æ¬¡è«æ±æå·²åå¾çå¸³èå»ºç«éé°ã", + "apihelp-createaccount-param-token": "å¨ç¬¬ä¸æ¬¡è«æ±æå·²åå¾çå¸³èå»ºç«æ¬æã", "apihelp-createaccount-param-email": "ä½¿ç¨èçé»åéµä»¶å°å (å¯æå¯ç¡) ã", "apihelp-createaccount-param-realname": "ä½¿ç¨èççå¯¦å§å (å¯æå¯ç¡)ã", "apihelp-createaccount-param-mailpassword": "è¥è¨çºå¶ä»å¼ï¼å°æä»¥é»åéµä»¶å¯éé¨æ©å¯ç¢¼çµ¦ä½¿ç¨èã", @@ -96,13 +104,14 @@ "apihelp-createaccount-param-language": "è¦è¨å®çä½¿ç¨èé è¨èªè¨ä»£ç¢¼ (é¸å¡«ï¼é è¨ä¾æå§å®¹èªè¨)ã", "apihelp-createaccount-example-pass": "å»ºç«ä½¿ç¨è testuser ä½¿ç¨å¯ç¢¼ test123", "apihelp-createaccount-example-mail": "å»ºç«ä½¿ç¨è testmailuser ä¸¦ä¸é»åéµä»¶éç¥é¨æ©ç¢ççå¯ç¢¼ã", + "apihelp-cspreport-param-source": "çæè§¸ç¼æ¤å ±åä¹ CSP æ¨é çäºç©", "apihelp-delete-summary": "åªé¤é é¢ã", "apihelp-delete-param-title": "æ¨æ¬²åªé¤çé é¢æ¨é¡ã ç¡æ³è $1pageid åæä½¿ç¨ã", "apihelp-delete-param-pageid": "æ¨æ¬²åªé¤é é¢çé é¢ IDã ç¡æ³è $1title åæä½¿ç¨ã", "apihelp-delete-param-reason": "åªé¤çåå ã è¥æªè¨å®ï¼å°æä½¿ç¨èªåç¢ççåå ã", "apihelp-delete-param-tags": "å¨åªé¤æ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", "apihelp-delete-param-watch": "å å¥ç®åé é¢è³æ¨çç£è¦æ¸å®ã", - "apihelp-delete-param-watchlist": "ç¡æ¢ä»¶ä½¿ç¨è¨ç½®å°é é¢å å¥æç§»é¤ç®åä½¿ç¨èçç£è¦æ¸å®æèæ¯ä¸æ´æ¹ç£è¦æ¸å®ã", + "apihelp-delete-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-delete-param-unwatch": "å¾æ¨çç£è¦æ¸å®ä¸ç§»é¤ç®åé é¢ã", "apihelp-delete-param-oldimage": "ç± [[Special:ApiHelp/query+imageinfo|action=query&prop=imageinfo&iiprop=archivename]] ææä¾è¦åªé¤çèåçåç¨±ã", "apihelp-delete-example-simple": "åªé¤ Main Pageã", @@ -111,7 +120,7 @@ "apihelp-edit-summary": "å»ºç«èç·¨è¼¯é é¢ã", "apihelp-edit-param-title": "æ¨æ¬²ç·¨è¼¯çé é¢æ¨é¡ã ç¡æ³è $1pageid åæä½¿ç¨ã", "apihelp-edit-param-pageid": "æ¨æ¬²ç·¨è¼¯é é¢çé é¢ IDã ç¡æ³è $1title åæä½¿ç¨ã", - "apihelp-edit-param-section": "ç« ç¯ç·¨èã 0 ä»£è¡¨æä¸å±¤ç« ç¯ï¼new ä»£è¡¨æ°ç« ç¯ã", + "apihelp-edit-param-section": "ç« ç¯ç·¨èã0 ä»£è¡¨æä¸å±¤ç« ç¯ï¼new ä»£è¡¨æ°ç« ç¯ã", "apihelp-edit-param-sectiontitle": "æ°ç« ç¯çæ¨é¡ã", "apihelp-edit-param-text": "é é¢å§å®¹ã", "apihelp-edit-param-summary": "ç·¨è¼¯æè¦ã ç¶æªè¨å® $1section=new è $1sectiontitle æä¹æç¶åç« ç¯æ¨é¡ã", @@ -120,17 +129,20 @@ "apihelp-edit-param-notminor": "éå°ç·¨è¼¯ã", "apihelp-edit-param-bot": "æ¨è¨æ¤ç·¨è¼¯çºæ©å¨äººç·¨è¼¯ã", "apihelp-edit-param-basetimestamp": "åºæ¼ä¿®è¨çæéæ³è¨ï¼ç¨ä¾æª¢æ¸¬ç·¨è¼¯è¡çªãä¹è®¸å¯ä»¥åå¾[[Special:ApiHelp/query+revisions|action=query&prop=revisions&rvprop=timestamp]]èªå¯ã", + "apihelp-edit-param-recreate": "è¦èæéé é¢å¨æ¤æéå·²è¢«åªé¤çä»»ä½é¯èª¤ã", "apihelp-edit-param-createonly": "è¥é é¢å·²åå¨ï¼åä¸ç·¨è¼¯é é¢ã", "apihelp-edit-param-nocreate": "è¥é é¢ä¸åå¨ï¼åç¢çé¯èª¤ã", "apihelp-edit-param-watch": "å å¥ç®åé é¢è³æ¨çç£è¦æ¸å®ã", "apihelp-edit-param-unwatch": "å¾æ¨çç£è¦æ¸å®ä¸ç§»é¤ç®åé é¢ã", - "apihelp-edit-param-watchlist": "ç¡æ¢ä»¶ä½¿ç¨è¨ç½®å°é é¢å å¥æç§»é¤ç®åä½¿ç¨èçç£è¦æ¸å®æèæ¯ä¸æ´æ¹ç£è¦æ¸å®ã", + "apihelp-edit-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-edit-param-prependtext": "æ·»å æ¤æåè³é é¢éé ãè¦è$1textã", + "apihelp-edit-param-appendtext": "æ·»å è³é é¢çµå°¾çæåãè¦è$1textã\n\nä½¿ç¨ $1section=new ä¾æ·»å æ°çæ®µè½ï¼èéæ¤åæ¸ã", "apihelp-edit-param-undo": "å¾©åæ¤ä¿®è¨ãè¦å¯« $1textã$1prependtext è $1appendtextã", "apihelp-edit-param-undoafter": "æ¤é·å¾ $1undo è³æ¤çºæ¢çææä¿®è¨ãè¥ä¸è¨å®ååææ¤é·ä¸æ¬¡ä¿®è¨ã", "apihelp-edit-param-redirect": "èªååè§£æ±ºéæ°å°åã", "apihelp-edit-param-contentformat": "ç¨æ¼è¼¸å¥æåçå§å®¹åºååæ ¼å¼ã", "apihelp-edit-param-contentmodel": "æ°å§å®¹çå§å®¹æ¨¡çµã", + "apihelp-edit-param-token": "æ¬ææç¨çºç¼éçæå¾åæ¸ï¼æè³å°å¨ $1text åæ¸ä¹å¾ã", "apihelp-edit-example-edit": "ç·¨è¼¯é é¢", "apihelp-edit-example-prepend": "åç½®é é¢ç __NOTOC__ã", "apihelp-edit-example-undo": "æ¤é·å¾ 13579 è³ 13585 ä¹éçä¿®è¨ï¼ä¸¦å¸¶èªåçæçæè¦ã", @@ -149,10 +161,12 @@ "apihelp-expandtemplates-paramvalue-prop-volatile": "è¼¸åºå§å®¹æ¯å¦æè®ï¼ä¸æ¯å¦ä¸æå¨é é¢å¶å®ä½ç½®è£¡éè¤ä½¿ç¨ã", "apihelp-expandtemplates-paramvalue-prop-jsconfigvars": "æå®é é¢ç JavaScript è¨ç½®è®éã", "apihelp-expandtemplates-paramvalue-prop-encodedjsconfigvars": "æå®é é¢ç JavaScript è¨ç½®è®éçº JSON åä¸²ã", + "apihelp-expandtemplates-paramvalue-prop-parsetree": "è¼¸åºç XML è§£ææ¨¹çã", "apihelp-expandtemplates-param-includecomments": "è¼¸åºè£¡æ¯å¦åå« HTML è¨»è§£ã", + "apihelp-expandtemplates-param-generatexml": "ç¢ç XML è§£ææ¨¹çï¼ä»¥ $1prop=parsetree åä»£ï¼ã", "apihelp-expandtemplates-example-simple": "å±é wiki æå{{Project:Sandbox}}ã", - "apihelp-feedcontributions-summary": "åå³ä½¿ç¨èè²¢ç» Feedã", - "apihelp-feedcontributions-param-feedformat": "Feed çæ ¼å¼ã", + "apihelp-feedcontributions-summary": "åå³ä½¿ç¨èè²¢ç»æè¦ã", + "apihelp-feedcontributions-param-feedformat": "æè¦çæ ¼å¼ã", "apihelp-feedcontributions-param-user": "è¦åå¾åªäºä½¿ç¨èçè²¢ç»ã", "apihelp-feedcontributions-param-year": "èµ·å§å¹´ä»½ï¼æ´æ©ä¹åï¼ã", "apihelp-feedcontributions-param-month": "èµ·å§æä»½ï¼æ´æ©ä¹åï¼ã", @@ -163,7 +177,7 @@ "apihelp-feedcontributions-param-hideminor": "é±èå°ç·¨è¼¯ã", "apihelp-feedcontributions-param-showsizediff": "é¡¯ç¤ºä¿®è¨çæ¬ä¹éçå·®ç°å¤§å°ã", "apihelp-feedcontributions-example-simple": "è¿åä½¿ç¨èExampleçè²¢ç»ã", - "apihelp-feedrecentchanges-summary": "è¿åæè¿è®æ´æè¦ã", + "apihelp-feedrecentchanges-summary": "è¿åè¿æè®æ´æè¦ã", "apihelp-feedrecentchanges-param-feedformat": "æè¦æ ¼å¼ã", "apihelp-feedrecentchanges-param-namespace": "ç¨æ¼éå¶çµæçå½åç©ºéã", "apihelp-feedrecentchanges-param-invert": "é¤æé¸å®èå¤çææå½åç©ºéã", @@ -182,16 +196,20 @@ "apihelp-feedrecentchanges-param-target": "åé¡¯ç¤ºå¾è©²é é¢æé£çµé é¢ä¸çè®æ´ã", "apihelp-feedrecentchanges-example-simple": "é¡¯ç¤ºè¿æè®æ´ã", "apihelp-feedrecentchanges-example-30days": "é¡¯ç¤ºè¿æ30å¤©å§çè®å", - "apihelp-feedwatchlist-summary": "è¿åç£è¦æ¸å® feedã", - "apihelp-feedwatchlist-param-feedformat": "Feed çæ ¼å¼ã", + "apihelp-feedwatchlist-summary": "è¿åç£è¦æ¸å®æè¦ã", + "apihelp-feedwatchlist-param-feedformat": "æè¦çæ ¼å¼ã", "apihelp-feedwatchlist-param-hours": "ååºå¨å¹¾å°æå§çé é¢è®åã", "apihelp-feedwatchlist-param-linktosections": "è¥å¯ä»¥çè©±ï¼ç´æ¥é£çµè³æ´æ¹éçæ®µè½ã", + "apihelp-feedwatchlist-example-default": "é¡¯ç¤ºç£è¦æ¸å®æè¦ã", "apihelp-feedwatchlist-example-all6hrs": "é¡¯ç¤ºéå» 6 å°æå¨ç£è¦é é¢çæææ´æ¹ã", "apihelp-filerevert-summary": "åéæªæ¡è³èççæ¬ã", "apihelp-filerevert-param-filename": "ç®æ¨æªæ¡åç¨±ï¼ä¸éåå«ãFile:ãéæ¨£çåç¶´ååã", "apihelp-filerevert-param-comment": "ä¸è¼æè¦ã", + "apihelp-filerevert-param-archivename": "è¦å¾©åçä¿®è¨åæªåç¨±ã", "apihelp-filerevert-example-revert": "åé Wiki.png è³ 2011-03-05T15:27:40Z ççæ¬ã", "apihelp-help-summary": "é¡¯ç¤ºæå®æ¨¡çµçèªªæã", + "apihelp-help-param-helpformat": "èªªæè¼¸åºçæ ¼å¼ã", + "apihelp-help-param-wrap": "å¨æ¨æº API åæçµæ§è£¡åè£¹è¼¸åºã", "apihelp-help-param-toc": "å¨ HTML è¼¸åºè£¡åå«ç®éã", "apihelp-help-example-main": "ä¸»æ¨¡çµä½¿ç¨èªªæ", "apihelp-help-example-submodules": "ç¨æ¼ action=query èå¶ææåæ¨¡çµçå¹«å©ã", @@ -204,6 +222,7 @@ "apihelp-imagerotate-example-simple": "90 åº¦æè½ File:Example.pngã", "apihelp-imagerotate-example-generator": "180 åº¦æè½ææå¨ Category:Flip è£¡çåçã", "apihelp-import-summary": "å¾å¶å® wiki æ XML æªæ¡ä¾å¯å¥é é¢ã", + "apihelp-import-extended-description": "è«æ³¨æç¶ç¼éç¨æ¼ xml åæ¸çæªæ¡æï¼å¿é ä»¥ HTTP POST ä½çºæªæ¡ä¸å³ï¼è¨»ï¼ä½¿ç¨ multipart/form-dataï¼ã", "apihelp-import-param-summary": "å¯å¥æè¦ã", "apihelp-import-param-xml": "ä¸è¼ç XML æªã", "apihelp-import-param-assignknownusers": "åéç·¨è¼¯è³æå½åä½¿ç¨èå·²åå¨æ¬å°çæ¬å°ä½¿ç¨èã", @@ -217,9 +236,12 @@ "apihelp-linkaccount-summary": "å¾ç¬¬ä¸æ¹ä¾æèä¾é£çµå¸³èè³ç®åçä½¿ç¨èã", "apihelp-linkaccount-example-link": "éå§é²è¡å¾ Example é£çµè³å¸³èçç¨åºã", "apihelp-login-summary": "ç»å¥ä¸¦åå¾èº«åæ ¸å° cookies", + "apihelp-login-extended-description-nobotpasswords": "æ¤æä½å·²è¢«æ£ç¨ï¼ä¸å¯è½å¨ä¸å¸¶è¦åçææ³ä¸å¤±æãè¦å®å¨ç»å¥è«ä½¿ç¨ [[Special:ApiHelp/clientlogin|action=clientlogin]]ã", "apihelp-login-param-name": "ä½¿ç¨èåç¨±ã", "apihelp-login-param-password": "å¯ç¢¼ã", "apihelp-login-param-domain": "ç¶²ååç¨±ï¼å¯æå¯ç¡ï¼ã", + "apihelp-login-param-token": "å¨é¦æ¬¡è«æ±ç²å¾çç»å¥æ¬æã", + "apihelp-login-example-gettoken": "æª¢ç´¢ç»å¥æ¬æã", "apihelp-login-example-login": "ç»å¥", "apihelp-logout-summary": "ç»åºä¸¦æ¸é¤ session è³æã", "apihelp-logout-example-logout": "ç»åºç¶åä½¿ç¨è", @@ -248,7 +270,7 @@ "apihelp-move-param-noredirect": "ä¸è¦å»ºç«éæ°å°åã", "apihelp-move-param-watch": "å°é é¢åéå®åå å¥ç®åä½¿ç¨èçç£è¦æ¸å®ã", "apihelp-move-param-unwatch": "å¾ç®åä½¿ç¨èçç£è¦æ¸å®ä¸ç§»é¤é é¢åéå®åã", - "apihelp-move-param-watchlist": "å¨ç®åä½¿ç¨èçç£è¦æ¸å®ä¸ç¡æ¢ä»¶å°å å¥æç§»é¤é é¢ï¼æä½¿ç¨è¨å®ï¼æä¸è®æ´ç£è¦æ¸å®ã", + "apihelp-move-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-move-param-ignorewarnings": "å¿½ç¥ææè¦åã", "apihelp-move-example-move": "å°Badtitleç§»åè³Goodtitleï¼ä¸çä¸éå®åã", "apihelp-opensearch-summary": "ä½¿ç¨ OpenSearch åå®æå°æ¬ wikiã", @@ -258,6 +280,7 @@ "apihelp-opensearch-param-suggest": "è¥[[mw:Special:MyLanguage/Manual:$wgEnableOpenSearchSuggest|$wgEnableOpenSearchSuggest]]è¨å®çºfalseï¼åä¸åä»»ä½äºã", "apihelp-opensearch-param-redirects": "å¦ä½èçéå®åï¼\n;return:å³åéå®åæ¬èº«ã\n;resolve:å³åç®æ¨é é¢ï¼å³åççµææ¸ç®å¯è½å°æ¼$1limitã\nç±æ¼æ·å²åå ï¼$1format=jsonçé è¨å¼çºãreturnãï¼å¶ä»æ ¼å¼åçºãresolveãã", "apihelp-opensearch-param-format": "è¼¸åºçæ ¼å¼ã", + "apihelp-opensearch-param-warningsaserror": "è¥è¦åä»¥ format=json æåæï¼åå³ API é¯èª¤èéå¿½ç¥æã", "apihelp-opensearch-example-te": "æ¾åºä»¥ Te çºéé çé é¢ã", "apihelp-options-summary": "æ´æ¹ç®åä½¿ç¨èçåå¥½è¨å®ã", "apihelp-options-param-reset": "éè¨åå¥½è¨å®çºç¶²ç«é è¨å¼ã", @@ -269,6 +292,9 @@ "apihelp-options-example-complex": "éç½®ææåå¥½è¨å®ï¼ç¶å¾åè¨å® skin è nicknameã", "apihelp-paraminfo-summary": "ç²å¾æé API æ¨¡çµçè³è¨ã", "apihelp-paraminfo-param-helpformat": "èªªæåä¸²çæ ¼å¼ã", + "apihelp-paraminfo-param-querymodules": "æ¥è©¢æ¨¡çµåç¨±æ¸å®ï¼propãmetaãæ list åæ¸çå¼ï¼ãä½¿ç¨ $1modules=query+fooï¼èé $1querymodules=fooã", + "apihelp-paraminfo-param-mainmodule": "å¦ååå¾æéä¸»è¦ï¼æé«ç´å¥ï¼æ¨¡çµçè³è¨ãå¯æ¹ç¨ $1modules=mainã", + "apihelp-paraminfo-param-pagesetmodule": "å¦ååå¾æéé é¢è¨å®æ¨¡çµï¼æä¾ titles= èåäººï¼çè³è¨ã", "apihelp-paraminfo-param-formatmodules": "æ ¼å¼æ¨¡çµåç¨±æ¸å®ï¼format åæ¸çå¼ï¼ãè«æ¹ç¨ $1modules ã", "apihelp-paraminfo-example-1": "é¡¯ç¤º [[Special:ApiHelp/parse|action=parse]]ã[[Special:ApiHelp/jsonfm|format=jsonfm]]ã[[Special:ApiHelp/query+allpages|action=query&list=allpages]]ãå [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]] çè³è¨ã", "apihelp-paraminfo-example-2": "é¡¯ç¤º [[Special:ApiHelp/query|action=query]] ææåæ¨¡çµçè³è¨ã", @@ -294,18 +320,28 @@ "apihelp-parse-paramvalue-prop-displaytitle": "æ·»å å·²è§£æ wiki æåçæ¨é¡ã", "apihelp-parse-paramvalue-prop-headitems": "æä¾æ¾ç½®é é¢è£¡ç <head> ä¹é ç®ã", "apihelp-parse-paramvalue-prop-headhtml": "åå¾é é¢å·²è§£æç <head>ã", + "apihelp-parse-paramvalue-prop-jsconfigvars": "éå°é é¢æä¾æå®ç JavaScript è¨ç½®è®æ¸ãè¥è¦å¥ç¨ï¼è«ä½¿ç¨ mw.config.set()ã", "apihelp-parse-paramvalue-prop-encodedjsconfigvars": "æå®é é¢ç JavaScript è¨ç½®è®éçº JSON åä¸²ã", + "apihelp-parse-paramvalue-prop-indicators": "æä¾ä½¿ç¨å¨é é¢çé é¢çææç¤º HTMLã", "apihelp-parse-paramvalue-prop-iwlinks": "å¨å·²è§£æç wiki æåæä¾è·¨ wiki é£çµã", "apihelp-parse-paramvalue-prop-wikitext": "æå®è¢«è§£æçåå§ wiki æåã", "apihelp-parse-paramvalue-prop-properties": "æå®å¤é å®ç¾©å¨å·²è§£æåå§ wiki æåçå±¬æ§ã", "apihelp-parse-paramvalue-prop-limitreportdata": "åå¾çµæ§åéå¶å ±åãç¶æè¨å® $1disablelimitreport æï¼åä¸æçµ¦äºè³æã", "apihelp-parse-paramvalue-prop-limitreporthtml": "åå¾éå¶å ±åç HTML çæ¬ãç¶æè¨å® $1disablelimitreport æï¼åä¸æçµ¦äºè³æã", + "apihelp-parse-paramvalue-prop-parsetree": "ä¿®è¨å§å®¹ç XML è§£ææ¨¹çï¼éè¦å§å®¹æ¨¡çµ $1ï¼", "apihelp-parse-paramvalue-prop-parsewarnings": "æä¾ç¼çå¨è§£æå§å®¹æçè¦åã", + "apihelp-parse-param-wrapoutputclass": "è¦åå¨è§£æå¨è¼¸åºå§å®¹ç CSS é¡å¥ã", + "apihelp-parse-param-effectivelanglinks": "åå«ç±æ´åæä¾çèªè¨é£çµï¼è $1prop=langlinks ä¸èµ·ä½¿ç¨ï¼ã", + "apihelp-parse-param-disablelimitreport": "å¾è§£æè¼¸åºå§å®¹è£¡çç¥éå¶å ±åï¼\"NewPP limit report\"ï¼ã", "apihelp-parse-param-disablepp": "è«æ¹ç¨$1disablelimitreportã", "apihelp-parse-param-disableeditsection": "å¾è§£æè¼¸åºå§å®¹çç¥ç·¨è¼¯æ®µè½é£çµã", "apihelp-parse-param-disabletidy": "ä¸è¦å¨è§£æè¼¸åºè£¡å·è¡ HTML å§å®¹æ¸çï¼ä¾å¦ä½¿ç¨ tidy è»é«å·¥å·ï¼", + "apihelp-parse-param-disablestylededuplication": "ä¸è¦å¨è§£æçµæå»é¤éè¤çè¡å§æ¨£å¼è¡¨ã", + "apihelp-parse-param-generatexml": "ç¢ç XML è§£ææ¨¹çï¼éè¦è¢« $2prop=parsetree çµ¦åä»£ç $1 å§å®¹æ¨¡çµï¼ã", "apihelp-parse-param-preview": "å¨é è¦½æ¨¡å¼ä¸è§£æã", + "apihelp-parse-param-sectionpreview": "å¨æ®µè½é è¦½æ¨¡å¼ä¸è§£æï¼è¦åæåç¨é è¦½æ¨¡å¼ï¼ã", "apihelp-parse-param-disabletoc": "å¨è¼¸åºè£¡å¿½ç¥ç®éã", + "apihelp-parse-param-useskin": "å¥ç¨æé¸çå¤è§è³è§£æè¼¸åºãå¯è½æå½±é¿ä»¥ä¸åæ¸ï¼langlinksãheaditemsãmodulesãjsconfigvarsãindicatorsã", "apihelp-parse-example-page": "è§£æé é¢ã", "apihelp-parse-example-text": "è§£æ wikitextã", "apihelp-parse-example-texttitle": "è§£æ wikitextï¼æå®é é¢æ¨é¡ã", @@ -314,7 +350,7 @@ "apihelp-patrol-param-rcid": "è¦å·¡æ¥çæè¿è®æ´ IDã", "apihelp-patrol-param-revid": "è¦å·¡æ¥çä¿®è¨ IDã", "apihelp-patrol-param-tags": "å¨å·¡æ¥æ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", - "apihelp-patrol-example-rcid": "å·¡æ¥ä¸æ¬¡æè¿è®æ´ã", + "apihelp-patrol-example-rcid": "å·¡æ¥ä¸æ¬¡è¿æè®æ´ã", "apihelp-patrol-example-revid": "å·¡æ¥ä¸åä¿®è¨ã", "apihelp-protect-summary": "è®æ´é é¢çä¿è·å±¤ç´ã", "apihelp-protect-param-title": "è¦(è§£é¤)ä¿è·é é¢çæ¨é¡ã ä¸è½è $1pageid ä¸èµ·ä½¿ç¨ã", @@ -325,7 +361,7 @@ "apihelp-protect-param-tags": "ä¿®æ¹æ¨ç±¤ä»¥å¥ç¨æ¼ä¿è·æ¥èªè£¡çé ç®ã", "apihelp-protect-param-cascade": "åç¨é£éä¿è·ï¼ä¹å°±æ¯ä¿è·åå«æ¼æ¤é é¢çé é¢ï¼ãå¦ææææä¾çä¿è·çç´ä¸æ¯æ´é£éï¼å°±å°å¶å¿½ç¥ã", "apihelp-protect-param-watch": "å¦æè¢«è¨å®ï¼å°±å°è¢«ï¼è§£é¤ï¼ä¿è·çé é¢å è³ç®åä½¿ç¨èçç£è¦åè¡¨ã", - "apihelp-protect-param-watchlist": "ç¡æ¢ä»¶å°å°è©²é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦åè¡¨ãä½¿ç¨åå¥½è¨å®æä¸æ´æ¹ç£è¦ã", + "apihelp-protect-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-protect-example-protect": "ä¿è·ä¸åé é¢ã", "apihelp-protect-example-unprotect": "ééè¨å®çº allï¼è¨»ï¼ä»£è¡¨ä»»ä½äººé½å¯ä»¥å·è¡æä½ï¼ï¼ä¾è§£é¤å°é é¢çä¿è·ã", "apihelp-protect-example-unprotect2": "ééè¨å®çºæ²æéå¶ï¼ä¾è§£é¤å°é é¢çä¿è·ã", @@ -335,6 +371,7 @@ "apihelp-purge-example-simple": "æ¸é¤ Main Page è API é é¢ã", "apihelp-purge-example-generator": "éæ°æ´çä¸»è¦å½åç©ºéçå10åé é¢ã", "apihelp-query-summary": "æ·åä¾èªåæéMediaWikiçæ¸æã", + "apihelp-query-extended-description": "ææè³æè®åå°æåä½¿ç¨æ¥è©¢ä¾åå¾æ¬æï¼ä»¥é¿åä¾èªæ¡æç¶²ç«çæ¿«ç¨è¡çºã", "apihelp-query-param-prop": "æ¿å·²æ¥è©¢é é¢æè¦åå¾çå±¬æ§ã", "apihelp-query-param-list": "è¦åå¾çæ¸å®ã", "apihelp-query-param-meta": "è¦åå¾çè©®éè³æã", @@ -354,6 +391,8 @@ "apihelp-query+allcategories-param-prop": "è¦åå¾çå±¬æ§ã", "apihelp-query+allcategories-paramvalue-prop-size": "å¨åé¡è£¡æ·»å é é¢æ¸ã", "apihelp-query+allcategories-paramvalue-prop-hidden": "æ¨è¨ç± __HIDDENCAT__ é±èçåé¡ã", + "apihelp-query+allcategories-example-size": "ååºåé¡ä»¥åååå«å¤å°é é¢çè³è¨ã", + "apihelp-query+allcategories-example-generator": "æ¿ä»¥ List éé çåé¡ç´¢åè©²åé¡é é¢æ¬èº«çè³è¨ã", "apihelp-query+alldeletedrevisions-summary": "ä¾ä½¿ç¨èææå¨å½åç©ºéä¾ååºææå·²åªé¤çä¿®è¨ã", "apihelp-query+alldeletedrevisions-paraminfo-useronly": "åè $3user ä¸åä½¿ç¨ã", "apihelp-query+alldeletedrevisions-paraminfo-nonuseronly": "ä¸è½è $3user ä¸åä½¿ç¨ã", @@ -366,6 +405,7 @@ "apihelp-query+alldeletedrevisions-param-user": "æ¤ååºç±è©²ä½¿ç¨èä½åºçä¿®è¨ã", "apihelp-query+alldeletedrevisions-param-excludeuser": "ä¸è¦ååºç±è©²ä½¿ç¨èä½åºçä¿®è¨ã", "apihelp-query+alldeletedrevisions-param-namespace": "åååºæ¤å½åç©ºéçé é¢ã", + "apihelp-query+alldeletedrevisions-param-miser-user-namespace": "æ³¨æï¼åºæ¼ [[mw:Special:MyLanguage/Manual:$wgMiserMode|miser æ¨¡å¼]]ç·£æï¼åæä½¿ç¨ $1user è $1namespace å¯è½æå°è´å¨ç¹¼çºä¹åï¼å³åå°æ¼ $1limit çççµæï¼ä¸¦å¯è½ä¸æå³åä»»ä½ç»æã", "apihelp-query+alldeletedrevisions-param-generatetitles": "ç¶ä½çºç¢çå¨æä½¿ç¨ï¼ç¢çæ¨é¡èéä¿®è¨ IDã", "apihelp-query+alldeletedrevisions-example-user": "ååºç±ä½¿ç¨è Example ååºçæè¿ 50 åè²¢ç»ã", "apihelp-query+alldeletedrevisions-example-ns-main": "ååºå¨ä¸»å½åç©ºéçå 50 åå·²åªé¤ä¿®è¨ã", @@ -441,6 +481,7 @@ "apihelp-query+allpages-param-prlevel": "ç¯©é¸åºæ¼ä¿è·ç´å¥çä¿è·ï¼å¿é è $1prtype= åæ¸ä¸èµ·ä½¿ç¨ï¼ã", "apihelp-query+allpages-param-limit": "è¦åå³çé é¢ç¸½æ¸ã", "apihelp-query+allpages-param-dir": "ååºæææ¡ç¨çæ¹åã", + "apihelp-query+allpages-param-filterlanglinks": "ç¯©é¸åºæ¼é é¢æ¯å¦æèªè¨é£çµãè«æ³¨æéå¯è½ä¸æèæ®ç±æ´åææ·»å çèªè¨é£çµã", "apihelp-query+allpages-example-B": "é¡¯ç¤ºä»¥åæ¯ B çºéé çææé é¢æ¸å®ã", "apihelp-query+allpages-example-generator": "é¡¯ç¤º 4 åä»¥ T çºéé çé é¢ä¹è³è¨ã", "apihelp-query+allpages-example-generator-revisions": "é¡¯ç¤ºå 2 åä»¥ Re çºéé çééæ°å°åé é¢å§å®¹ã", @@ -474,6 +515,7 @@ "apihelp-query+mystashedfiles-paramvalue-prop-size": "ç´¢åæªæ¡å¤§å°èåçå°ºå¯¸ã", "apihelp-query+mystashedfiles-paramvalue-prop-type": "ç´¢åæªæ¡ç MIME é¡åä»¥ååªé«é¡åã", "apihelp-query+mystashedfiles-param-limit": "è¦åå¾çæªæ¡æ¸éã", + "apihelp-query+alltransclusions-summary": "ååºææåµå¥ï¼é é¢ä½¿ç¨ {{x}} ä¾å§åµï¼ï¼åå«ä¸åå¨çã", "apihelp-query+alltransclusions-param-from": "è¦èµ·å§åèçåµå¥æ¨é¡ã", "apihelp-query+alltransclusions-param-to": "è¦çµæ¢åèçåµå¥æ¨é¡ã", "apihelp-query+alltransclusions-param-prefix": "æå°ä»¥æ¤å¼çºéé çææåµå¥æ¨é¡ã", @@ -496,8 +538,12 @@ "apihelp-query+allusers-param-excludegroup": "æé¤æå®ç¾¤çµä¸çä½¿ç¨è", "apihelp-query+allusers-param-prop": "è¦åå«çè³è¨é¨ä»½ï¼", "apihelp-query+allusers-paramvalue-prop-blockinfo": "æ·»å æéä½¿ç¨èç®åå°éçè³è¨ã", + "apihelp-query+allusers-paramvalue-prop-groups": "ååºä½¿ç¨èæå¨çç¾¤çµãéæä½¿ç¨å°è¼å¤ä¼ºæå¨è³æºï¼ä¸¦ä¸å¯è½æåå³å°æ¼éå¶æ¢ä»¶ççµæã", + "apihelp-query+allusers-paramvalue-prop-implicitgroups": "ååºä½¿ç¨èèªååå¥çææç¾¤çµã", "apihelp-query+allusers-paramvalue-prop-rights": "ååºä½¿ç¨èæææçæ¬éã", "apihelp-query+allusers-paramvalue-prop-editcount": "æ·»å ä½¿ç¨èçç·¨è¼¯æ¬¡æ¸ã", + "apihelp-query+allusers-paramvalue-prop-registration": "è¥å¯è½çè©±ï¼æ·»å ç¶ä½¿ç¨èè¨»åæçæéæ³è¨ï¼å¯è½çºç©ºç½ï¼ã", + "apihelp-query+allusers-paramvalue-prop-centralids": "æ¿ä½¿ç¨èæ·»å ä¸å¿ ID èéå çæã", "apihelp-query+allusers-param-limit": "è¦åå³çä½¿ç¨èåç¨±ç¸½æ¸ã", "apihelp-query+allusers-param-witheditsonly": "åååºæåéç·¨è¼¯çä½¿ç¨èã", "apihelp-query+allusers-param-activeusers": "åååºå¨æè¿ $1 {{PLURAL:$1|å¤©|å¤©}}è£¡æ´»èºçä½¿ç¨èã", @@ -510,6 +556,8 @@ "apihelp-query+backlinks-param-pageid": "è¦æå°çé é¢ IDãä¸è½è $1title ä¸èµ·ä½¿ç¨ã", "apihelp-query+backlinks-param-namespace": "è¦åèçå½åç©ºéã", "apihelp-query+backlinks-param-dir": "ååºæææ¡ç¨çæ¹åã", + "apihelp-query+backlinks-param-filterredir": "å¦ä½ç¯©é¸éæ°å°åãç¶ $1redirect åç¨æè¥è¨å®æ nonredirectsï¼éåæå¥ç¨å°ç¬¬äºç´å¥ã", + "apihelp-query+backlinks-param-redirect": "è¥é£çµé é¢çºéæ°å°åï¼åæ¾å°é£çµè³è©²éæ°å°åçææé é¢ãæå¤§éå¶çºä¸åã", "apihelp-query+backlinks-example-simple": "é¡¯ç¤ºè³ Main page çé£çµã", "apihelp-query+backlinks-example-generator": "åå¾é£çµè³ Main page çç¸éé é¢è³è¨ã", "apihelp-query+blocks-summary": "ååºææè¢«å°éä½¿ç¨èè IP ä½åã", @@ -529,6 +577,7 @@ "apihelp-query+blocks-paramvalue-prop-expiry": "æ·»å ç¶å°éå°æçæéæ³è¨ã", "apihelp-query+blocks-paramvalue-prop-reason": "æ·»å å°éçåå ã", "apihelp-query+blocks-paramvalue-prop-range": "æ·»å åå°éå½±é¿ç IP å°åç¯åã", + "apihelp-query+blocks-param-show": "åé¡¯ç¤ºç¬¦åéäºæ¨æºçé ç®ã\nä¾å¦åæ³æ¥çå¨ IP å°åçç¡éæå°éï¼è«è¨å® $1show=ip|!tempã", "apihelp-query+blocks-example-simple": "ååºå°éã", "apihelp-query+blocks-example-users": "ååºä½¿ç¨è Alice è Bob çå°éã", "apihelp-query+categories-summary": "ååºé é¢é¸å±¬çææåé¡ã", @@ -550,7 +599,9 @@ "apihelp-query+categorymembers-paramvalue-prop-ids": "æ·»å é é¢ IDã", "apihelp-query+categorymembers-paramvalue-prop-title": "æ·»å æ¨é¡èé é¢çå½åç©ºé IDã", "apihelp-query+categorymembers-paramvalue-prop-sortkey": "æ·»å ä½¿ç¨ä¾å¨åé¡è£¡æåºçæåºéµï¼ååé²ä½åä¸²ï¼ã", + "apihelp-query+categorymembers-paramvalue-prop-type": "æ·»å é é¢å·²è¢«åé¡çé¡åï¼pageãsubcat æ fileï¼ã", "apihelp-query+categorymembers-paramvalue-prop-timestamp": "æ·»å å¨é é¢æè¢«åå«æçæéæ³è¨ã", + "apihelp-query+categorymembers-param-namespace": "ååå«å¨éäºå½åç©ºéçé é¢ãè«æ³¨æå¯è½æä½¿ç¨ $1type=subcat æ $1type=fileï¼èé $1namespace=14 æ 6ã", "apihelp-query+categorymembers-param-type": "åå«çåé¡æå¡é¡åãç¶æè¨å® $1sort=timestamp æå¿½ç¥ã", "apihelp-query+categorymembers-param-limit": "åå³çé é¢æ¸éä¸éã", "apihelp-query+categorymembers-param-sort": "ä½çºæåºé åºçå±¬æ§ã", @@ -561,6 +612,7 @@ "apihelp-query+categorymembers-param-endsortkey": "è«æ¹ç¨ $1endhexsortkeyã", "apihelp-query+categorymembers-example-simple": "åå¾å¨ Category:Physics è£¡å 10 é çé é¢ã", "apihelp-query+categorymembers-example-generator": "åå¾å¨ Category:Physics è£¡å 10 åé é¢çé é¢è³è¨ã", + "apihelp-query+contributors-summary": "åå¾é é¢ä¸ç»å¥è²¢ç»èä»¥åå¿åè²¢ç»èæ¸éçæ¸å®ã", "apihelp-query+contributors-param-limit": "è¦åå³çè²¢ç»äººå¡æ¸éã", "apihelp-query+contributors-example-simple": "é¡¯ç¤ºé é¢ Main Page çè²¢ç»èã", "apihelp-query+deletedrevisions-summary": "åå¾å·²åªé¤ä¿®è¨çè³è¨ã", @@ -582,6 +634,7 @@ "apihelp-query+deletedrevs-param-excludeuser": "ä¸è¦ååºç±è©²ä½¿ç¨èä½åºçä¿®è¨ã", "apihelp-query+deletedrevs-param-namespace": "åååºæ¤å½åç©ºéçé é¢ã", "apihelp-query+deletedrevs-param-limit": "ä¿®è¨è½ååºçæå¤§æ¸éã", + "apihelp-query+deletedrevs-example-mode1": "ä»¥å¸¶æå§å®¹ï¼æ¨¡å¼ 1ï¼ååºé é¢ Main Page è Talk:Main Page çææ°åªé¤ä¿®è¨ã", "apihelp-query+deletedrevs-example-mode2": "ååºæè¿å 50 åå·²åªé¤æç± Bob æååºçè²¢ç»ï¼æ¨¡å¼ 2ï¼ã", "apihelp-query+deletedrevs-example-mode3-main": "ååºå¨ä¸»å½åç©ºéçå 50 åå·²åªé¤ä¿®è¨ï¼æ¨¡å¼ 3ï¼ã", "apihelp-query+deletedrevs-example-mode3-talk": "ååºå¨{{ns:talk}}å½åç©ºéçå 50 åå·²åªé¤é é¢ï¼æ¨¡å¼ 3ï¼ã", @@ -604,15 +657,19 @@ "apihelp-query+extlinks-summary": "åå³æææå®é é¢çå¤é¨ URL (é interwiki)ã", "apihelp-query+extlinks-param-limit": "è¦åå³çé£çµæ¸éã", "apihelp-query+extlinks-param-protocol": "URL åå®ãè¥çºç©ºä¸æè¨å® $1queryï¼ææ¯ http åå®ãå°æ¤è $1query ä¸åçç©ºæååºææå¤é¨é£çµã", + "apihelp-query+extlinks-param-query": "ä¸ä»¥åè°ä¾æå°åä¸²ï¼å°æ¼æª¢æ¥æé é¢æ¯å¦åå«æåå¤é¨ URL æå¾æç¨ã", + "apihelp-query+extlinks-param-expandurl": "ä»¥è¦ç¯åè°çæ´ååè°éè¯ URLã", "apihelp-query+extlinks-example-simple": "åå¾ Main Page çå¤é¨é£çµæ¸å®ã", "apihelp-query+exturlusage-summary": "åèåå«æå® URL çé é¢ã", "apihelp-query+exturlusage-param-prop": "è¦åå«çè³è¨é¨ä»½ï¼", "apihelp-query+exturlusage-paramvalue-prop-ids": "æ·»å é é¢ IDã", "apihelp-query+exturlusage-paramvalue-prop-title": "æ·»å æ¨é¡èé é¢çå½åç©ºé IDã", "apihelp-query+exturlusage-paramvalue-prop-url": "æ·»å ç¨æ¼é é¢ç URLã", + "apihelp-query+exturlusage-param-protocol": "URL åå®ãè¥çºç©ºä¸æè¨å® $1queryï¼ææ¯ http åå®ãå°æ¤è $1query ä¸åçç©ºæååºææå¤é¨é£çµã", "apihelp-query+exturlusage-param-query": "ä¸å¸¶åå®çæå°åä¸²ãè«æ¥ç [[Special:LinkSearch]]ãè«çç©ºä»¥ååºææå¤é¨é£çµã", "apihelp-query+exturlusage-param-namespace": "è¦åèçé é¢å½åç©ºéã", "apihelp-query+exturlusage-param-limit": "è¦åå³çé é¢æ¸éã", + "apihelp-query+exturlusage-param-expandurl": "ä»¥è¦ç¯åè°çæ´ååè°éè¯ URLã", "apihelp-query+exturlusage-example-simple": "é¡¯ç¤ºé£çµè³ https://www.mediawiki.org çé é¢ã", "apihelp-query+filearchive-summary": "ä¾åºåèææå·²åªé¤æªæ¡ã", "apihelp-query+filearchive-param-from": "èµ·å§åèçåçæ¨é¡ã", @@ -627,6 +684,7 @@ "apihelp-query+filearchive-paramvalue-prop-timestamp": "æ·»å ä¸å³çæ¬çæéæ³è¨ã", "apihelp-query+filearchive-paramvalue-prop-user": "æ·»å ä¸å³è©²åççæ¬çä½¿ç¨èã", "apihelp-query+filearchive-paramvalue-prop-size": "æ·»å åçå¤§å°ï¼ä½åçµï¼ãé«åº¦ãå¯¬åº¦ãé é¢è¨æ¸ï¼è¥å¯å¥ç¨çè©±ï¼ã", + "apihelp-query+filearchive-paramvalue-prop-dimensions": "å¤§å°çå¥åã", "apihelp-query+filearchive-paramvalue-prop-description": "æ·»å åççæ¬çæè¿°ã", "apihelp-query+filearchive-paramvalue-prop-parseddescription": "è§£æçæ¬çæè¿°ã", "apihelp-query+filearchive-paramvalue-prop-mime": "æ·»å åçç MIMEã", @@ -636,9 +694,12 @@ "apihelp-query+filearchive-paramvalue-prop-archivename": "æ·»å éææ°çæ¬çåæªçæ¬æªæ¡åç¨±ã", "apihelp-query+filearchive-example-simple": "é¡¯ç¤ºææå·²åªé¤æªæ¡çæ¸å®ã", "apihelp-query+filerepoinfo-summary": "åå³æéå¨ wiki ä¸åçå²ååº«çè©®éè³æã", + "apihelp-query+filerepoinfo-param-prop": "è¦åå¾çå²ååº«å±¬æ§ï¼å¯ç¨å±¬æ§å¨å¶å® wiki ä¸å¯è½ææå·®å¥ï¼ã", "apihelp-query+filerepoinfo-paramvalue-prop-apiurl": "å²ååº« API ç URL - å°æ¼å¾ä¸»æ©åå¾åçè³è¨å¾æç¨ã", "apihelp-query+filerepoinfo-paramvalue-prop-articlepath": "å²ååº« wiki ç [[mw:Special:MyLanguage/Manual:$wgArticlePath|$wgArticlePath]] æåçå§å®¹ã", + "apihelp-query+filerepoinfo-paramvalue-prop-canUpload": "æªæ¡æ¯å¦å¯ä¸å³è³æ¤å²ååº«ï¼ä¾å¦éé CORS èå±äº«é©èã", "apihelp-query+filerepoinfo-paramvalue-prop-displayname": "äººé¡å¯è®çå²ååº« wiki åç¨±ã", + "apihelp-query+filerepoinfo-paramvalue-prop-favicon": "å²ååº« wiki çç¶²é åæ¨ URLï¼ä¾èªæ¼ [[mw:Special:MyLanguage/Manual:$wgFavicon|$wgFavicon]]ã", "apihelp-query+filerepoinfo-paramvalue-prop-initialCapital": "æªæ¡æ¯å¦é±å¼å°ä»¥å¤§å¯«åæ¯éé ã", "apihelp-query+filerepoinfo-paramvalue-prop-local": "å²ååº«æ¯å¦çºæ¬å°ç«¯ã", "apihelp-query+filerepoinfo-paramvalue-prop-rootUrl": "åçè·¯å¾çæ ¹ URL è·¯å¾ã", @@ -667,6 +728,7 @@ "apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "æ·»å æªæ¡çè¦ç¯æ¨é¡ã", "apihelp-query+imageinfo-paramvalue-prop-url": "æä¾æªæ¡èæè¿°é é¢ç URLã", "apihelp-query+imageinfo-paramvalue-prop-size": "æ·»å ä»¥ä½åçµçºå®ä½çæªæ¡å¤§å°ãé«åº¦ãå¯¬åº¦ãé é¢è¨æ¸ï¼è¥å¯å¥ç¨çè©±ï¼ã", + "apihelp-query+imageinfo-paramvalue-prop-dimensions": "å¤§å°çå¥åã", "apihelp-query+imageinfo-paramvalue-prop-sha1": "æ¿æªæ¡æ·»å SHA-1 éæ¹å¼ã", "apihelp-query+imageinfo-paramvalue-prop-mime": "æ¿æªæ¡æ·»å MIME é¡åã", "apihelp-query+imageinfo-paramvalue-prop-thumbmime": "æ·»å åçç¸®åç MIME é¡åï¼éè¦ url èåæ¸ $1urlwidthï¼ã", @@ -681,6 +743,7 @@ "apihelp-query+imageinfo-param-start": "ååºçèµ·å§æéæ³è¨ã", "apihelp-query+imageinfo-param-end": "ååºççµæ¢æéæ³è¨ã", "apihelp-query+imageinfo-param-urlheight": "è $1urlwidth ç¸ä¼¼ã", + "apihelp-query+imageinfo-param-metadataversion": "è¦ä½¿ç¨çè©®éè³æçæ¬ãè¥ææå® latestï¼æä½¿ç¨ææ°çæ¬ãé è¨çº 1ï¼ä»¥ä¾¿åä¸å¼å®¹ã", "apihelp-query+imageinfo-param-extmetadatamultilang": "è¥ç¨æ¼ extmetadata å±¬æ§çç¿»è¯å¯ç¨ï¼åå¨é¨ç´¢åã", "apihelp-query+imageinfo-param-extmetadatafilter": "è¥ææå®ä¸éç©ºï¼åæçº $1prop=extmetadata åå³éäºéµã", "apihelp-query+imageinfo-param-badfilecontexttitle": "è¥æè¨å® $2prop=badfileï¼æ¤é é¢ä½¿ç¨å¨ç¶è©ä¼° [[MediaWiki:Bad image list]] çæå", @@ -698,6 +761,7 @@ "apihelp-query+imageusage-param-pageid": "è¦æå°çé é¢ IDãä¸è½è $1title ä¸èµ·ä½¿ç¨ã", "apihelp-query+imageusage-param-namespace": "è¦åèçå½åç©ºéã", "apihelp-query+imageusage-param-dir": "ååºæææ¡ç¨çæ¹åã", + "apihelp-query+imageusage-param-filterredir": "å¦ä½ç¯©é¸éæ°å°åãç¶ $1redirect åç¨æè¥è¨å®æééæ°å°åï¼éåæå¥ç¨å°ç¬¬äºç´å¥ã", "apihelp-query+imageusage-param-redirect": "è¥é£çµé é¢çºéæ°å°åï¼åæ¾å°é£çµè³è©²éæ°å°åçææé é¢ãæå¤§éå¶çºä¸åã", "apihelp-query+imageusage-example-simple": "é¡¯ç¤ºæä½¿ç¨ [[:File:Albert Einstein Head.jpg]] çé é¢ã", "apihelp-query+imageusage-example-generator": "åå¾éæ¼æä½¿ç¨å° [[:File:Albert Einstein Head.jpg]] çé é¢è³è¨.", @@ -713,6 +777,8 @@ "apihelp-query+info-paramvalue-prop-url": "æ¿åé é¢çµ¦äºä¸åå®æ´ URLãä¸åç·¨è¼¯ URLï¼ä»¥åä¸åè¦ç¯ URLã", "apihelp-query+info-paramvalue-prop-readable": "ä½¿ç¨èæ¯å¦å¯é±è®æ¤é é¢ãè«æ¹ç¨ intestactions=readã", "apihelp-query+info-paramvalue-prop-preload": "åå¾ç± EditFormPreloadText åå³çæåã", + "apihelp-query+info-paramvalue-prop-displaytitle": "å¨é é¢æ¨é¡å¯¦éé¡¯ç¤ºèæä¾æ¹å¼ã", + "apihelp-query+info-paramvalue-prop-varianttitles": "æå®ç¶²ç«å§å®¹èªè¨è£¡ææè®é«çé¡¯ç¤ºæ¨é¡ã", "apihelp-query+info-param-testactions": "æ¸¬è©¦ç®åä½¿ç¨èæ¯å¦å¯å·è¡é é¢ä¸çæé æä½ã", "apihelp-query+info-paramvalue-testactionsdetail-boolean": "åå³åæä½çå¸æå¼ã", "apihelp-query+info-paramvalue-testactionsdetail-full": "åå³æè¿°åºçºä½æä½è¢«ç¦æ¢çè¨æ¯ï¼æçºåè¨±ååå³ç©ºé£åã", @@ -829,10 +895,12 @@ "apihelp-query+protectedtitles-param-start": "å¨æ¤ä¿è·æéæ³è¨éå§ååºã", "apihelp-query+protectedtitles-param-end": "å¨æ¤ä¿è·æéæ³è¨åæ¢ååºã", "apihelp-query+protectedtitles-param-prop": "è¦åå¾çå±¬æ§ã", + "apihelp-query+protectedtitles-paramvalue-prop-timestamp": "æ·»å ç¶ä¿è·è¢«æ·»å æçæéæ³è¨ã", "apihelp-query+protectedtitles-paramvalue-prop-user": "æ·»å ååºæ·»å ä¿è·æä½çä½¿ç¨èã", "apihelp-query+protectedtitles-paramvalue-prop-userid": "æ·»å ååºæ·»å ä¿è·æä½çä½¿ç¨è IDã", "apihelp-query+protectedtitles-paramvalue-prop-comment": "æ·»å ä¿è·çè¨»éã", "apihelp-query+protectedtitles-paramvalue-prop-parsedcomment": "æ·»å ä¿è·çè§£æè¨»éã", + "apihelp-query+protectedtitles-paramvalue-prop-expiry": "æ·»å ç¶ä¿è·è¢«æåæçæéæ³è¨ã", "apihelp-query+protectedtitles-paramvalue-prop-level": "æ·»å ä¿è·å±¤ç´ã", "apihelp-query+protectedtitles-example-simple": "ååºå·²ä¿è·çæ¨é¡ã", "apihelp-query+protectedtitles-example-generator": "æ¾åºå¨ä¸»å½åç©ºéè£¡é£è³å·²ä¿è·æ¨é¡çé£çµã", @@ -847,7 +915,7 @@ "apihelp-query+random-param-filterredir": "å¦ä½éæ¿¾éæ°å°åã", "apihelp-query+random-example-simple": "å¾ä¸»å½åç©ºéåå³å©åé¨æ©é é¢ã", "apihelp-query+random-example-generator": "å¾ä¸»å½åç©ºéåå³å©åé¨æ©é é¢çç¸éé é¢è³è¨ã", - "apihelp-query+recentchanges-summary": "åèåºæè¿è®æ´ã", + "apihelp-query+recentchanges-summary": "åèåºè¿æè®æ´ã", "apihelp-query+recentchanges-param-start": "èµ·å§åèçæéæ³è¨ã", "apihelp-query+recentchanges-param-end": "çµæåèçæéæ³è¨ã", "apihelp-query+recentchanges-param-namespace": "ç¯©é¸åçºéäºå½åç©ºéçæ´æ¹ã", @@ -862,7 +930,7 @@ "apihelp-query+recentchanges-paramvalue-prop-flags": "æ·»å ç·¨è¼¯çæ¨ç±¤ã", "apihelp-query+recentchanges-paramvalue-prop-timestamp": "æ·»å ç·¨è¼¯çæéæ³è¨ã", "apihelp-query+recentchanges-paramvalue-prop-title": "æ·»å ç·¨è¼¯çé é¢æ¨é¡ã", - "apihelp-query+recentchanges-paramvalue-prop-ids": "æ·»å é é¢ IDãæè¿æ´æ¹ ID ä»¥åæ°èä¿®è¨ IDã", + "apihelp-query+recentchanges-paramvalue-prop-ids": "æ·»å é é¢ IDãè¿æè®æ´ ID ä»¥åæ°èä¿®è¨ IDã", "apihelp-query+recentchanges-paramvalue-prop-sizes": "æ·»å æ°èé é¢é·åº¦ï¼ä½åçµï¼ã", "apihelp-query+recentchanges-paramvalue-prop-redirect": "è¥é é¢çºéæ°å°ååæ¨è¨ç·¨è¼¯ã", "apihelp-query+recentchanges-paramvalue-prop-patrolled": "æ¨è¨å¯å·¡æ¥ç·¨è¼¯çºå·²å·¡æ¥ææªå·¡æ¥ã", @@ -874,7 +942,7 @@ "apihelp-query+recentchanges-param-type": "è¦é¡¯ç¤ºçæ´æ¹é¡åã", "apihelp-query+recentchanges-param-toponly": "åååºææ°ä¿®è¨çæ´æ¹ã", "apihelp-query+recentchanges-param-title": "ç¯©é¸èéäºé é¢éè¯çé ç®ã", - "apihelp-query+recentchanges-example-simple": "æè¿è®æ´æ¸å®", + "apihelp-query+recentchanges-example-simple": "è¿æè®æ´æ¸å®", "apihelp-query+recentchanges-example-generator": "åå¾æéè¿æå°æªå·¡æ¥æ´æ¹çé é¢è³è¨ã", "apihelp-query+redirects-summary": "åå³é£çµè³æå®é é¢çææéæ°å°åã", "apihelp-query+redirects-param-prop": "è¦åå¾çå±¬æ§ã", @@ -883,6 +951,7 @@ "apihelp-query+redirects-paramvalue-prop-fragment": "åéæ°å°åççæ®µï¼è¥æçè©±ã", "apihelp-query+redirects-param-namespace": "ååå«éäºå½åç©ºéçé é¢ã", "apihelp-query+redirects-param-limit": "è¦åå³çéæ°å°åæ¸éã", + "apihelp-query+redirects-param-show": "åé¡¯ç¤ºç¬¦åéäºæ¨æºçé ç®ï¼\n;fragmentï¼åé¡¯ç¤ºå¸¶é¨åå§å®¹çéæ°å°åã\n;!fragmentï¼åé¡¯ç¤ºä¸å¸¶é¨åå§å®¹çéæ°å°åã", "apihelp-query+redirects-example-simple": "åå¾ [[Main Page]] çéæ°å°åæ¸å®", "apihelp-query+redirects-example-generator": "åå¾ææéæ°å°åè³ [[Main Page]] çè³è¨ã", "apihelp-query+revisions-summary": "åå¾ä¿®è¨çè³è¨ã", @@ -891,6 +960,7 @@ "apihelp-query+revisions-param-user": "ååå«ç±ä½¿ç¨èååºçä¿®è¨ã", "apihelp-query+revisions-param-excludeuser": "ä¸åå«ç±ä½¿ç¨èååºçä¿®è¨ã", "apihelp-query+revisions-param-tag": "åååºä»¥æ¤æ¨ç±¤ææ¨è¨çä¿®è¨ã", + "apihelp-query+revisions-param-token": "åä¿®è¨æè¦ç²å¾çæ¬æã", "apihelp-query+revisions-example-content": "åå¾ç¨æ¼æ¨é¡ API è Main Page ææ°ä¿®è¨å§å®¹çè³æã", "apihelp-query+revisions-example-last5": "åå¾ Main Page çæè¿ 5 çä¿®è¨ã", "apihelp-query+revisions-example-first5": "åå¾ Main Page çææ©å 5 çä¿®è¨ã", @@ -904,7 +974,13 @@ "apihelp-query+revisions+base-paramvalue-prop-user": "ååºä¿®è¨çä½¿ç¨èã", "apihelp-query+revisions+base-paramvalue-prop-userid": "ä¿®è¨åµå»ºèçä½¿ç¨è ID", "apihelp-query+revisions+base-paramvalue-prop-size": "ä¿®è¨çé·åº¦ï¼ä½åçµï¼ã", + "apihelp-query+revisions+base-paramvalue-prop-slotsize": "åä¿®è¨ééçé·åº¦ï¼ä½åçµï¼ã", "apihelp-query+revisions+base-paramvalue-prop-sha1": "ä¿®è¨ç SHA-1ï¼base 16ï¼ã", + "apihelp-query+revisions+base-paramvalue-prop-slotsha1": "åä¿®è¨ééç SHA-1ï¼base 16ï¼ã", + "apihelp-query+revisions+base-paramvalue-prop-contentmodel": "åä¿®è¨ééçå§å®¹æ¨¡çµ IDã", + "apihelp-query+revisions+base-paramvalue-prop-comment": "ç±ä½¿ç¨èå°æ¼ä¿®è¨æååºçè¨»éã", + "apihelp-query+revisions+base-paramvalue-prop-parsedcomment": "ç±ä½¿ç¨èå°æ¼ä¿®è¨æè§£æçè¨»éã", + "apihelp-query+revisions+base-paramvalue-prop-content": "åä¿®è¨ééçå§å®¹ã", "apihelp-query+revisions+base-paramvalue-prop-tags": "ä¿®è¨æ¨ç±¤ã", "apihelp-query+revisions+base-paramvalue-prop-parsetree": "è«æ¹ç¨ [[Special:ApiHelp/expandtemplates|action=expandtemplates]] æ [[Special:ApiHelp/parse|action=parse]]ãä¿®è¨å§å®¹ç XML è§£ææ¨¹çï¼éè¦å§å®¹æ¨¡çµ $1ï¼ã", "apihelp-query+revisions+base-param-limit": "éå¶æåå³çä¿®è¨æ¸éã", @@ -943,14 +1019,22 @@ "apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "å·²è¨»åå½åç©ºéå¥åæ¸å®ã", "apihelp-query+siteinfo-paramvalue-prop-specialpagealiases": "ç¹æ®é é¢å¥åæ¸å®ã", "apihelp-query+siteinfo-paramvalue-prop-magicwords": "éè¡ååå¶å¥åæ¸å®ã", + "apihelp-query+siteinfo-paramvalue-prop-statistics": "åå³ç¶²ç«çµ±è¨ã", + "apihelp-query+siteinfo-paramvalue-prop-interwikimap": "åå³å§é¨ wiki å°æï¼ç¯©é¸å¯é¸ç¨ï¼ä¹å¯éé $1inlanguagecode ä¾é¸ç¨æ¬å°åï¼ã", + "apihelp-query+siteinfo-paramvalue-prop-dbrepllag": "åå³ææé«è¤è£½å»¶é²çè³æåº«ä¼ºæå¨ã", "apihelp-query+siteinfo-paramvalue-prop-usergroups": "åå³ä½¿ç¨èç¾¤çµä»¥åæåéæ¬éã", "apihelp-query+siteinfo-paramvalue-prop-libraries": "åå³å®è£å¨ wiki ä¸çå½å¼åº«ã", "apihelp-query+siteinfo-paramvalue-prop-extensions": "åå³å®è£å¨ wiki ä¸çæ´ååè½ã", "apihelp-query+siteinfo-paramvalue-prop-fileextensions": "åå³åè¨±ä¸å³çå¯æªåï¼æªæ¡é¡åï¼æ¸å®ã", + "apihelp-query+siteinfo-paramvalue-prop-rightsinfo": "è¥å¯ç¨æï¼åå³ wiki çæ¬ï¼ææ¬æ¢æ¬¾ï¼è³è¨ã", "apihelp-query+siteinfo-paramvalue-prop-restrictions": "åå³å¨å¯ç¨éå¶ï¼ä¿è·ï¼é¡åçè³è¨ã", + "apihelp-query+siteinfo-paramvalue-prop-languages": "åå³ MediaWiki æ¯æ´çèªè¨æ¸å®ï¼å¯éé $1inlanguagecode ä¾é¸ç¨æ¬å°åï¼ã", + "apihelp-query+siteinfo-paramvalue-prop-skins": "åå³ææå·²åç¨çå¤è§æ¸å®ï¼å¯éé $1inlanguagecode ä¾é¸ç¨æ¬å°åï¼ä¸ç¶ææ¯å§å®¹èªè¨ï¼ã", "apihelp-query+siteinfo-paramvalue-prop-extensiontags": "åå³è§£ææ´åæ¨ç±¤æ¸å®ã", "apihelp-query+siteinfo-paramvalue-prop-functionhooks": "åå³è§£æå¨å½å¼æå¾æ¸å®ã", + "apihelp-query+siteinfo-paramvalue-prop-showhooks": "åå³ææè¨é±æå¾æ¸å®ï¼[[mw:Special:MyLanguage/Manual:$wgHooks|$wgHooks]] çå§å®¹ï¼ã", "apihelp-query+siteinfo-paramvalue-prop-variables": "åå³è®æ¸ ID æ¸å®ã", + "apihelp-query+siteinfo-paramvalue-prop-protocols": "åå³å¨å¤é¨é£çµè£¡æåè¨±çåè°æ¸å®ã", "apihelp-query+siteinfo-paramvalue-prop-defaultoptions": "åå³ç¨æ¼ä½¿ç¨èåå¥½è¨å®çé è¨å¼ã", "apihelp-query+siteinfo-paramvalue-prop-uploaddialog": "åå³ä¸å³å°è©±æ¡çè¨ç½®ã", "apihelp-query+siteinfo-param-filteriw": "ååå³è·¨ wiki å°åçæ¬å°ç«¯æéæ¬å°ç«¯é ç®ã", @@ -969,18 +1053,22 @@ "apihelp-query+tags-paramvalue-prop-name": "æ·»å æ¨ç±¤åç¨±ã", "apihelp-query+tags-paramvalue-prop-displayname": "æ·»å æ¨ç±¤çç³»çµ±è¨æ¯ã", "apihelp-query+tags-paramvalue-prop-description": "æ·»å æ¨ç±¤çæè¿°ã", + "apihelp-query+tags-paramvalue-prop-hitcount": "æ·»å å«ææ¤æ¨ç±¤ä¹ä¿®è¨èæ¥èªé ç®çæ¸éã", "apihelp-query+tags-paramvalue-prop-defined": "æç¤ºæ¨ç±¤æ¯å¦å·²å®ç¾©ã", "apihelp-query+tags-paramvalue-prop-active": "æ¨ç±¤æ¯å¦ä»è¢«å¥ç¨ã", "apihelp-query+tags-example-simple": "ååºå¯ç¨æ¨ç±¤ã", "apihelp-query+templates-summary": "åå³æå®é é¢ä¸ææå¼ç¨çé é¢ã", "apihelp-query+templates-param-namespace": "åé¡¯ç¤ºå¨éäºå½åç©ºéçæ¨¡æ¿ã", "apihelp-query+templates-param-limit": "è¦åå³çæ¨¡æ¿æ¸éã", + "apihelp-query+templates-param-templates": "åååºéäºæ¨¡æ¿ãå¨æª¢æ¥æä¸é é¢æ¯å¦æææä¸æ¨¡æ¿æå¾æç¨ã", "apihelp-query+templates-param-dir": "ååºæææ¡ç¨çæ¹åã", "apihelp-query+templates-example-simple": "åå¾å¨é é¢ Main Page ä½¿ç¨å°çæ¨¡åã", "apihelp-query+templates-example-generator": "åå¾ä½¿ç¨å¨ Main Page çæ¨¡çé é¢ç¸éè³è¨ã", + "apihelp-query+templates-example-namespaces": "åå¾åµå¥å¨é é¢ Main Page è£¡ç {{ns:user}} è {{ns:template}} å½åç©ºéä¹é é¢ã", + "apihelp-query+tokens-summary": "åå¾è³æä¿®æ¹æä½çæ¬æã", "apihelp-query+tokens-param-type": "è¦æ±çæ¬æé¡åã", - "apihelp-query+tokens-example-simple": "æ¥æ¶ csrf å¯é° (é è¨)ã", - "apihelp-query+tokens-example-types": "æ¥æ¶ç£è¦å¯é°ä»¥åå·¡éå¯é°ã", + "apihelp-query+tokens-example-simple": "æ¥æ¶ csrf æ¬æï¼é è¨ï¼ã", + "apihelp-query+tokens-example-types": "æ¥æ¶ç£è¦æ¬æä»¥åå·¡éæ¬æã", "apihelp-query+transcludedin-summary": "æ¾åºåµå¥è³æå®é é¢çææé é¢ã", "apihelp-query+transcludedin-param-prop": "è¦åå¾çå±¬æ§ã", "apihelp-query+transcludedin-paramvalue-prop-pageid": "åé é¢çé é¢ IDã", @@ -993,6 +1081,8 @@ "apihelp-query+transcludedin-example-generator": "åå¾æéåµå¥ Main Page çé é¢ä¹è³è¨ã", "apihelp-query+usercontribs-summary": "æä½¿ç¨èä¾åå¾ææç·¨è¼¯ã", "apihelp-query+usercontribs-param-limit": "åå³çè²¢ç»æ¸éä¸éã", + "apihelp-query+usercontribs-param-user": "è¦æª¢ç´¢è²¢ç»çä½¿ç¨èãä¸è½è $1userids æ $1userprefix ä¸èµ·ä½¿ç¨ã", + "apihelp-query+usercontribs-param-userids": "è¦æª¢ç´¢è²¢ç»çä½¿ç¨è IDãä¸è½è $1user æ $1userprefix ä¸èµ·ä½¿ç¨ã", "apihelp-query+usercontribs-param-namespace": "åååºéäºå½åç©ºéçè²¢ç»ã", "apihelp-query+usercontribs-param-prop": "åå«çé¡å¤è³è¨é¨ä»½ï¼", "apihelp-query+usercontribs-paramvalue-prop-ids": "æ·»å é é¢ ID èä¿®è¨ IDã", @@ -1011,31 +1101,39 @@ "apihelp-query+usercontribs-example-ipprefix": "é¡¯ç¤ºææä¾èªæ¼åç¶´çº 192.0.2. ç IP å°åè²¢ç»ã", "apihelp-query+userinfo-summary": "åå¾ç®åä½¿ç¨èçè³è¨ã", "apihelp-query+userinfo-param-prop": "è¦åå«çè³è¨é¨ä»½ï¼", + "apihelp-query+userinfo-paramvalue-prop-blockinfo": "è¥ç®åä½¿ç¨èè¢«å°éåæ¨è¨åºç±èª°ååºï¼ä»¥ååºæ¼ä½ç¨®åå ã", "apihelp-query+userinfo-paramvalue-prop-hasmsg": "è¥ç®åä½¿ç¨èæçå¾è¨æ¯ï¼æ·»å messages æ¨ç±¤ã", "apihelp-query+userinfo-paramvalue-prop-groups": "ååºç®åä½¿ç¨èæé¸å±¬çææç¾¤çµã", + "apihelp-query+userinfo-paramvalue-prop-implicitgroups": "ååºç®åä½¿ç¨èèªååå¥çºæå¡çææç¾¤çµã", "apihelp-query+userinfo-paramvalue-prop-rights": "ååºç®åä½¿ç¨èæææçæ¬éã", + "apihelp-query+userinfo-paramvalue-prop-changeablegroups": "ååºç®åä½¿ç¨èå¯ä»¥ååºæ·»å ä»¥åç§»é¤çç¾¤çµã", "apihelp-query+userinfo-paramvalue-prop-options": "ååºç®åä½¿ç¨èå·²è¨å®éçææåå¥½è¨å®ã", + "apihelp-query+userinfo-paramvalue-prop-preferencestoken": "åå¾æ¬æä¾è®æ´ç®åä½¿ç¨èçåå¥½è¨å®ã", "apihelp-query+userinfo-paramvalue-prop-editcount": "æ·»å ç®åä½¿ç¨èçç·¨è¼¯æ¸ã", "apihelp-query+userinfo-paramvalue-prop-ratelimits": "ååºææå¥ç¨å°ç®åä½¿ç¨èçéçéå¶ã", "apihelp-query+userinfo-paramvalue-prop-realname": "æ·»å ä½¿ç¨èççå¯¦å§åã", "apihelp-query+userinfo-paramvalue-prop-email": "æ·»å ä½¿ç¨èçé»åéµä»¶å°åèé»åéµä»¶é©èæ¥æã", "apihelp-query+userinfo-paramvalue-prop-registrationdate": "æ·»å ä½¿ç¨èçè¨»åæ¥æã", + "apihelp-query+userinfo-paramvalue-prop-centralids": "æ¿ä½¿ç¨èæ·»å ä¸å¿ ID èéå çæã", "apihelp-query+userinfo-example-simple": "åå¾ç®åä½¿ç¨èçè³è¨ã", "apihelp-query+userinfo-example-data": "åå¾ç®åä½¿ç¨èçé¡å¤è³è¨ã", "apihelp-query+users-summary": "åå¾æéä½¿ç¨èæ¸å®çè³è¨ã", "apihelp-query+users-param-prop": "è¦åå«çè³è¨é¨ä»½ï¼", "apihelp-query+users-paramvalue-prop-blockinfo": "è¥ä½¿ç¨èè¢«å°éåæ¨è¨åºç±èª°ååºï¼ä»¥ååºæ¼ä½ç¨®åå ã", "apihelp-query+users-paramvalue-prop-groups": "ååºåä½¿ç¨èæé¸å±¬çææç¾¤çµã", + "apihelp-query+users-paramvalue-prop-implicitgroups": "ååºä½¿ç¨èèªååå¥çºæå¡çææç¾¤çµã", "apihelp-query+users-paramvalue-prop-rights": "ååºåä½¿ç¨èæææçæ¬éã", "apihelp-query+users-paramvalue-prop-editcount": "æ·»å ä½¿ç¨èçç·¨è¼¯æ¸ã", "apihelp-query+users-paramvalue-prop-registration": "æ·»å ä½¿ç¨èçè¨»åæéæ³è¨ã", "apihelp-query+users-paramvalue-prop-emailable": "è¥ä½¿ç¨èç¬¦åæ¢ä»¶ä¸¦æ³è¦éé [[Special:Emailuser]] ä¾æ¥æ¶é»åéµä»¶ææ¨è¨ã", "apihelp-query+users-paramvalue-prop-gender": "æ¨è¨ä½¿ç¨èæ§å¥ãåå³ãmaleãããfemaleããæãunknownãã", + "apihelp-query+users-paramvalue-prop-centralids": "æ¿ä½¿ç¨èæ·»å ä¸å¿ ID èéå çæã", "apihelp-query+users-param-users": "è¦ç²åçä½¿ç¨èæ¸å®ã", "apihelp-query+users-param-userids": "è¦ç²åçä½¿ç¨è ID æ¸å®ã", "apihelp-query+users-param-token": "è«æ¹ç¨ [[Special:ApiHelp/query+tokens|action=query&meta=tokens]]ã", "apihelp-query+users-example-simple": "è¿åä½¿ç¨è Example çè³è¨ã", "apihelp-query+watchlist-summary": "åå¾å¨ç®åä½¿ç¨èçç£è¦æ¸å®è£¡ï¼é é¢çè¿æè®æ´ã", + "apihelp-query+watchlist-param-allrev": "ä»¥æå®æéç¯åä¾åå«åä¸é é¢çå¤åä¿®è¨ã", "apihelp-query+watchlist-param-start": "èµ·å§åèçæéæ³è¨ã", "apihelp-query+watchlist-param-end": "çµæåèçæéæ³è¨ã", "apihelp-query+watchlist-param-namespace": "ç¯©é¸åçºæå®å½åç©ºéçæ´æ¹ã", @@ -1054,20 +1152,31 @@ "apihelp-query+watchlist-paramvalue-prop-patrol": "æ¨è¨ç·¨è¼¯çºå·²å·¡æ¥ã", "apihelp-query+watchlist-paramvalue-prop-autopatrol": "æ¨è¨ç·¨è¼¯çºèªåå·¡æ¥ã", "apihelp-query+watchlist-paramvalue-prop-sizes": "æ·»å é é¢èæèæ°çé·åº¦ã", + "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "æ·»å ä½¿ç¨èä¸ä¸æ¬¡è¢«éç¥å°æéç·¨è¼¯çæéæ³è¨ã", "apihelp-query+watchlist-paramvalue-prop-loginfo": "å¨é©ç¶èæ·»å æ¥èªè³è¨ã", "apihelp-query+watchlist-paramvalue-prop-tags": "ååºé ç®çæ¨ç±¤ã", + "apihelp-query+watchlist-param-show": "åé¡¯ç¤ºç¬¦åéäºæ¨æºçé ç®ãä¾å¦ï¼åæ¥çç±ç»å¥ä½¿ç¨èååºçå°ç·¨è¼¯ï¼è«è¨å® $1show=minor|!anonã", "apihelp-query+watchlist-param-type": "è¦é¡¯ç¤ºçæ´æ¹é¡åï¼", "apihelp-query+watchlist-paramvalue-type-edit": "ä¸è¬é é¢ç·¨è¼¯ã", "apihelp-query+watchlist-paramvalue-type-external": "å¤é¨æ´æ¹ã", "apihelp-query+watchlist-paramvalue-type-new": "é é¢å»ºç«ã", "apihelp-query+watchlist-paramvalue-type-log": "æ¥èªé ç®ã", "apihelp-query+watchlist-paramvalue-type-categorize": "åé¡æå¡æ´æ¹ã", + "apihelp-query+watchlist-param-owner": "è $1token ä¸èµ·ä½¿ç¨ä»¥ååä¸åä½¿ç¨èçç£è¦æ¸å®ã", + "apihelp-query+watchlist-param-token": "åè¨±ååå¶ä»ä½¿ç¨èç£è¦æ¸å®çå®å¨æ¬æï¼å¯å¨ä½¿ç¨èç[[Special:Preferences#mw-prefsection-watchlist|åå¥½è¨å®]]æ¾å°ï¼ã", + "apihelp-query+watchlist-example-simple": "ååºå¨ç®åä½¿ç¨èç£è¦æ¸å®è£¡è¿æè®æ´é é¢çææ°ä¿®è¨ã", + "apihelp-query+watchlist-example-props": "ç´¢åå¨ç®åä½¿ç¨èç£è¦æ¸å®è£¡è¿æè®æ´é é¢çææ°ä¿®è¨é¡å¤è³è¨ã", + "apihelp-query+watchlist-example-allrev": "ç´¢åå¨ç®åä½¿ç¨èç£è¦æ¸å®è£¡ææè¿æè®æ´é é¢çè³è¨ã", "apihelp-query+watchlist-example-generator": "ç´¢åå¨ç®åä½¿ç¨èç£è¦æ¸å®è£¡è¿æè®æ´é é¢çé é¢è³è¨ã", + "apihelp-query+watchlist-example-generator-rev": "ç´¢åå¨ç®åä½¿ç¨èç£è¦æ¸å®è£¡è¿æè®æ´é é¢çä¿®è¨è³è¨ã", "apihelp-query+watchlistraw-summary": "ååºå¨ç®åä½¿ç¨èçç£è¦æ¸å®è£¡é ææé é¢ã", "apihelp-query+watchlistraw-param-namespace": "åååºå¨æå®å½åç©ºéçé é¢ã", "apihelp-query+watchlistraw-param-limit": "æ¯åè«æ±è¦åå³ççµæç¸½æ¸ã", "apihelp-query+watchlistraw-param-prop": "è¦åå¾çé¡å¤å±¬æ§ï¼", + "apihelp-query+watchlistraw-paramvalue-prop-changed": "æ·»å ä½¿ç¨èä¸ä¸æ¬¡è¢«éç¥å°æéç·¨è¼¯çæéæ³è¨ã", "apihelp-query+watchlistraw-param-show": "åååºç¬¦åéäºæºåçé ç®ã", + "apihelp-query+watchlistraw-param-owner": "è $1token ä¸èµ·ä½¿ç¨ä»¥ååä¸åä½¿ç¨èçç£è¦æ¸å®ã", + "apihelp-query+watchlistraw-param-token": "åè¨±ååå¶ä»ä½¿ç¨èç£è¦æ¸å®çå®å¨æ¬æï¼å¯å¨ä½¿ç¨èç[[Special:Preferences#mw-prefsection-watchlist|åå¥½è¨å®]]æ¾å°ï¼ã", "apihelp-query+watchlistraw-param-dir": "ååºæææ¡ç¨çæ¹åã", "apihelp-query+watchlistraw-param-fromtitle": "è¦éå§åèçæ¨é¡ï¼å¸¶æå½åç©ºéåç¶´ï¼ã", "apihelp-query+watchlistraw-param-totitle": "è¦åæ¢åèçæ¨é¡ï¼å¸¶æå½åç©ºéåç¶´ï¼ã", @@ -1083,6 +1192,8 @@ "apihelp-resetpassword-example-email": "å°ææé»åéµä»¶å°åçº user@example.com çä½¿ç¨èç¼ééæ°è¨å®å¯ç¢¼é»éµã", "apihelp-revisiondelete-summary": "åªé¤ååæ¶åªé¤ä¿®è¨ã", "apihelp-revisiondelete-param-type": "æ£å·è¡çä¿®è¨åªé¤é¡åã", + "apihelp-revisiondelete-param-target": "è¦ä¿®è¨åªé¤çé é¢æ¨é¡ï¼è¥é¡åææéè¦ã", + "apihelp-revisiondelete-param-ids": "è¦åªé¤çä¿®è¨èå¥ç¢¼ã", "apihelp-revisiondelete-param-hide": "åä¿®è¨æè¦é±èçå§å®¹ã", "apihelp-revisiondelete-param-show": "åä¿®è¨æè¦åæ¶é±èçå§å®¹ã", "apihelp-revisiondelete-param-suppress": "æ¯å¦å°ç®¡çèåå¶ä»ä½¿ç¨èç¦æ¢è³æã", @@ -1091,31 +1202,38 @@ "apihelp-revisiondelete-example-revision": "é±èå¨é é¢ Main Page çä¿®è¨ 12345 å§å®¹ã", "apihelp-revisiondelete-example-log": "ä»¥åå ï¼BLP violationï¼ä¾é±èå¨æ¥èªé ç® 67890 ä¸çææè³æã", "apihelp-rollback-summary": "å¾©åé é¢çæå¾ä¸æ¬¡ç·¨è¼¯ã", + "apihelp-rollback-extended-description": "è¥ç·¨è¼¯é é¢çä¸ä¸åä½¿ç¨èé£çºå»ºç«å¤åç·¨è¼¯ï¼éäºæå¨é¨è¢«åéã", "apihelp-rollback-param-title": "è¦åéçé é¢æ¨é¡ãä¸å¯è $1pageid åæä½¿ç¨ã", "apihelp-rollback-param-pageid": "è¦åéçé é¢ IDãä¸å¯è $1title åæä½¿ç¨ã", "apihelp-rollback-param-tags": "å¥ç¨å°åéçæ¨ç±¤ã", "apihelp-rollback-param-user": "ç·¨è¼¯è¢«åéçä½¿ç¨èåç¨±ã", "apihelp-rollback-param-summary": "èªå®ç¾©ç·¨è¼¯æè¦ãè¥çºç©ºï¼åä½¿ç¨é è¨æè¦ã", "apihelp-rollback-param-markbot": "å°åéçç·¨è¼¯ä»¥ååéæä½æ¨è¨çºæ©å¨äººæåç·¨è¼¯ã", - "apihelp-rollback-param-watchlist": "ç¡æ¢ä»¶ä½¿ç¨è¨ç½®å°é é¢å å¥æç§»é¤ç®åä½¿ç¨èçç£è¦æ¸å®æèæ¯ä¸æ´æ¹ç£è¦æ¸å®ã", + "apihelp-rollback-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-rollback-example-simple": "åéç±ä½¿ç¨è Example å°é é¢ Main Page æåçææ°ç·¨è¼¯ã", + "apihelp-rollback-example-summary": "å¸¶ç·¨è¼¯æè¦ Reverting vandalism ä¾åéç± IP ä½¿ç¨è 192.0.2.5 å°é é¢ Main Page æåçææ°ç·¨è¼¯ï¼ä¸¦æ¨è¨éäºç·¨è¼¯èåéçºæ©å¨äººååºçç·¨è¼¯ã", "apihelp-rsd-summary": "å¯åºä¸åç°¡ææ¢ç´¢ï¼Really Simple DiscoveryãRSDï¼æ¶æ§ã", "apihelp-rsd-example-simple": "å¯åº RSD æ¶æ§ã", "apihelp-setnotificationtimestamp-summary": "æ´æ°ç£è¦é é¢çéç¥æéæ³è¨ã", "apihelp-setnotificationtimestamp-param-entirewatchlist": "å¨ææå·²ç£è¦é é¢éä½ã", + "apihelp-setnotificationtimestamp-param-timestamp": "è¦è¨å®éç¥æéæ³è¨çæéæ³è¨ã", + "apihelp-setnotificationtimestamp-param-torevid": "è¦è¨å®éç¥æéæ³è¨çä¿®è¨ï¼åéä¸åé é¢ï¼ã", "apihelp-setnotificationtimestamp-example-all": "éæ°è¨å®æ´åç£è¦æ¸å®çéç¥çæã", "apihelp-setnotificationtimestamp-example-page": "éæ°è¨å®ç¨æ¼ Main page çéç¥çæã", + "apihelp-setnotificationtimestamp-example-pagetimestamp": "è¨å® Main page çéç¥æéæ³è¨ï¼è®ææèª 2012 å¹´ 1 æèµ·çç·¨è¼¯çºæªæ¥çã", "apihelp-setnotificationtimestamp-example-allpages": "éæ°è¨å®å¨ {{ns:user}} å½åç©ºéè£¡é é¢çéç¥çæã", "apihelp-setpagelanguage-summary": "æ´æ¹é é¢çèªè¨ã", "apihelp-setpagelanguage-extended-description-disabled": "æ¨ä¸è¢«åè¨±å¨æ¤ wiki ä¸è®æ´é é¢çèªè¨ã\n\nè«åç¨ [[mw:Special:MyLanguage/Manual:$wgPageLanguageUseDB|$wgPageLanguageUseDB]] ä¾é²è¡æ¤æä½ã", "apihelp-setpagelanguage-param-title": "æ¨ææ³è¦æ´æ¹èªè¨çé é¢ä¹æ¨é¡ãä¸è½è $1pageid ä¸èµ·ä½¿ç¨ã", "apihelp-setpagelanguage-param-pageid": "æ¨ææ³è¦æ´æ¹èªè¨çé é¢ä¹é é¢ IDãä¸è½è $1title ä¸èµ·ä½¿ç¨ã", + "apihelp-setpagelanguage-param-lang": "è¦æ´æ¹é é¢çèªè¨ä¹ä»£ç¢¼ãä½¿ç¨ default ä¾éæ°è¨å®é é¢æ wiki çé è¨å§å®¹èªè¨ã", "apihelp-setpagelanguage-param-reason": "è®æ´çåå ã", "apihelp-setpagelanguage-param-tags": "æ´æ¹å°æèªæ¤é æä½æå°è´åºæ¥èªé ç®çæ¨ç±¤ã", "apihelp-setpagelanguage-example-language": "æ´æ¹ Main Page çèªè¨æå·´æ¯åèªã", "apihelp-setpagelanguage-example-default": "å° ID æ¯ 123 é é¢çèªè¨æ´æ¹çº wiki çé è¨å§å®¹èªè¨ã", "apihelp-stashedit-summary": "å¨åäº«å¿«åè£¡é åç·¨è¼¯ã", "apihelp-stashedit-param-title": "æ£å¨ç·¨è¼¯æ¤é é¢çæ¨é¡ã", + "apihelp-stashedit-param-section": "ç« ç¯ç·¨èã0 ä»£è¡¨æä¸å±¤ç« ç¯ï¼new ä»£è¡¨æ°ç« ç¯ã", "apihelp-stashedit-param-sectiontitle": "æ°ç« ç¯çæ¨é¡ã", "apihelp-stashedit-param-text": "é é¢å§å®¹ã", "apihelp-stashedit-param-stashedtexthash": "è¦æ¿ä»£ä½¿ç¨çä¾èªååå²èè£¡é é¢å§å®¹éæ¹ã", @@ -1123,43 +1241,64 @@ "apihelp-stashedit-param-contentformat": "ç¨æ¼è¼¸å¥æåçå§å®¹åºååæ ¼å¼ã", "apihelp-stashedit-param-baserevid": "åºæ¬ä¿®è¨çä¿®è¨ IDã", "apihelp-stashedit-param-summary": "æ´æ¹æè¦ã", + "apihelp-tag-summary": "å¾åå¥ä¿®è¨ææ¥èªé ç®æ·»å æç§»é¤è®æ´æ¨ç±¤ã", + "apihelp-tag-param-rcid": "è¦æ·»å æç§»é¤æ¨ç±¤çä¸åæå¤åè¿æè®æ´ IDã", "apihelp-tag-param-revid": "è¦æ·»å æç§»é¤æ¨ç±¤çä¸åæå¤åä¿®è¨ IDã", "apihelp-tag-param-logid": "è¦æ·»å æç§»é¤æ¨ç±¤çä¸åæå¤åæ¥èªé ç® IDã", + "apihelp-tag-param-add": "è¦æ·»å çæ¨ç±¤ãåææåå®ç¾©çæ¨ç±¤å¯è¢«æ·»å ã", "apihelp-tag-param-reason": "è®æ´çåå ã", - "apihelp-tokens-summary": "åå¾è³æä¿®æ¹åä½çå¯é°ã", + "apihelp-tag-param-tags": "å¥ç¨å°æ¥èªé ç®çæ¨ç±¤æè¢«å»ºç«çºæ¤æä½ççµæã", + "apihelp-tag-example-rev": "ä¸ææåå å° ID çº 123 çä¿®è¨æ·»å vandalism æ¨ç±¤", + "apihelp-tag-example-log": "å° ID çº 123 çæ¥èªé ç®ç§»é¤ spam æ¨ç±¤ï¼åå ï¼Wrongly applied", + "apihelp-tokens-summary": "åå¾è³æä¿®æ¹åä½çæ¬æã", "apihelp-tokens-extended-description": "æ¤æ¨¡çµå·²å æ¯æ´ [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] èåç¨ã", + "apihelp-tokens-param-type": "è«æ±çæ¬æé¡åã", + "apihelp-tokens-example-edit": "æª¢ç´¢ç·¨è¼¯æ¬æï¼é è¨ï¼ã", + "apihelp-tokens-example-emailmove": "æª¢ç´¢é»åéµä»¶æ¬æä¸¦ç§»åæ¬æã", "apihelp-unblock-summary": "è§£é¤å°éä¸ä½ä½¿ç¨èã", "apihelp-unblock-param-user": "è¦å°éçä½¿ç¨èåç¨±ãIP ä½åæ IP ç¯åãä¸è½è $1id æ $1userid ä¸èµ·ä½¿ç¨", "apihelp-unblock-param-userid": "è¦å°éçä½¿ç¨è IDãä¸å¯è $1id æ $1user ä¸åä½¿ç¨ã", "apihelp-unblock-param-reason": "è§£é¤å°éçåå ã", "apihelp-unblock-param-tags": "å¨å°éæ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", "apihelp-unblock-example-id": "è§£é¤å°é ID #105ã", + "apihelp-unblock-example-user": "å°éä½¿ç¨è Bobï¼åå ï¼Sorry Bobã", "apihelp-undelete-summary": "æ¢å¾©å·²åªé¤é é¢çä¿®è¨ã", "apihelp-undelete-param-title": "è¦æ¢å¾©çé é¢æ¨é¡ã", "apihelp-undelete-param-reason": "éåçåå ã", "apihelp-undelete-param-tags": "å¨åªé¤æ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", + "apihelp-undelete-param-timestamps": "è¦å¾©åçä¿®è¨æéæ³è¨ãè¥ $1timestamps è $1fileids ççºç©ºï¼åææé½æè¢«å¾©åã", + "apihelp-undelete-param-fileids": "è¦å¾©åçæªæ¡ä¿®è¨ IDãè¥ $1timestamps è $1fileids ççºç©ºï¼åææé½æè¢«å¾©åã", + "apihelp-undelete-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-undelete-example-page": "åæ¶åªé¤é é¢ Main Pageã", "apihelp-undelete-example-revisions": "åæ¶åªé¤ Main Page çå©çä¿®è¨ã", "apihelp-unlinkaccount-summary": "ç§»é¤ç®åä½¿ç¨èæé£çµå°çç¬¬ä¸æ¹å¸³èã", "apihelp-upload-summary": "ä¸å³æªæ¡ï¼æåå¾çå¾ä¸å³ççæã", "apihelp-upload-param-filename": "ç®æ¨æªæ¡åç¨±ã", "apihelp-upload-param-comment": "ä¸å³è¨»éãå¦æ $1text æªæå®çè©±ï¼ä¹æä½çºæ°æªæ¡ç¨çåå§é é¢æåã", + "apihelp-upload-param-tags": "æ´æ¹æ¨ç±¤ä¾å¥ç¨å°ä¸å³æ¥èªé ç®ä»¥åæªæ¡é é¢ä¿®è¨ã", "apihelp-upload-param-text": "ç¨æ¼æ°æªæ¡çåå§é é¢æåã", "apihelp-upload-param-watch": "ç£è¦é é¢ã", + "apihelp-upload-param-watchlist": "ä½¿ç¨åå¥½è¨å®ç¡æ¢ä»¶å°å°é é¢å å¥è³æç§»é¤èªç®åä½¿ç¨èçç£è¦æ¸å®ï¼æä¸æ´æ¹ç£è¦ã", "apihelp-upload-param-ignorewarnings": "å¿½ç¥ææè¦åã", "apihelp-upload-param-file": "æªæ¡å§å®¹ã", "apihelp-upload-param-url": "ç´¢åæªæ¡çä¾æº URLã", + "apihelp-upload-param-sessionkey": "å¦å $1filekeyï¼ç¶æåä¸ç¸å®¹æ§ã", "apihelp-upload-param-stash": "è¥è¨å®çè©±ï¼ä¼ºæå¨å°æææªæ¡è¨ææ«åï¼èä¸æ¯æ·»å è³å²ååº«è£¡ã", "apihelp-upload-param-filesize": "æ´é«ä¸å³çæªæ¡å¤§å°ã", "apihelp-upload-param-chunk": "å¤§éå§å®¹ã", "apihelp-upload-param-async": "å¨å¯è½çææ³ä¸è®æ½å¨çå¤§åæªæ¡éåæ¥èçã", + "apihelp-upload-param-checkstatus": "åæª¢ç´¢æå®æªæ¡éµçä¸å³çæã", "apihelp-upload-example-url": "å¾ URL ä¸å³ã", + "apihelp-upload-example-filekey": "å®æåºæ¼è¦åèå¤±æçä¸å³ã", "apihelp-userrights-summary": "è®æ´ä¸ä½ä½¿ç¨èçç¾¤çµæå¡ã", "apihelp-userrights-param-user": "ä½¿ç¨èåç¨±ã", "apihelp-userrights-param-userid": "ä½¿ç¨èIDã", - "apihelp-userrights-param-add": "å å¥ä½¿ç¨èè³éäºç¾¤çµï¼è¥å·²æ¯æå¡ï¼åæ´æ°å¤±ææéã", + "apihelp-userrights-param-add": "å å¥ä½¿ç¨èè³éäºç¾¤çµï¼è¥å·²æ¯æå¡ï¼åæ´æ°æéæéã", "apihelp-userrights-param-remove": "å¾éäºç¾¤çµç§»é¤ä½¿ç¨èã", "apihelp-userrights-param-reason": "è®æ´çåå ã", + "apihelp-userrights-param-tags": "å¨ä½¿ç¨èæ¬éæ¥èªè£¡æ´æ¹å¥ç¨å°é ç®çæ¨ç±¤ã", + "apihelp-userrights-example-user": "æ·»å ä½¿ç¨è FooBot è³ç¾¤çµ botï¼ä¸¦å¾ç¾¤çµ sysop è bureaucrat è£¡ç§»é¤ã", + "apihelp-userrights-example-userid": "æ·»å ID çº 123 çä½¿ç¨èè³ç¾¤çµ botï¼ä¸¦å¾ç¾¤çµ sysop è bureaucrat è£¡ç§»é¤ã", "apihelp-userrights-example-expiry": "æ·»å ä½¿ç¨è SometimeSysop è³ç¾¤çµ sysop çºæä¸åææéã", "apihelp-validatepassword-summary": "é©èå¯ç¢¼æ¯å¦ç¬¦å wiki çå¯ç¢¼æ¹éã", "apihelp-validatepassword-param-password": "è¦é©èçå¯ç¢¼ã", @@ -1169,6 +1308,8 @@ "apihelp-validatepassword-example-1": "é©èç®åä½¿ç¨èçå¯ç¢¼ foobarã", "apihelp-validatepassword-example-2": "çºå»ºç«çä½¿ç¨è Example é©èå¯ç¢¼ qwertyã", "apihelp-watch-summary": "å¾ç®åä½¿ç¨èçç£è¦æ¸å®æ·»å æç§»é¤é é¢ã", + "apihelp-watch-param-title": "è¦ï¼åæ¶ï¼ç£è¦çé é¢ãè«æ¹ç¨ $1titlesã", + "apihelp-watch-param-unwatch": "è¥è¨å®é é¢ï¼åæåæ¶ç£è¦èéè¢«ç£è¦ã", "apihelp-watch-example-watch": "ç£è¦é é¢ Main Pageã", "apihelp-watch-example-unwatch": "åæ¶ç£è¦é é¢ Main Pageã", "apihelp-watch-example-generator": "ç£è¦å¨ä¸»å½åç©ºéæåçå¹¾åé é¢ã", @@ -1180,6 +1321,7 @@ "apihelp-phpfm-summary": "ä½¿ç¨åºåå PHP æ ¼å¼è¼¸åºè³æ (ä½¿ç¨ HTML æ ¼å¼é¡¯ç¤º)ã", "apihelp-rawfm-summary": "ä½¿ç¨ JSON æ ¼å¼çé¤é¯åç´ è¼¸åºè³æ (ä½¿ç¨ HTML æ ¼å¼é¡¯ç¤º)ã", "apihelp-xml-summary": "ä½¿ç¨ XML æ ¼å¼è¼¸åºè³æã", + "apihelp-xml-param-xslt": "è¥ææå®ï¼æ·»å å½åé é¢æ XSL æ¨£å¼è¡¨ãå¼å¿é æ¯å¨ .xsl çµå°¾è {{ns:MediaWiki}} å½åç©ºéè£¡çæ¨é¡ã", "apihelp-xml-param-includexmlnamespace": "è¥ææå®ï¼æ·»å ä¸å XML å½åç©ºéã", "apihelp-xmlfm-summary": "ä½¿ç¨ XML æ ¼å¼è¼¸åºè³æ (ä½¿ç¨ HTML æ ¼å¼é¡¯ç¤º)ã", "api-format-title": "MediaWiki API çµæ", @@ -1187,11 +1329,14 @@ "api-format-prettyprint-header-only-html": "éæ¯ç¨ä¾é¤é¯çHTMLåç¾ï¼ä¸é©åå¯¦éæç¨ã\n\nåè¦[[mw:Special:MyLanguage/API|å®æ´æä»¶]]æ[[Special:ApiHelp/main|APIå¹«å©]]ä»¥åå¾æ´å¤è³è¨ã", "api-format-prettyprint-header-hyperlinked": "éæ¯$1æ ¼å¼çHTMLå¯¦ç¾ãHTMLå°é¤é¯å¾æç¨ï¼ä½ä¸é©åæç¨ç¨å¼ä½¿ç¨ã\n\næå®formatåæ¸ä»¥æ´æ¹è¼¸åºæ ¼å¼ãè¦æ¥ç$1æ ¼å¼çéHTMLå¯¦ç¾ï¼è¨ç½®[$3 format=$2]ã\n\nåè¦[[mw:API|å®æ´æä»¶]]ï¼æ[[Special:ApiHelp/main|APIå¹«å©]]ä»¥ç²åæ´å¤ä¿¡æ¯ã", "api-format-prettyprint-status": "æ¤åæå°æå³åHTTPçæ$1 $2ã", + "api-login-fail-aborted-nobotpw": "é©èéè¦ä½¿ç¨èäºåï¼è©²ä¸è¢« action=login ææ¯æ´ãè¦ç»å¥è«æ¥ç [[Special:ApiHelp/clientlogin|action=clientlogin]]ã", "api-login-fail-badsessionprovider": "ç¶ä½¿ç¨$1ç¡æ³ç»å¥ã", "api-login-fail-sameorigin": "ç¶æªå¥ç¨ç¸ååææ¹éæç¡æ³ç»å¥ã", "api-pageset-param-titles": "è¦ä½¿ç¨çæ¨é¡æ¸å®ã", "api-pageset-param-pageids": "è¦ä½¿ç¨çé é¢ ID æ¸å®ã", "api-pageset-param-revids": "è¦ä½¿ç¨çä¿®è¨ ID æ¸å®ã", + "api-pageset-param-redirects-generator": "èªåè§£æ±ºå¨ $1titlesã$1pageidsã$1revidsï¼ä»¥åç± $1generator æåå³é é¢è£¡çéæ°å°åã", + "api-pageset-param-redirects-nogenerator": "èªåè§£æ±ºå¨ $1titlesã$1pageidsï¼è $1revids çéæ°å°åã", "api-help-title": "MediaWiki API èªªæ", "api-help-lead": "æ¤é çºèªåç¢çç MediaWiki API èªªææä»¶é é¢ã\n\nèªªææä»¶èç¯ä¾ï¼https://www.mediawiki.org/wiki/API", "api-help-main-header": "ä¸»è¦æ¨¡çµ", @@ -1204,12 +1349,15 @@ "api-help-flag-generator": "æ¤æ¨¡çµå¯ä½çºç¢çå¨ä½¿ç¨ã", "api-help-source": "ä¾æºï¼$1", "api-help-source-unknown": "ä¾æºï¼æªç¥", - "api-help-license": "åå®ï¼[[$1|$2]]", + "api-help-license": "ææ¬æ¢æ¬¾ï¼[[$1|$2]]", "api-help-license-noname": "åå®ï¼[[$1|æ¥çé£çµ]]", - "api-help-license-unknown": "åå®ï¼æªç¥", + "api-help-license-unknown": "ææ¬æ¢æ¬¾ï¼æªç¥", "api-help-parameters": "{{PLURAL:$1|åæ¸}}ï¼", "api-help-param-deprecated": "å·²åç¨ã", "api-help-param-required": "æ¤åæ¸çºå¿å¡«ã", + "api-help-param-templated": "æ¤çº[[Special:ApiHelp/main#main/templatedparams|æ¨¡æ¿åæ¸]]ãç¶ååºè«æ±æï¼$2ã", + "api-help-param-templated-var-first": "å¨åæ¸åç¨±è£¡ç {$1} ææ¿ææ $2 çå¼", + "api-help-param-templated-var": "{$1} è $2 çå¼", "api-help-datatypes-header": "è³æé¡å", "api-help-datatypes": "è³MediaWikiçè¼¸å¥å¼æçºNFCæ¨æºåçUTF-8ãMediaWikiå¯ä»¥åè©¦è½æå¶ä»è¼¸å¥å¼ï¼ä½éå¯è½å°è´ä¸äºæä½å¤±æï¼ä¾å¦éå¸¶MD5æª¢æ¥ç[[Special:ApiHelp/edit|ç·¨è¼¯]]ï¼ã\n\nä¸äºå¨APIè«æ±ä¸çåæ¸é¡åéè¦æ´é²ä¸æ¥è§£éï¼\n;boolean\n:å¸æåæ¸ç¢çä½ç¨å°±åHTMLè¤é¸æ¡ä¸æ¨£ï¼å¦æåæ¸è¢«æå®ï¼ç¡è«ä½å¼é½è¢«è¦çºçï¼trueï¼ãå¦æè¦åå¼ï¼falseï¼ï¼åå¿é çç¥åæ¸ã\n;timestamp\n:æéæ³è¨å¯è¢«æå®çºå¤ç¨®æ ¼å¼ãæ¨èä½¿ç¨ISO 8601æ¥æåæéæ¨æºãæææéçºUTCæéï¼åå«çä»»ä½æåé½æè¢«å¿½ç¥ã\n:* ISO 8601æ¥æåæéï¼2001-01-15T14:56:00Zï¼æ¨é»åZçºé¸ç¨ï¼\n:* å¸¶å°æ¸ç§ï¼æè¢«å¿½ç¥ï¼çISO 8601æ¥æåæéï¼2001-01-15T14:56:00.00001Zï¼ç ´æèãåèåZçºé¸ç¨ï¼\n:* MediaWikiæ ¼å¼ï¼20010115145600\n:* ä¸è¬æ¸åæ ¼å¼ï¼2001-01-15 14:56:00ï¼GMTã+##æ-##çé¸ç¨æåæè¢«å¿½ç¥ï¼\n:* EXIFæ ¼å¼ï¼2001:01:15 14:56:00\n:* RFC 2822æ ¼å¼ï¼æåå¯çç¥ï¼ï¼Mon, 15 Jan 2001 14:56:00\n:* RFC 850æ ¼å¼ï¼æåå¯çç¥ï¼ï¼Monday, 15-Jan-2001 14:56:00\n:* C ctimeæ ¼å¼ï¼Mon Jan 15 14:56:00 2001\n:* å¾1970-01-01T00:00:00Zéå§çç§æ¸ï¼ä½çº1å°13ä½æ¸çæ´æ¸ï¼é¤äº0ï¼\n:* åä¸²now\n;æ¿ä»£å¤å¼åéç¬¦è\n:ä½¿ç¨å¤åå¼çåæ¸éå¸¸æèåç´ç·ç¬¦èï¼|ï¼åéçå¼ä¸èµ·æäº¤ï¼ä¾å¦param=value1|value2æparam=value1%7Cvalue2ãå¦æå¼å¿é åå«åç´ç·ç¬¦èï¼ä½¿ç¨U+001Fï¼å®ä½åéç¬¦èï¼ä½çºåéç¬¦èï¼''ä¸¦ä¸''å¨å¼åå åç¶´U+001Fï¼ä¾å¦param=%1Fvalue1%1Fvalue2ã", "api-help-templatedparams-header": "æ¨¡æ¿åæ¸", @@ -1232,10 +1380,10 @@ "api-help-param-multi-all": "è¦æå®ææå¼ï¼è«ä½¿ç¨$1ã", "api-help-param-default": "é è¨å¼ï¼$1", "api-help-param-default-empty": "é è¨å¼ï¼(ç©º)", - "api-help-param-token": "èª [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] æ¥æ¶ç \"$1\" å¯é°ã", - "api-help-param-token-webui": "çºé¡§åç¸å®¹æ§ï¼web UIä¸ä½¿ç¨çä»£ç¢¼ï¼Tokenï¼ä¹æ¯å¯æ¥åçã", + "api-help-param-token": "èª [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] æ¥æ¶ç \"$1\" æ¬æã", + "api-help-param-token-webui": "çºé¡§åç¸å®¹æ§ï¼web UI ä¸ä½¿ç¨çæ¬æï¼Tokenï¼ä¹æ¯å¯æ¥åçã", "api-help-param-disabled-in-miser-mode": "å [[mw:Special:MyLanguage/Manual:$wgMiserMode|miseræ¨¡å¼]]èè¢«åç¨ã", - "api-help-param-limited-in-miser-mode": "æ³¨æï¼å [[mw:Special:MyLanguage/Manual:$wgMiserMode|miseræ¨¡å¼]]ï¼ä½¿ç¨éåå¯è½å°è´ç¹¼çºä»¥åå³åå°æ¼$1limitççµæï¼æ¥µç«¯ææ³ä¸å¯è½ä¸æå³åä»»ä½ç»æã", + "api-help-param-limited-in-miser-mode": "æ³¨æï¼åºæ¼ [[mw:Special:MyLanguage/Manual:$wgMiserMode|miser æ¨¡å¼]]ç·£æï¼ä½¿ç¨éåå¯è½æå°è´å¨ç¹¼çºä¹åï¼å³åå°æ¼ $1limit çççµæï¼æ¥µç«¯ææ³ä¸åå¯è½ä¸æå³åä»»ä½ç»æã", "api-help-param-direction": "åèçæ¹åï¼\n;newer:æèçåªåãæ³¨æï¼$1startæå¨$1endä¹åã\n;older:ææ°çåªåï¼é è¨ï¼ãæ³¨æï¼$1startæå¨$1endä¹å¾ã", "api-help-param-continue": "ç¶ææ´å¤çµæå¯ç¨æï¼ä½¿ç¨éåç¹¼çºã", "api-help-param-no-description": "(ç¡æè¿°)", @@ -1244,8 +1392,9 @@ "api-help-examples": "{{PLURAL:$1|ç¯ä¾}}ï¼", "api-help-permissions": "{{PLURAL:$1|æ¬é}}ï¼", "api-help-permissions-granted-to": "{{PLURAL:$1|å·²ææ¬çµ¦}}: $2", + "api-help-right-apihighlimits": "å¨ API æ¥è©¢ä½¿ç¨è¼é«çéå¶ï¼æ¢æ¥è©¢ï¼$1ï¼å¿«æ¥è©¢ï¼$2ï¼ãæ¢æ¥è©¢çéå¶ä¹é©ç¨æ¼å¤å¼åæ¸ã", "api-help-open-in-apisandbox": "[å¨æ²çä¸éå]", - "api-help-authmanager-general-usage": "ä½¿ç¨æ¤æ¨¡çµçä¸è¬ç¨å¼æ¯ï¼\n# ééamirequestsfor=$4åå¾ä¾èª[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]çå¯ç¨æ¬ä½ï¼åä¾èª[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]ç$5ä»¤çã\n# åç¨æ¶é¡¯ç¤ºæ¬ä½ï¼ä¸¦ç²å¾å¶æäº¤çå§å®¹ã\n# æäº¤ï¼POSTï¼è³æ¤æ¨¡çµï¼æä¾$1returnurlåä»»ä½ç¸éæ¬ä½ã\n# å¨ååºä¸æª¢æ¥statusã\n#* å¦ææ¨æ¶å°äºPASSï¼æåï¼æFAILï¼å¤±æï¼ï¼åèªçºæä½çµæãæåèå¦å¦ä¸å¥æç¤ºã\n#* å¦ææ¨æ¶å°äºUIï¼åç¨æ¶é¡¯ç¤ºæ°æ¬ä½ï¼ä¸¦åæ¬¡ç²åå¶æäº¤çå§å®¹ãç¶å¾åæ¬¡ä½¿ç¨$1continueï¼åæ¬æ¨¡çµæäº¤ç¸éæ¬ä½ï¼ä¸¦éå¾©ç¬¬åæ¥ã\n#* å¦ææ¨æ¶å°äºREDIRECTï¼å°ä½¿ç¨èæåredirecttargetä¸çç®æ¨ï¼çå¾å¶è¿å$1returnurlãç¶å¾åæ¬¡ä½¿ç¨$1continueï¼åæ¬æ¨¡çµæäº¤è¿åURLä¸æä¾çä¸åæ¬ä½ï¼ä¸¦éå¾©ç¬¬åæ¥ã\n#* å¦ææ¨æ¶å°äºRESTARTï¼éæå³èèº«ä»½é©èæ£å¸¸éä½ï¼ä½æåæ²æé£çµçä½¿ç¨èè³¬æ¶ãæ¨å¯ä»¥å°æ¤çåUIæFAILã", + "api-help-authmanager-general-usage": "ä½¿ç¨æ¤æ¨¡çµçä¸è¬ç¨å¼æ¯ï¼\n# éé amirequestsfor=$4 åå¾ä¾èª [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] çå¯ç¨æ¬ä½ï¼åä¾èª [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] ç$5æ¬æã\n# åç¨æ¶é¡¯ç¤ºæ¬ä½ï¼ä¸¦ç²å¾å¶æäº¤çå§å®¹ã\n# æäº¤ï¼POSTï¼è³æ¤æ¨¡çµï¼æä¾ $1returnurl åä»»ä½ç¸éæ¬ä½ã\n# å¨åæä¸æª¢æ¥ statusã\n#* å¦ææ¨æ¶å°äº PASSï¼æåï¼æFAILï¼å¤±æï¼ï¼åèªçºæä½çµæãæåèå¦å¦ä¸å¥æç¤ºã\n#* å¦ææ¨æ¶å°äº UIï¼åç¨æ¶é¡¯ç¤ºæ°æ¬ä½ï¼ä¸¦åæ¬¡ç²åå¶æäº¤çå§å®¹ãç¶å¾åæ¬¡ä½¿ç¨ $1continueï¼åæ¬æ¨¡çµæäº¤ç¸éæ¬ä½ï¼ä¸¦éå¾©ç¬¬åæ¥ã\n#* å¦ææ¨æ¶å°äº REDIRECTï¼å°ä½¿ç¨èæåredirecttarget ä¸çç®æ¨ï¼çå¾å¶è¿å$1returnurlãç¶å¾åæ¬¡ä½¿ç¨ $1continueï¼åæ¬æ¨¡çµæäº¤è¿å URL ä¸æä¾çä¸åæ¬ä½ï¼ä¸¦éå¾©ç¬¬åæ¥ã\n#* å¦ææ¨æ¶å°äº RESTARTï¼éæå³èèº«ä»½é©èæ£å¸¸éä½ï¼ä½æåæ²æé£çµçä½¿ç¨èå¸³æ¶ãæ¨å¯ä»¥å°æ¤è¦çº UIæFAILã", "api-help-authmanagerhelper-requests": "åªä½¿ç¨éäºèº«ä»½é©èè«æ±ï¼ééèª[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]åå³çidèamirequestsfor=$1ï¼æä¾èªæ¤æ¨¡çµä¹åçåæã", "api-help-authmanagerhelper-request": "ä½¿ç¨æ¤èº«ä»½é©èè«æ±ï¼ééèª[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]åå³çidèamirequestsfor=$1ã", "api-help-authmanagerhelper-messageformat": "ç¨æ¼åå³è¨æ¯çæ ¼å¼ã", @@ -1254,6 +1403,8 @@ "api-help-authmanagerhelper-returnurl": "çºç¬¬ä¸æ¹èº«ä»½é©èæµç¨å³åURLï¼å¿é çºçµå°å¼ãéè¦æ¤å¼æ$1continueå©èä¹ä¸ã\n\nå¨æ¥æ¶REDIRECTåææï¼ä¸è¬çæ³ä¸æ¨å°æéçè¦½å¨æç¶²ç«çè¦½åè½å°ç¹å®çredirecttarget URLä»¥é²è¡ç¬¬ä¸æ¹èº«ä»½é©èæµç¨ãç¶å®å®ææï¼ç¬¬ä¸æ¹æå°çè¦½å¨æç¶²ç«çè¦½åè½éè³æ¤URLãæ¨æç¶æåä»»ä½ä¾èªURLçæ¥è©¢æPOSTåæ¸ï¼ä¸¦å°ä¹ä½çº$1continueè«æ±å³éè³æ¤APIæ¨¡çµã", "api-help-authmanagerhelper-continue": "æ¤è«æ±æ¯å¨ååçUIæREDIRECTåæä¹å¾çå¾çºåä½ãå¿é çºæ¤å¼æ$1returnurlã", "api-help-authmanagerhelper-additional-params": "æ¤æ¨¡çµåè¨±é¡å¤åæ¸ï¼åæ±ºæ¼å¯ç¨çèº«ä»½é©èè«æ±ãä½¿ç¨[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]ä¸amirequestsfor=$1ï¼æä¹åä¾èªæ¤æ¨¡çµçåæï¼å¦æåé©ï¼ä»¥æ±ºå®å¯ç¨è«æ±åå¶ä½¿ç¨çæ¬ä½ã", + "apierror-allimages-redirect": "ç¶ä½¿ç¨ allimages ä½çºç¢çå¨æï¼è«æ¹ç¨ gaifilterredir=nonredirects èä¸æ¯ redirectsã", + "apierror-allpages-generator-redirects": "ç¶ä½¿ç¨ allpages ä½çºç¢çå¨æï¼è«æ¹ç¨ gapfilterredir=nonredirects èä¸æ¯ redirectsã", "apierror-appendnotsupported": "ç¡æ³éå å°ä½¿ç¨å§å®¹æ¨¡çµ $1 çé é¢ã", "apierror-articleexists": "æ¨æåè©¦å»ºç«çæ¢ç®ååå·²è¢«åµå»ºã", "apierror-assertbotfailed": "æ·è¨ä½¿ç¨èææç bot æ¬éå¤±æã", @@ -1261,8 +1412,12 @@ "apierror-assertuserfailed": "æ·è¨ä½¿ç¨èå·²ç»å¥å¤±æã", "apierror-autoblocked": "æ¨ç IP ä½åå·²ç¶è¢«èªåå°éï¼å çºå®æ¾ç¶è¢«ä¸åå·²å°éçä½¿ç¨èä½¿ç¨éã", "apierror-bad-badfilecontexttitle": "å¨ $1badfilecontexttitle åæ¸çç¡ææ¨é¡ã", + "apierror-badconfig-resulttoosmall": "å¨æ¤ wiki ä¸ $wgAPIMaxResultSize çå¼å¤ªå°ï¼èç¡æ³å«æåºæ¬çµæè³è¨ã", + "apierror-badcontinue": "ç¡æçç¹¼çºåæ¸ãæ¨æè©²å³éç±åä¸åæ¥è©¢æåå³çåæå¼ã", + "apierror-baddiff": "ç¡æ³åå¾å·®ç°ãä¸åå¨ä¸åæå©åä¿®è¨ï¼ææ¯æ¨æ²ææ¬éä¾æª¢è¦å®åã", "apierror-baddiffto": "$1diffto å¿é è¨å®æéè² å¼çæ¸åãprevãnextãæ curã", "apierror-badformat-generic": "å§å®¹æ¨¡çµ $2 ä¸æ¯æ´ä½¿ç¨è«æ±æ ¼å¼ $1ã", + "apierror-badformat": "ç± $3 æä½¿ç¨çå§å®¹æ¨¡çµ $2 ä¸æ¯æ´ä½¿ç¨è«æ±æ ¼å¼ $1ã", "apierror-badgenerator-notgenerator": "æ¨¡çµ $1 ä¸è½ä½çºç¢çå¨ã", "apierror-badgenerator-unknown": "æªç¥ç generator=$1ã", "apierror-badip": "IP åæ¸ç¡æã", @@ -1271,10 +1426,18 @@ "apierror-badmodule-nosubmodules": "æ¨¡çµ $1 æ²æåæ¨¡çµã", "apierror-badparameter": "åæ¸ $1 çå¼ç¡æã", "apierror-badquery": "ç¡æçæ¥è©¢ã", + "apierror-badtimestamp": "ç¨æ¼æéæ³è¨åæ¸ $1 çå¼ã$2ãç¡æã", + "apierror-badtoken": "ç¡æ CSRF æ¬æã", + "apierror-badupload": "æªæ¡ä¸å³åæ¸ $1 ä¸æ¯ä¸åæªæ¡ä¸å³ï¼è«ç¢ºå®å¨æ¨ç POST æä½¿ç¨ multipart/form-dataï¼ä¸¦ä¸å¨ Content-Disposition æ¨é æåå«æªæ¡åç¨±ã", + "apierror-badurl": "ç¨æ¼ URL åæ¸ $1 çå¼ã$2ãç¡æã", + "apierror-baduser": "ç¨æ¼ä½¿ç¨èåæ¸ $1 çå¼ã$2ãç¡æã", + "apierror-badvalue-notmultivalue": "U+001F å¤å¼åååå¯ç¨æ¼å¤å¼åæ¸ã", + "apierror-bad-watchlist-token": "æä¾ç¡æçç£è¦æ¸å®æ¬æãè«å¨ [[Special:Preferences]] è¨å®æ£ç¢ºæ¬æã", "apierror-blockedfrommail": "æ¨å·²è¢«å°éï¼ç¡æ³ç¼éé»åéµä»¶ã", "apierror-blocked": "æ¨å·²è¢«å°éï¼ç¡æ³ç·¨è¼¯ã", "apierror-blocked-partial": "æ¨å·²è¢«ç¦æ¢ç·¨è¼¯æ¤é é¢ã", "apierror-botsnotsupported": "æ¤ä»é¢ä¸æ¯æ´æ©å¨äººã", + "apierror-cannotreauthenticate": "åºæ¼æ¨çèº«ä»½ç¡æ³é©èï¼æ¤æä½ä¸å¯ç¨ã", "apierror-cannotviewtitle": "æ¨ä¸è¢«åè¨±æª¢è¦$1ã", "apierror-cantblock-email": "æ¨æ²ææ¬éä¾å°éä½¿ç¨èéé wiki ä¾ç¼éé»åéµä»¶ã", "apierror-cantblock": "æ¨æ²ææ¬éä¾è§£å°ä½¿ç¨èã", @@ -1282,27 +1445,52 @@ "apierror-canthide": "æ¨æ²ææ¬éä¾å¾å°éæ¥èªé±èä½¿ç¨èåç¨±ã", "apierror-cantimport-upload": "æ¨æ²ææ¬éä¾å¯å¥å·²ä¸å³é é¢ã", "apierror-cantimport": "æ¨æ²ææ¬éä¾å¯å¥é é¢ã", + "apierror-cantoverwrite-sharedfile": "ç®æ¨æªæ¡åå¨æ¼åäº«å²ååº«ä¸ï¼å æ¤æ¨æ²ææ¬éä¾è¦èæã", + "apierror-cantsend": "æ¨å°æªç»å¥ï¼æ¨æ²æå·²ç¢ºèªçé»åéµä»¶å°åï¼ææ¯æ¨æªè¢«åè¨±ç¼éé»åéµä»¶çµ¦å¶ä»äººï¼å æ¤æ¨ä¸è½ç¼éé»åéµä»¶ã", + "apierror-cantundelete": "ç¡æ³åæ¶åªé¤ï¼è«æ±çä¿®è¨å¯è½ä¸åå¨ï¼ææ¯å¯è½å·²è¢«åæ¶åªé¤ã", "apierror-changeauth-norequest": "å»ºç«æ´æ¹è«æ±å¤±æã", + "apierror-cidrtoobroad": "ä¸è½æ¥åè¶åº /$2 ç $1 CIDR ç¯åã", + "apierror-compare-maintextrequired": "ç¶ $1slots åå« main æï¼éè¦åæ¸ $1text-mainï¼ä¸è½åªé¤ä¸»è¦é¨ä»½ï¼ã", + "apierror-compare-no-title": "ç¡æ³å¨ä¸å¸¶æ¨é¡ä¹ä¸é åå²åè½æãè«åè©¦æå® fromtitle æ totitleã", + "apierror-compare-nosuchfromsection": "å¨ 'from' å§å®¹è£¡æ²ææ®µè½$1ã", + "apierror-compare-nosuchtosection": "å¨ 'to' å§å®¹è£¡æ²ææ®µè½$1ã", + "apierror-compare-nofromrevision": "æ²æãfromãä¿®è¨ãè«æå® fromrevãfromtitleãæ fromidã", "apierror-compare-notext": "åæ¸ $1 ä¸è½å¨ç¼ºå° $2 çææ³ä¸ä½¿ç¨ã", + "apierror-compare-notorevision": "æ²æãtoãä¿®è¨ãè«æå® torevãtotitleãæ toidã", + "apierror-compare-relative-to-deleted": "ç¸éå·²åªé¤ä¿®è¨æä¸è½ä½¿ç¨ torelative=$1ã", "apierror-contentserializationexception": "å§å®¹åºååå¤±æï¼$1", + "apierror-contenttoobig": "æ¨ææä¾çå§å®¹è¶åºæ¢ç®ç $1 {{PLURAL:$1|ä½åçµ|ä½åçµ}}éå¶ã", "apierror-copyuploadbaddomain": "ä¸åè¨±å¾æ¤ç¶²åä¾éé URL ä¸å³ã", "apierror-copyuploadbadurl": "ä¸åè¨±å¾æ¤ URL ä¾ä¸å³ã", + "apierror-create-titleexists": "ç¾ææ¨é¡ä¸è½ä»¥ create ä¾ä¿è·ã", "apierror-csp-report": "èç CSP å ±åæé¯èª¤ï¼$1ã", + "apierror-deletedrevs-param-not-1-2": "$1 åæ¸ä¸å¯ç¨æ¼æ¨¡å¼ 1 æ 2ã", + "apierror-deletedrevs-param-not-3": "$1 åæ¸ä¸å¯ç¨æ¼æ¨¡å¼ 3ã", "apierror-emptynewsection": "æ°æ®µè½ä¸å¯å»ºç«ç©ºç½å§å®¹ã", "apierror-emptypage": "ä¸åè¨±å»ºç«ç©ºç½çæ°é é¢ã", "apierror-exceptioncaught": "[$1]æç²ç°å¸¸ï¼$2", "apierror-exceptioncaughttype": "[$1]æç²ç°å¸¸é¡åï¼$2", "apierror-filedoesnotexist": "æªæ¡ä¸åå¨ã", + "apierror-fileexists-sharedrepo-perm": "ç®æ¨æªæ¡åå¨æ¼åäº«å²ååº«ä¸ãè«ä½¿ç¨åæ¸ ignorewarnings ä¾è¦èæã", "apierror-filenopath": "ç¡æ³åå¾æ¬å°ç«¯æªæ¡è·¯å¾ã", "apierror-filetypecannotberotated": "ç¡æ³æè½çæªæ¡é¡åã", + "apierror-formatphp": "æ¤åæä¸è½ä½¿ç¨ format=php ä¾è¡¨ç¤ºãè«åé± https://phabricator.wikimedia.org/T68776ã", "apierror-imageusage-badtitle": "$1çæ¨é¡å¿é æ¯æªæ¡ã", "apierror-import-unknownerror": "æªç¥çå¯å¥é¯èª¤ï¼$1", + "apierror-integeroutofrange-abovebotmax": "å°æ¼æ©å¨äººæç³»çµ±ç®¡çå¡èè¨ï¼$1 ä¸è½è¶é $2ï¼è¨å®çº $3ï¼ã", + "apierror-integeroutofrange-abovemax": "å°æ¼ä½¿ç¨èèè¨ï¼$1 ä¸è½è¶é $2ï¼è¨å®çº $3ï¼ã", + "apierror-integeroutofrange-belowminimum": "$1 ä¸è½å°æ¼ $2ï¼è¨å®çº $3ï¼ã", "apierror-invalidcategory": "æ¨æè¼¸å¥çåé¡åç¨±ç¡æã", + "apierror-invalidexpiry": "ç¡æçæéæéã$1ãã", + "apierror-invalid-file-key": "ä¸æ¯ææçæªæ¡éµã", "apierror-invalidlang": "ç¨æ¼åæ¸ $1 çèªè¨ä»£ç¢¼ç¡æã", + "apierror-invalidmethod": "ç¡æç HTTP æ¹å¼ãè«èæ®æ¡ç¨ GET æ POSTã", "apierror-invalidoldimage": "oldimage åæ¸å«æç¡ææ ¼å¼ã", "apierror-invalidparammix-cannotusewith": "åæ¸ $1 ä¸è½è $2 ä¸èµ·ä½¿ç¨ã", "apierror-invalidparammix-mustusewith": "$1 åæ¸åè½è $2 ä¸èµ·ä½¿ç¨ã", + "apierror-invalidparammix-parse-new-section": "section=new ä¸è½é£å oldidãpageidãæ page åæ¸ãè«ä½¿ç¨ title è textã", "apierror-invalidparammix": "{{PLURAL:$2|åæ¸}} $1 ä¸è½ä¸èµ·ä½¿ç¨ã", + "apierror-invalidsection": "section åæ¸å¿é æ¯ææçæ®µè½ ID æ newã", "apierror-invalidsha1base36hash": "ææä¾ç SHA1Base36 éæ¹ç¡æã", "apierror-invalidsha1hash": "ææä¾ç SHA1 éæ¹ç¡æã", "apierror-invalidtitle": "é¯èª¤æ¨é¡ã$1ãã", @@ -1316,13 +1504,16 @@ "apierror-mimesearchdisabled": "MIME æå°å¨ Miser æ¨¡å¼è£¡è¢«åç¨ã", "apierror-missingcontent-pageid": "éºå¤±é é¢ ID çº $1 çå§å®¹ã", "apierror-missingcontent-revid": "éºå¤±ä¿®è¨ ID çº $1 çå§å®¹ã", - "apierror-missingparam-one-of": "{{PLURAL:$2|åæ¸|åæ¸å¶ä¸}} $1 çºå¿è¦ã", + "apierror-missingparam-at-least-one-of": "åæ¸$1{{PLURAL:$2||å¶ä¸}}çºå¿è¦ã", + "apierror-missingparam-one-of": "åæ¸$1{{PLURAL:$2||å¶ä¸}}çºå¿è¦ã", "apierror-missingparam": "$1åæ¸å¿é è¢«è¨å®ã", "apierror-missingrev-pageid": "æ²æé é¢ ID çº $1 çç®åä¿®è¨ã", "apierror-missingrev-title": "æ²ææ¨é¡çº$1çç®åä¿®è¨ã", + "apierror-missingtitle-createonly": "éºå¤±æ¨é¡ä¸è½ä»¥ create ä¾ä¿è·ã", "apierror-missingtitle": "æ¨ææå®çé é¢ä¸åå¨ã", "apierror-missingtitle-byname": "é é¢$1ä¸åå¨ã", "apierror-moduledisabled": "æ¨¡çµ $1 å·²åç¨ã", + "apierror-multival-only-one-of": "åæ¸ $1 ååè¨±$2{{PLURAL:$3||å¶ä¸}}ã", "apierror-multpages": "$1 åè½ä»¥å®ä¸é é¢ä½¿ç¨ã", "apierror-mustbeloggedin-changeauth": "å¿é ç»å¥ï¼æè½è®æ´èº«åæ ¸å°è³åã", "apierror-mustbeloggedin-generic": "æ¨å¿é ç»å¥ã", @@ -1331,8 +1522,11 @@ "apierror-mustbeloggedin-uploadstash": "ä¸å³å²èåå°å·²ç»å¥ä½¿ç¨èå¯ç¨ã", "apierror-mustbeloggedin": "æ¨å¿é ç»å¥æè½$1ã", "apierror-mustbeposted": "$1 æ¨¡çµéè¦ POST è«æ±ã", + "apierror-mustpostparams": "å¨æ¥è©¢åä¸²è£¡æ¾åºä»¥ä¸{{PLURAL:$2|åæ¸|åæ¸}}ï¼èéæå¿é å¨ POST æ£æè£¡ï¼$1ã", + "apierror-noapiwrite": "éé API ä¾ç·¨è¼¯æ¤ wiki å·²è¢«åç¨ãè«ç¢ºèª $wgEnableWriteAPI=true; è²ææåå«å¨ wiki ç LocalSettings.php æªæ¡è£¡ã", "apierror-nochanges": "æ²æè«æ±çæ´æ¹ã", "apierror-nodeleteablefile": "æ²æéæ¨£æªæ¡çèçæ¬ã", + "apierror-no-direct-editing": "ç±$2æä½¿ç¨çå§å®¹æ¨¡çµ$1ä¸æ¯æ´éé API ä¾ç´æ¥ç·¨è¼¯ã", "apierror-noedit-anon": "å¿åä½¿ç¨èä¸å¯ç·¨è¼¯é é¢ã", "apierror-noedit": "æ¨æ²ææ¬éä¾ç·¨è¼¯é é¢ã", "apierror-noimageredirect-anon": "å¿åä½¿ç¨èä¸è½å»ºç«åçéæ°å°åã", @@ -1344,14 +1538,18 @@ "apierror-nosuchsection": "æ²æ ID çº $1 çæ®µè½ã", "apierror-nosuchsection-what": "å¨$2è£¡æ²ææ®µè½$1ã", "apierror-nosuchuserid": "æ²æ ID çº $1 çä½¿ç¨èã", + "apierror-notarget": "æ¨æ²ææ¿æ¤æä½æå®ææç®æ¨ã", "apierror-notpatrollable": "å å§å®¹éèï¼ä¿®è¨ r$1 ç¡æ³å·¡æ¥ã", "apierror-nouploadmodule": "æªè¨å®ä¸å³æ¨¡çµã", + "apierror-offline": "åºæ¼ç¶²è·¯é£æ¥åé¡èç¡æ³é²è¡ãè«ç¢ºèªæ¨çç¶²éç¶²è·¯é£çµææ£å¸¸éä½ï¼ä¸¦åè©¦ä¸æ¬¡ã", "apierror-opensearch-json-warnings": "è¦åä¸è½ä»¥ OpenSearch JSON æ ¼å¼è¡¨ç¤ºã", "apierror-pagecannotexist": "å½åç©ºéä¸åè¨±å¯¦éé é¢ã", + "apierror-pagedeleted": "èªå¾æ¨åå¾æéæ³è¨å¾ï¼è©²é é¢å·²è¢«åªé¤ã", "apierror-pagelang-disabled": "æ¤ wiki ä¸åè¨±æ´æ¹é é¢çèªè¨ã", "apierror-paramempty": "åæ¸ $1 ä¸è½çºç©ºã", "apierror-parsetree-notwikitext": "prop=parsetree åæ¯æ´ç¨æ¼ wiki æåå§å®¹ã", "apierror-parsetree-notwikitext-title": "prop=parsetree åæ¯æ´ç¨æ¼ wiki æåå§å®¹ã$1ä½¿ç¨å§å®¹æ¨¡çµ $2ã", + "apierror-pastexpiry": "æéæéã$1ãå·²éã", "apierror-permissiondenied": "æ¨æ²ææ¬é$1ã", "apierror-permissiondenied-generic": "æ¬éä¸è¶³ã", "apierror-permissiondenied-patrolflag": "æ¨éè¦ patrol æ patrolmarks æ¬éä¾è«æ±å·¡æ¥æ¨è¨ã", @@ -1363,28 +1561,35 @@ "apierror-readapidenied": "æ¨éè¦æé±è®æ¬éä¾ä½¿ç¨æ¤æ¨¡çµã", "apierror-readonly": "Wiki ç®åçºå¯è®æ¨¡å¼ã", "apierror-reauthenticate": "æ¼æ¬å·¥ä½éæ®µéæªæ ¸å°èº«åï¼è«éæ°æ ¸å°ã", + "apierror-redirect-appendonly": "æ¨åè©¦ä½¿ç¨éæ°å°åè·é¨æ¨¡å¼ä¾ç·¨è¼¯ï¼éå¿é è section=newãprependtextï¼æ appendtext ä¾çµåä½¿ç¨ã", "apierror-revdel-mutuallyexclusive": "åä¸æ¬ä½ä¸å¯åæç¨å¨ hide è showã", "apierror-revdel-needtarget": "æ¤ RevDel é¡åéè¦ç®æ¨æ¨é¡ã", "apierror-revdel-paramneeded": "è³å°éè¦ hide è/æ show å¶ä¸çå¼ã", "apierror-revisions-badid": "æ¥ç¡åæ¸ $1 çä¿®è¨ã", + "apierror-revisions-norevids": "revids åæ¸ä¸è½èæ¸å®é¸é ï¼$1limitã$1startidã$1endidã$1dir=newerã$1userã$1excludeuserã$1startãå $1endï¼ä¸èµ·ä½¿ç¨ã", "apierror-revwrongpage": "r$1 ä¸æ¯$2çä¿®è¨ã", "apierror-searchdisabled": "$1æå°å·²åç¨ã", "apierror-sectionreplacefailed": "ç¡æ³åä½µæ´æ°çç« ç¯ã", "apierror-sectionsnotsupported": "å§å®¹æ¨¡çµ $1 ä¸æ¯æ´æ®µè½ã", "apierror-sectionsnotsupported-what": "$1 ä¸æ¯æ´æ®µè½ã", "apierror-show": "ä¸æ£ç¢ºçåæ¸ - ä¸å¯æä¾äºæ¥å¼ã", + "apierror-siteinfo-includealldenied": "é¤é $wgShowHostnames è¨çºçï¼å¦åç¡æ³æª¢è¦ææä¼ºæå¨è³è¨ã", "apierror-sizediffdisabled": "å¤§å°å·®ç°åè½å¨ Miser æ¨¡å¼è£¡å·²åç¨ã", "apierror-spamdetected": "æ¨çç·¨è¼¯è¢«æçµï¼å çºæåå«é¨ä»½åå¾è¨æ¯å§å®¹ï¼$1ã", "apierror-specialpage-cantexecute": "æ¨æ²ææ¬éä¾æ¥çæ¤ç¹æ®é é¢ççµæã", "apierror-stashedfilenotfound": "å¨å²èè£¡æ¾ä¸å°æªæ¡ï¼$1ã", "apierror-stashedit-missingtext": "çµ¦äºçéæ¹è£¡æ¥ç¡å²èæåã", + "apierror-stashfailed-complete": "å¤§éä¸å³å·²å®æï¼è«æª¢æ¥çæä¾ç²åè©³æã", "apierror-stashfilestorage": "å¨å²èè£¡ä¸è½å²åä¸å³ï¼$1ã", "apierror-stashinvalidfile": "ç¡æçå²èæªæ¡ã", "apierror-stashnosuchfilekey": "æ²æéæ¨£çæªæ¡éµï¼$1ã", + "apierror-stashpathinvalid": "ä¸æ£ç¢ºæ ¼å¼ææ¯å¶å®ç¡æçæªæ¡éµï¼$1ã", "apierror-stashwrongowner": "é¯èª¤ææèï¼$1", "apierror-stashzerolength": "æªæ¡é·åº¦çºé¶ï¼ä¸ç¡æ³å²åæ¼å²èï¼$1ã", "apierror-systemblocked": "æ¨å·²è¢« MediaWiki çµ¦èªåå°éã", + "apierror-templateexpansion-notwikitext": "æ¨¡æ¿æ´å±åæ¯æ´ç¨æ¼ wiki æåå§å®¹ã$1ä½¿ç¨å§å®¹æ¨¡çµ $2ã", "apierror-timeout": "ä¼ºæå¨æªæå¨é è¨çæéå§åæã", + "apierror-toofewexpiries": "æä¾äº $1 åé¾æ{{PLURAL:$1|æéæ³è¨|æéæ³è¨}}ï¼æéè¦ç{{PLURAL:$2|æ¯|æ¯}} $2 åã", "apierror-toomanyvalues": "æ¿åæ¸ $1 æä¾å¤ªå¤çå¼ãéå¶çº $2ã", "apierror-unknownaction": "æå®çæä½ $1 ç¡æ³èå¥åºã", "apierror-unknownerror-editpage": "ä¸æç·¨è¼¯é é¢é¯èª¤ï¼$1ã", @@ -1402,9 +1607,16 @@ "apierror-writeapidenied": "æ¨ä¸è¢«åè¨±éé API ä¾ç·¨è¼¯æ¤ wikiã", "apiwarn-alldeletedrevisions-performance": "çºäºå¨ç¢çæ¨é¡æè½ææ´å¥½æè½ï¼è«è¨å® $1dir=newerã", "apiwarn-badurlparam": "ç¡æ³è§£æ$2ç $1urlparamãéåè½ç¨å¨å¯¬åº¦èé«åº¦ã", + "apiwarn-checktoken-percentencoding": "å¨ URL è£¡é²è¡é©ç¶ç¾åæ¯ç·¨ç¢¼çæ¬æä¸ï¼æª¢æ¥åæ¯ã+ãçç¬¦èã", "apiwarn-compare-nocontentmodel": "æ²æå¯ç¢ºå®çå§å®¹æ¨¡çµï¼åå®çº $1ã", + "apiwarn-deprecation-deletedrevs": "list=deletedrevs å·²æ£ç¨ãè«æ¹ç¨ prop=deletedrevisions æ list=alldeletedrevisionsã", "apiwarn-deprecation-httpsexpected": "ç¶æçº HTTPS æï¼HTTP è¦è¢«ä½¿ç¨ã", + "apiwarn-deprecation-login-botpw": "éé action=login çä¸»å¸³èç»å¥å·²æ£ç¨ï¼ä¸¦å¯è½æå¨ç¡è¦åçææ³ä¸åæ¢éä½ãè¦ç¹¼çºä»¥ action=clientlogin ç»å¥ï¼è«åé± [[Special:BotPasswords]]ï¼è¥è¦ç¹¼çºå®å¨ä½¿ç¨ä¸»å¸³èç»å¥ï¼åè«åé± action=clientloginã", + "apiwarn-deprecation-login-nobotpw": "éé action=login çä¸»å¸³èç»å¥å·²æ£ç¨ï¼ä¸¦å¯è½æå¨ç¡è¦åçææ³ä¸åæ¢éä½ãè¥è¦å®å¨ç»å¥ï¼è«åé± action=clientloginã", + "apiwarn-deprecation-login-token": "éé action=login ä¾åå¾æ¬æå·²æ£ç¨ãè«æ¹ç¨ action=query&meta=tokens&type=loginã", + "apiwarn-deprecation-missingparam": "å çºæªæå® $1ï¼è¼¸åºå§å®¹ä½¿ç¨å°éå»èæçæ ¼å¼ãè©²æ ¼å¼å·²æ£ç¨ï¼ä¸¦ä¸å¾å¾é½åªæä½¿ç¨æ°æ ¼å¼ã", "apiwarn-deprecation-parameter": "åæ¸ $1 å·²æ£ç¨ã", + "apiwarn-deprecation-parse-headitems": "prop=headitems èª MediaWiki ç 1.28 çæ¬å¾å·²è¢«æ£ç¨ãç¶å»ºç«æ° HTML æä»¶æè«ä½¿ç¨ prop=headhtmlï¼ææ¯ç¶æ´æ°æä»¶å®¢æ¶ç«¯æè«ä½¿ç¨ prop=modules|jsconfigvarsã", "apiwarn-deprecation-purge-get": "éé GET æ¹å¼ä½¿ç¨ç action=purge å·²æ£ç¨ï¼è«ä»¥ POST æ¿ä»£ã", "apiwarn-deprecation-withreplacement": "$1 å·²æ£ç¨ï¼è«æ¹ç¨ $2ã", "apiwarn-difftohidden": "ç¡æ³å° r$1 æ¯è¼å·®ç°ï¼å§å®¹è¢«é±èµã", @@ -1415,17 +1627,27 @@ "apiwarn-invalidxmlstylesheetext": "æ¨£å¼è¡¨æè¦æ .xsl å¯æªåã", "apiwarn-invalidxmlstylesheet": "æå®äºç¡ææä¸åå¨çæ¨£å¼è¡¨ã", "apiwarn-invalidxmlstylesheetns": "æ¨£å¼è¡¨æå¨ {{ns:MediaWiki}} å½åç©ºéã", + "apiwarn-moduleswithoutvars": "å±¬æ§ modules å·²è¢«è¨å®ï¼ä½ä¸æ¯ jsconfigvars æ encodedjsconfigvarsãéè¦è¨ç½®è®æ¸ä¾è®æ¨¡çµä½¿ç¨åå®ã", "apiwarn-notfile": "ã$1ãä¸æ¯ä¸åæªæ¡ã", "apiwarn-nothumb-noimagehandler": "ç¡æ³å»ºç«ç¸®åï¼å çº$1æ²æç¸éçåçèçå¨ã", "apiwarn-parse-nocontentmodel": "æªæä¾ title æ contentmodelï¼ææ¯ $1ã", + "apiwarn-parse-revidwithouttext": "revid å¨ä¸å¸¶æ text çææ³ä¸ä½¿ç¨ï¼ä¸è«æ±äºå·²è§£æé é¢å±¬æ§ãè«åæ¨æ¯æè¦ä½¿ç¨ oldid èä¸æ¯ revid åï¼", + "apiwarn-parse-titlewithouttext": "title å¨ä¸å¸¶æ text çææ³ä¸ä½¿ç¨ï¼ä¸è«æ±äºå·²è§£æé é¢å±¬æ§ãè«åæ¨æ¯æè¦ä½¿ç¨ page èä¸æ¯ title åï¼", + "apiwarn-redirectsandrevids": "éæ°å°åèçä¸è½èåæ¸ revids ä¸åä½¿ç¨ãä»»ä½ revids ææåçéæ°å°åé½å°æªè¢«è§£æ±ºã", "apiwarn-tokennotallowed": "ã$1ãæä½ä¸åè¨±ç®åçä½¿ç¨èã", + "apiwarn-tokens-origin": "ç¶æªå¥ç¨ç¸åä¾æºæ¹éï¼æ¬æå¯è½ç¡æ³åå¾ã", + "apiwarn-truncatedresult": "çµææè¢«æªçï¼å¦åå°æå¤§æ¼ $1 ä½åçµéå¶ã", "apiwarn-unrecognizedvalues": "åæ¸ $1 æç¡æ³èå¥ç{{PLURAL:$3|å¼|å¼}}ï¼$2ã", "apiwarn-unsupportedarray": "åæ¸ $1 ä½¿ç¨äºä¸è¢«æ¯æ´ç PHP é£åèªæ³ã", + "apiwarn-validationfailed-badchars": "å¨éµè£¡çååç¡æï¼ååè¨± a-zãA-Zã0-9ã_ãå - are allowedï¼ã", "apiwarn-validationfailed-badpref": "ä¸æ¯ææçåå¥½è¨å®ã", "apiwarn-validationfailed-cannotset": "ä¸è½ééæ¤æ¨¡çµè¨å®ã", + "apiwarn-validationfailed-keytoolong": "éµå¤ªé·ï¼ä¸åè¨±è¶é $1 ä½åçµï¼ã", "apiwarn-validationfailed": "$1é©èé¯èª¤ï¼$2", "apiwarn-wgDebugAPI": "å®å¨è¦åï¼$wgDebugAPI å·²åç¨ã", "api-feed-error-title": "é¯èª¤ï¼$1ï¼", + "api-usage-docref": "æ¥ç $1 ä¾äºè§£ API çä½¿ç¨ã", + "api-exception-trace": "$1ä½å¨$2çç¬¬$3è¡\n$4", "api-credits-header": "è£½ä½ç¾¤", "api-credits": "API éç¼äººå¡ï¼\n* Roan Kattouw (é¦å¸éç¼è Sep 2007â2009)\n* Victor Vasiliev\n* Bryan Tong Minh\n* Sam Reed\n* Yuri Astrakhan (åµç«èï¼é¦å¸éç¼è Sep 2006âSep 2007)\n* Brad Jorsch (é¦å¸éç¼è 2013âpresent)\n\nè«å³éæ¨çè©è«ãå»ºè°ä»¥ååé¡è³ mediawiki-api@lists.wikimedia.org\næèåå ±åé¡è³ https://phabricator.wikimedia.org/ã" } diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index 32592ac770..0c9f615e5f 100644 --- a/includes/auth/AuthManager.php +++ b/includes/auth/AuthManager.php @@ -336,7 +336,7 @@ class AuthManager implements LoggerAwareInterface { $this->setSessionDataForUser( $user ); $this->callMethodOnProviders( 7, 'postAuthentication', [ $user, $ret ] ); $session->remove( 'AuthManager::authnState' ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName() ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName(), [] ] ); return $ret; } @@ -352,7 +352,7 @@ class AuthManager implements LoggerAwareInterface { $this->callMethodOnProviders( 7, 'postAuthentication', [ User::newFromName( $guessUserName ) ?: null, $ret ] ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, null, $guessUserName ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, null, $guessUserName, [] ] ); return $ret; } } @@ -468,7 +468,7 @@ class AuthManager implements LoggerAwareInterface { [ User::newFromName( $guessUserName ) ?: null, $res ] ); $session->remove( 'AuthManager::authnState' ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, null, $guessUserName ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, null, $guessUserName, [] ] ); return $res; case AuthenticationResponse::ABSTAIN; // Continue loop @@ -534,7 +534,7 @@ class AuthManager implements LoggerAwareInterface { [ User::newFromName( $guessUserName ) ?: null, $res ] ); $session->remove( 'AuthManager::authnState' ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, null, $guessUserName ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, null, $guessUserName, [] ] ); return $res; case AuthenticationResponse::REDIRECT; case AuthenticationResponse::UI; @@ -625,7 +625,7 @@ class AuthManager implements LoggerAwareInterface { ); $this->callMethodOnProviders( 7, 'postAuthentication', [ $user, $ret ] ); $session->remove( 'AuthManager::authnState' ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName() ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName(), [] ] ); return $ret; } } @@ -658,7 +658,7 @@ class AuthManager implements LoggerAwareInterface { $this->logger->debug( "Login failed in secondary authentication by $id" ); $this->callMethodOnProviders( 7, 'postAuthentication', [ $user, $res ] ); $session->remove( 'AuthManager::authnState' ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, $user, $user->getName() ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, $user, $user->getName(), [] ] ); return $res; case AuthenticationResponse::REDIRECT; case AuthenticationResponse::UI; @@ -694,7 +694,7 @@ class AuthManager implements LoggerAwareInterface { $this->callMethodOnProviders( 7, 'postAuthentication', [ $user, $ret ] ); $session->remove( 'AuthManager::authnState' ); $this->removeAuthenticationSessionData( null ); - \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName() ] ); + \Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $ret, $user, $user->getName(), [] ] ); return $ret; } catch ( \Exception $ex ) { $session->remove( 'AuthManager::authnState' ); diff --git a/includes/block/BlockRestriction.php b/includes/block/BlockRestriction.php index 43d70e6b1c..5bf286d013 100644 --- a/includes/block/BlockRestriction.php +++ b/includes/block/BlockRestriction.php @@ -34,7 +34,6 @@ class BlockRestriction { * * @param int|array $blockId * @param IDatabase|null $db - * @param array $options Options to pass to the select query. * @return Restriction[] */ public static function loadByBlockId( $blockId, IDatabase $db = null ) { diff --git a/includes/block/Restriction/Restriction.php b/includes/block/Restriction/Restriction.php index f1cc1b0a22..5fefecc39f 100644 --- a/includes/block/Restriction/Restriction.php +++ b/includes/block/Restriction/Restriction.php @@ -63,6 +63,7 @@ interface Restriction { /** * Creates a new Restriction from a database row. * + * @param \stdClass $row * @return self */ public static function newFromRow( \stdClass $row ); diff --git a/includes/cache/CacheHelper.php b/includes/cache/CacheHelper.php index 6c6b184735..93685e35af 100644 --- a/includes/cache/CacheHelper.php +++ b/includes/cache/CacheHelper.php @@ -270,8 +270,8 @@ class CacheHelper implements ICacheHelper { $value = null; if ( is_null( $key ) ) { - $itemKey = array_keys( array_slice( $this->cachedChunks, 0, 1 ) ); - $itemKey = array_shift( $itemKey ); + reset( $this->cachedChunks ); + $itemKey = key( $this->cachedChunks ); if ( !is_int( $itemKey ) ) { wfWarn( "Attempted to get item with non-numeric key while " . diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php index 9e182c796c..b9944a82f0 100644 --- a/includes/cache/LinkCache.php +++ b/includes/cache/LinkCache.php @@ -197,6 +197,7 @@ class LinkCache { * @return int Page ID or zero */ public function addLink( $title ) { + wfDeprecated( __METHOD__, '1.27' ); $nt = Title::newFromDBkey( $title ); if ( !$nt ) { return 0; diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index 5ada42fb77..b669fcd492 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -270,6 +270,17 @@ class MessageCache { $this->overridable = array_flip( Language::getMessageKeysFor( $code ) ); + // T208897 array_flip can fail and return null + if ( is_null( $this->overridable ) ) { + LoggerFactory::getInstance( 'MessageCache' )->error( + __METHOD__ . ': $this->overridable is null', + [ + 'message_keys' => Language::getMessageKeysFor( $code ), + 'code' => $code + ] + ); + } + # 8 lines of code just to say (once) that message cache is disabled if ( $this->mDisable ) { static $shownDisabled = false; diff --git a/includes/cache/localisation/LCStoreStaticArray.php b/includes/cache/localisation/LCStoreStaticArray.php index c5a2512f50..75c8465abf 100644 --- a/includes/cache/localisation/LCStoreStaticArray.php +++ b/includes/cache/localisation/LCStoreStaticArray.php @@ -68,21 +68,21 @@ class LCStoreStaticArray implements LCStore { * Encodes a value into an array format * * @param mixed $value - * @return array + * @return array|mixed * @throws RuntimeException */ public static function encode( $value ) { - if ( is_scalar( $value ) || $value === null ) { - // [V]alue - return [ 'v', $value ]; + if ( is_array( $value ) ) { + // [a]rray + return [ 'a', array_map( 'LCStoreStaticArray::encode', $value ) ]; } if ( is_object( $value ) ) { - // [S]erialized + // [s]erialized return [ 's', serialize( $value ) ]; } - if ( is_array( $value ) ) { - // [A]rray - return [ 'a', array_map( 'LCStoreStaticArray::encode', $value ) ]; + if ( is_scalar( $value ) || $value === null ) { + // Scalar value, written directly without array + return $value; } throw new RuntimeException( 'Cannot encode ' . var_export( $value, true ) ); @@ -91,21 +91,28 @@ class LCStoreStaticArray implements LCStore { /** * Decode something that was encoded with encode * - * @param array $encoded + * @param mixed $encoded * @return array|mixed * @throws RuntimeException */ - public static function decode( array $encoded ) { + public static function decode( $encoded ) { + if ( !is_array( $encoded ) ) { + // Scalar values are written directly without array + return $encoded; + } + $type = $encoded[0]; $data = $encoded[1]; switch ( $type ) { - case 'v': - return $data; - case 's': - return unserialize( $data ); case 'a': return array_map( 'LCStoreStaticArray::decode', $data ); + case 's': + return unserialize( $data ); + case 'v': + // Support: MediaWiki 1.32 and earlier + // Backward compatibility with older file format + return $data; default: throw new RuntimeException( 'Unable to decode ' . var_export( $encoded, true ) ); diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php index fea31b46d6..a39568ba91 100644 --- a/includes/changes/ChangesList.php +++ b/includes/changes/ChangesList.php @@ -351,12 +351,13 @@ class ChangesList extends ContextSource { } else { $formattedSizeClass = 'mw-plusminus-neg'; } + $formattedSizeClass .= ' mw-diff-bytes'; $formattedTotalSize = $context->msg( 'rc-change-size-new' )->numParams( $new )->text(); return Html::element( $tag, [ 'dir' => 'ltr', 'class' => $formattedSizeClass, 'title' => $formattedTotalSize ], - $context->msg( 'parentheses', $formattedSize )->plain() ) . $lang->getDirMark(); + $formattedSize ) . $lang->getDirMark(); } /** @@ -453,11 +454,9 @@ class ChangesList extends ContextSource { ); } if ( $rc->mAttribs['rc_type'] == RC_CATEGORIZE ) { - $diffhist = $diffLink . $this->message['pipe-separator'] . $this->message['hist']; + $histLink = $this->message['hist']; } else { - $diffhist = $diffLink . $this->message['pipe-separator']; - # History link - $diffhist .= $this->linkRenderer->makeKnownLink( + $histLink = $this->linkRenderer->makeKnownLink( $rc->getTitle(), new HtmlArmor( $this->message['hist'] ), [ 'class' => 'mw-changeslist-history' ], @@ -468,9 +467,11 @@ class ChangesList extends ContextSource { ); } - // @todo FIXME: Hard coded ". .". Is there a message for this? Should there be? - $s .= $this->msg( 'parentheses' )->rawParams( $diffhist )->escaped() . - ' . . '; + $s .= Html::rawElement( 'div', [ 'class' => 'mw-changeslist-links' ], + Html::rawElement( 'span', [], $diffLink ) . + Html::rawElement( 'span', [], $histLink ) + ) . + ' '; } /** @@ -534,7 +535,7 @@ class ChangesList extends ContextSource { htmlspecialchars( $this->getLanguage()->userTime( $rc->mAttribs['rc_timestamp'], $this->getUser() - ) ) . ' . . '; + ) ) . ' '; } /** diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php index a26f5b64af..c15701ba66 100644 --- a/includes/changes/OldChangesList.php +++ b/includes/changes/OldChangesList.php @@ -121,7 +121,7 @@ class OldChangesList extends ChangesList { if ( $this->getConfig()->get( 'RCShowChangedSize' ) ) { $cd = $this->formatCharacterDifference( $rc ); if ( $cd !== '' ) { - $html .= $cd . ' . . '; + $html .= $cd . ' '; } } diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index b28983f9ef..32cfd13f58 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -262,8 +262,6 @@ class ChangeTags { &$rev_id = null, &$log_id = null, $params = null, RecentChange $rc = null, User $user = null ) { - global $wgChangeTagsSchemaMigrationStage; - $tagsToAdd = array_filter( (array)$tagsToAdd ); // Make sure we're submitting all tags... $tagsToRemove = array_filter( (array)$tagsToRemove ); @@ -334,12 +332,19 @@ class ChangeTags { ); } - // update the tag_summary row - $prevTags = []; - if ( !self::updateTagSummaryRow( $tagsToAdd, $tagsToRemove, $rc_id, $rev_id, - $log_id, $prevTags ) - ) { - // nothing to do + $prevTags = self::getPrevTags( $rc_id, $log_id, $rev_id ); + + // add tags + $tagsToAdd = array_values( array_diff( $tagsToAdd, $prevTags ) ); + $newTags = array_unique( array_merge( $prevTags, $tagsToAdd ) ); + + // remove tags + $tagsToRemove = array_values( array_intersect( $tagsToRemove, $newTags ) ); + $newTags = array_values( array_diff( $newTags, $tagsToRemove ) ); + + sort( $prevTags ); + sort( $newTags ); + if ( $prevTags == $newTags ) { return [ [], [], $prevTags ]; } @@ -347,35 +352,28 @@ class ChangeTags { $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); if ( count( $tagsToAdd ) ) { $changeTagMapping = []; - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) { - foreach ( $tagsToAdd as $tag ) { - $changeTagMapping[$tag] = $changeTagDefStore->acquireId( $tag ); - } - // T207881: update the counts at the end of the transaction - $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tagsToAdd ) { - $dbw->update( - 'change_tag_def', - [ 'ctd_count = ctd_count + 1' ], - [ 'ctd_name' => $tagsToAdd ], - __METHOD__ - ); - } ); + foreach ( $tagsToAdd as $tag ) { + $changeTagMapping[$tag] = $changeTagDefStore->acquireId( $tag ); } + $fname = __METHOD__; + // T207881: update the counts at the end of the transaction + $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tagsToAdd, $fname ) { + $dbw->update( + 'change_tag_def', + [ 'ctd_count = ctd_count + 1' ], + [ 'ctd_name' => $tagsToAdd ], + $fname + ); + } ); $tagsRows = []; foreach ( $tagsToAdd as $tag ) { - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tagName = null; - } else { - $tagName = $tag; - } // Filter so we don't insert NULLs as zero accidentally. // Keep in mind that $rc_id === null means "I don't care/know about the // rc_id, just delete $tag on this revision/log entry". It doesn't // mean "only delete tags on this revision/log WHERE rc_id IS NULL". $tagsRows[] = array_filter( [ - 'ct_tag' => $tagName, 'ct_rc_id' => $rc_id, 'ct_log_id' => $log_id, 'ct_rev_id' => $rev_id, @@ -391,38 +389,31 @@ class ChangeTags { // delete from change_tag if ( count( $tagsToRemove ) ) { + $fname = __METHOD__; foreach ( $tagsToRemove as $tag ) { - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tagName = null; - $tagId = $changeTagDefStore->getId( $tag ); - } else { - $tagName = $tag; - $tagId = null; - } $conds = array_filter( [ - 'ct_tag' => $tagName, 'ct_rc_id' => $rc_id, 'ct_log_id' => $log_id, 'ct_rev_id' => $rev_id, - 'ct_tag_id' => $tagId, + 'ct_tag_id' => $changeTagDefStore->getId( $tag ), ] ); $dbw->delete( 'change_tag', $conds, __METHOD__ ); - if ( $dbw->affectedRows() && $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) { + if ( $dbw->affectedRows() ) { // T207881: update the counts at the end of the transaction - $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tag ) { + $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tag, $fname ) { $dbw->update( 'change_tag_def', [ 'ctd_count = ctd_count - 1' ], [ 'ctd_name' => $tag ], - __METHOD__ + $fname ); $dbw->delete( 'change_tag_def', [ 'ctd_name' => $tag, 'ctd_count' => 0, 'ctd_user_defined' => 0 ], - __METHOD__ + $fname ); } ); } @@ -437,75 +428,24 @@ class ChangeTags { return [ $tagsToAdd, $tagsToRemove, $prevTags ]; } - /** - * Adds or removes a given set of tags to/from the relevant row of the - * tag_summary table. Modifies the tagsToAdd and tagsToRemove arrays to - * reflect the tags that were actually added and/or removed. - * - * @param array &$tagsToAdd - * @param array &$tagsToRemove If a tag is present in both $tagsToAdd and - * $tagsToRemove, it will be removed - * @param int|null $rc_id Null if not known or not applicable - * @param int|null $rev_id Null if not known or not applicable - * @param int|null $log_id Null if not known or not applicable - * @param array &$prevTags Optionally outputs a list of the tags that were - * in the tag_summary row to begin with - * @return bool True if any modifications were made, otherwise false - * @since 1.25 - */ - protected static function updateTagSummaryRow( &$tagsToAdd, &$tagsToRemove, - $rc_id, $rev_id, $log_id, &$prevTags = [] - ) { - $dbw = wfGetDB( DB_MASTER ); - - $tsConds = array_filter( [ - 'ts_rc_id' => $rc_id, - 'ts_rev_id' => $rev_id, - 'ts_log_id' => $log_id - ] ); - - // Can't both add and remove a tag at the same time... - $tagsToAdd = array_diff( $tagsToAdd, $tagsToRemove ); - - // Update the summary row. - // $prevTags can be out of date on replica DBs, especially when addTags is called consecutively, - // causing loss of tags added recently in tag_summary table. - $prevTags = $dbw->selectField( 'tag_summary', 'ts_tags', $tsConds, __METHOD__ ); - $prevTags = $prevTags ?: ''; - $prevTags = array_filter( explode( ',', $prevTags ) ); - - // add tags - $tagsToAdd = array_values( array_diff( $tagsToAdd, $prevTags ) ); - $newTags = array_unique( array_merge( $prevTags, $tagsToAdd ) ); - - // remove tags - $tagsToRemove = array_values( array_intersect( $tagsToRemove, $newTags ) ); - $newTags = array_values( array_diff( $newTags, $tagsToRemove ) ); - - sort( $prevTags ); - sort( $newTags ); - if ( $prevTags == $newTags ) { - return false; - } + private static function getPrevTags( $rc_id = null, $rev_id = null, $log_id = null ) { + $conds = array_filter( + [ + 'ct_rc_id' => $rc_id, + 'ct_log_id' => $log_id, + 'ct_rev_id' => $rev_id, + ] + ); - if ( !$newTags ) { - // No tags left, so delete the row altogether - $dbw->delete( 'tag_summary', $tsConds, __METHOD__ ); - } else { - // Specify the non-DEFAULT value columns in the INSERT/REPLACE clause - $row = array_filter( [ 'ts_tags' => implode( ',', $newTags ) ] + $tsConds ); - // Check the unique keys for conflicts, ignoring any NULL *_id values - $uniqueKeys = []; - foreach ( [ 'ts_rev_id', 'ts_rc_id', 'ts_log_id' ] as $uniqueColumn ) { - if ( isset( $row[$uniqueColumn] ) ) { - $uniqueKeys[] = [ $uniqueColumn ]; - } - } + $dbw = wfGetDB( DB_MASTER ); + $tagIds = $dbw->selectFieldValues( 'change_tag', 'ct_tag_id', $conds, __METHOD__ ); - $dbw->replace( 'tag_summary', $uniqueKeys, $row, __METHOD__ ); + $tags = []; + foreach ( $tagIds as $tagId ) { + $tags[] = MediaWikiServices::getInstance()->getChangeTagDefStore()->getName( (int)$tagId ); } - return true; + return $tags; } /** @@ -788,7 +728,7 @@ class ChangeTags { public static function modifyDisplayQuery( &$tables, &$fields, &$conds, &$join_conds, &$options, $filter_tag = '' ) { - global $wgUseTagFilter, $wgChangeTagsSchemaMigrationStage; + global $wgUseTagFilter; // Normalize to arrays $tables = (array)$tables; @@ -796,6 +736,8 @@ class ChangeTags { $conds = (array)$conds; $options = (array)$options; + $fields['ts_tags'] = self::makeTagSummarySubquery( $tables ); + // Figure out which ID field to use if ( in_array( 'recentchanges', $tables ) ) { $join_cond = 'ct_rc_id=rc_id'; @@ -809,44 +751,26 @@ class ChangeTags { throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' ); } - $tagTables[] = 'change_tag'; - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tagTables[] = 'change_tag_def'; - $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ]; - $field = 'ctd_name'; - } else { - $field = 'ct_tag'; - $join_cond_ts_tags = []; - } - - $fields['ts_tags'] = wfGetDB( DB_REPLICA )->buildGroupConcatField( - ',', $tagTables, $field, $join_cond, $join_cond_ts_tags - ); - if ( $wgUseTagFilter && $filter_tag ) { // Somebody wants to filter on a tag. // Add an INNER JOIN on change_tag $tables[] = 'change_tag'; $join_conds['change_tag'] = [ 'INNER JOIN', $join_cond ]; - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $filterTagIds = []; - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); - foreach ( (array)$filter_tag as $filterTagName ) { - try { - $filterTagIds[] = $changeTagDefStore->getId( $filterTagName ); - } catch ( NameTableAccessException $exception ) { - // Return nothing. - $conds[] = '0'; - break; - }; - } + $filterTagIds = []; + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + foreach ( (array)$filter_tag as $filterTagName ) { + try { + $filterTagIds[] = $changeTagDefStore->getId( $filterTagName ); + } catch ( NameTableAccessException $exception ) { + // Return nothing. + $conds[] = '0'; + break; + }; + } - if ( $filterTagIds !== [] ) { - $conds['ct_tag_id'] = $filterTagIds; - } - } else { - $conds['ct_tag'] = $filter_tag; + if ( $filterTagIds !== [] ) { + $conds['ct_tag_id'] = $filterTagIds; } if ( @@ -858,6 +782,40 @@ class ChangeTags { } } + /** + * Make the tag summary subquery based on the given tables and return it. + * + * @param string|array $tables Table names, see Database::select + * + * @return string tag summary subqeury + * @throws MWException When unable to determine appropriate JOIN condition for tagging + */ + public static function makeTagSummarySubquery( $tables ) { + // Normalize to arrays + $tables = (array)$tables; + + // Figure out which ID field to use + if ( in_array( 'recentchanges', $tables ) ) { + $join_cond = 'ct_rc_id=rc_id'; + } elseif ( in_array( 'logging', $tables ) ) { + $join_cond = 'ct_log_id=log_id'; + } elseif ( in_array( 'revision', $tables ) ) { + $join_cond = 'ct_rev_id=rev_id'; + } elseif ( in_array( 'archive', $tables ) ) { + $join_cond = 'ct_rev_id=ar_rev_id'; + } else { + throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' ); + } + + $tagTables = [ 'change_tag', 'change_tag_def' ]; + $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ]; + $field = 'ctd_name'; + + return wfGetDB( DB_REPLICA )->buildGroupConcatField( + ',', $tagTables, $field, $join_cond, $join_cond_ts_tags + ); + } + /** * Build a text box to select a change tag * @@ -909,8 +867,7 @@ class ChangeTags { } /** - * Defines a tag in the valid_tag table and/or update ctd_user_defined field in change_tag_def, - * without checking that the tag name is valid. + * Set ctd_user_defined = 1 in change_tag_def without checking that the tag name is valid. * Extensions should NOT use this function; they can use the ListDefinedTags * hook instead. * @@ -918,38 +875,26 @@ class ChangeTags { * @since 1.25 */ public static function defineTag( $tag ) { - global $wgChangeTagsSchemaMigrationStage; - $dbw = wfGetDB( DB_MASTER ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) { - $tagDef = [ - 'ctd_name' => $tag, - 'ctd_user_defined' => 1, - 'ctd_count' => 0 - ]; - $dbw->upsert( - 'change_tag_def', - $tagDef, - [ 'ctd_name' ], - [ 'ctd_user_defined' => 1 ], - __METHOD__ - ); - } + $tagDef = [ + 'ctd_name' => $tag, + 'ctd_user_defined' => 1, + 'ctd_count' => 0 + ]; + $dbw->upsert( + 'change_tag_def', + $tagDef, + [ 'ctd_name' ], + [ 'ctd_user_defined' => 1 ], + __METHOD__ + ); - if ( $wgChangeTagsSchemaMigrationStage < MIGRATION_NEW ) { - $dbw->replace( - 'valid_tag', - [ 'vt_tag' ], - [ 'vt_tag' => $tag ], - __METHOD__ - ); - } // clear the memcache of defined tags self::purgeTagCacheAll(); } /** - * Removes a tag from the valid_tag table and/or update ctd_user_defined field in change_tag_def. + * Update ctd_user_defined = 0 field in change_tag_def. * The tag may remain in use by extensions, and may still show up as 'defined' * if an extension is setting it from the ListDefinedTags hook. * @@ -957,28 +902,20 @@ class ChangeTags { * @since 1.25 */ public static function undefineTag( $tag ) { - global $wgChangeTagsSchemaMigrationStage; - $dbw = wfGetDB( DB_MASTER ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) { - $dbw->update( - 'change_tag_def', - [ 'ctd_user_defined' => 0 ], - [ 'ctd_name' => $tag ], - __METHOD__ - ); - - $dbw->delete( - 'change_tag_def', - [ 'ctd_name' => $tag, 'ctd_count' => 0 ], - __METHOD__ - ); - } + $dbw->update( + 'change_tag_def', + [ 'ctd_user_defined' => 0 ], + [ 'ctd_name' => $tag ], + __METHOD__ + ); - if ( $wgChangeTagsSchemaMigrationStage < MIGRATION_NEW ) { - $dbw->delete( 'valid_tag', [ 'vt_tag' => $tag ], __METHOD__ ); - } + $dbw->delete( + 'change_tag_def', + [ 'ctd_name' => $tag, 'ctd_count' => 0 ], + __METHOD__ + ); // clear the memcache of defined tags self::purgeTagCacheAll(); @@ -1171,7 +1108,7 @@ class ChangeTags { return Status::newFatal( 'tags-create-no-name' ); } - // tags cannot contain commas (used as a delimiter in tag_summary table), + // tags cannot contain commas (used to be used as a delimiter in tag_summary table), // pipe (used as a delimiter between multiple tags in // SpecialRecentchanges and friends), or slashes (would break tag description messages in // MediaWiki namespace) @@ -1228,8 +1165,7 @@ class ChangeTags { } /** - * Creates a tag by adding a row to the `valid_tag` table. - * and/or add it to `change_tag_def` table. + * Creates a tag by adding it to `change_tag_def` table. * * Extensions should NOT use this function; they can use the ListDefinedTags * hook instead. @@ -1280,45 +1216,16 @@ class ChangeTags { * @since 1.25 */ public static function deleteTagEverywhere( $tag ) { - global $wgChangeTagsSchemaMigrationStage; $dbw = wfGetDB( DB_MASTER ); $dbw->startAtomic( __METHOD__ ); - // delete from valid_tag and/or set ctd_user_defined = 0 + // set ctd_user_defined = 0 self::undefineTag( $tag ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag ); - $conditions = [ 'ct_tag_id' => $tagId ]; - } else { - $conditions = [ 'ct_tag' => $tag ]; - } - - // find out which revisions use this tag, so we can delete from tag_summary - $result = $dbw->select( 'change_tag', - [ 'ct_rc_id', 'ct_log_id', 'ct_rev_id' ], - $conditions, - __METHOD__ ); - foreach ( $result as $row ) { - // remove the tag from the relevant row of tag_summary - $tagsToAdd = []; - $tagsToRemove = [ $tag ]; - self::updateTagSummaryRow( $tagsToAdd, $tagsToRemove, $row->ct_rc_id, - $row->ct_rev_id, $row->ct_log_id ); - } - // delete from change_tag - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag ); - $dbw->delete( 'change_tag', [ 'ct_tag_id' => $tagId ], __METHOD__ ); - } else { - $dbw->delete( 'change_tag', [ 'ct_tag' => $tag ], __METHOD__ ); - } - - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) { - $dbw->delete( 'change_tag_def', [ 'ctd_name' => $tag ], __METHOD__ ); - } - + $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag ); + $dbw->delete( 'change_tag', [ 'ct_tag_id' => $tagId ], __METHOD__ ); + $dbw->delete( 'change_tag_def', [ 'ctd_name' => $tag ], __METHOD__ ); $dbw->endAtomic( __METHOD__ ); // give extensions a chance @@ -1467,9 +1374,7 @@ class ChangeTags { } /** - * Lists tags explicitly defined in the `valid_tag` table of the database. - * Tags in table 'change_tag' which are not in table 'valid_tag' are not - * included. In case of new backend loads the data from `change_tag_def` table. + * Lists tags explicitly defined in the `change_tag_def` table of the database. * * Tries memcached first. * @@ -1484,16 +1389,16 @@ class ChangeTags { $cache->makeKey( 'valid-tags-db' ), WANObjectCache::TTL_MINUTE * 5, function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) { - global $wgChangeTagsSchemaMigrationStage; $dbr = wfGetDB( DB_REPLICA ); $setOpts += Database::getCacheSetOptions( $dbr ); - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { - $tags = self::listExplicitlyDefinedTagsNewBackend(); - } else { - $tags = $dbr->selectFieldValues( 'valid_tag', 'vt_tag', [], $fname ); - } + $tags = $dbr->selectFieldValues( + 'change_tag_def', + 'ctd_name', + [ 'ctd_user_defined' => 1 ], + $fname + ); return array_filter( array_unique( $tags ) ); }, @@ -1505,22 +1410,6 @@ class ChangeTags { ); } - /** - * Lists tags explicitly user defined tags. When ctd_user_defined is true. - * - * @return string[] Array of strings: tags - * @since 1.25 - */ - private static function listExplicitlyDefinedTagsNewBackend() { - $dbr = wfGetDB( DB_REPLICA ); - return $dbr->selectFieldValues( - 'change_tag_def', - 'ctd_name', - [ 'ctd_user_defined' => 1 ], - __METHOD__ - ); - } - /** * Lists tags defined by core or extensions using the ListDefinedTags hook. * Extensions need only define those tags they deem to be in active use. @@ -1566,6 +1455,8 @@ class ChangeTags { $cache->touchCheckKey( $cache->makeKey( 'valid-tags-db' ) ); $cache->touchCheckKey( $cache->makeKey( 'valid-tags-hook' ) ); + MediaWikiServices::getInstance()->getChangeTagDefStore()->reloadMap(); + self::purgeTagUsageCache(); } @@ -1583,59 +1474,9 @@ class ChangeTags { * Returns a map of any tags used on the wiki to number of edits * tagged with them, ordered descending by the hitcount. * This does not include tags defined somewhere that have never been applied. - * - * Keeps a short-term cache in memory, so calling this multiple times in the - * same request should be fine. - * * @return array Array of string => int */ public static function tagUsageStatistics() { - global $wgChangeTagsSchemaMigrationStage, $wgTagStatisticsNewTable; - if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH || - ( $wgTagStatisticsNewTable && $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) - ) { - return self::newTagUsageStatistics(); - } - - $fname = __METHOD__; - $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); - return $cache->getWithSetCallback( - $cache->makeKey( 'change-tag-statistics' ), - WANObjectCache::TTL_MINUTE * 5, - function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) { - $dbr = wfGetDB( DB_REPLICA, 'vslow' ); - - $setOpts += Database::getCacheSetOptions( $dbr ); - - $res = $dbr->select( - 'change_tag', - [ 'ct_tag', 'hitcount' => 'count(*)' ], - [], - $fname, - [ 'GROUP BY' => 'ct_tag', 'ORDER BY' => 'hitcount DESC' ] - ); - - $out = []; - foreach ( $res as $row ) { - $out[$row->ct_tag] = $row->hitcount; - } - - return $out; - }, - [ - 'checkKeys' => [ $cache->makeKey( 'change-tag-statistics' ) ], - 'lockTSE' => WANObjectCache::TTL_MINUTE * 5, - 'pcTTL' => WANObjectCache::TTL_PROC_LONG - ] - ); - } - - /** - * Same self::tagUsageStatistics() but uses change_tag_def. - * - * @return array Array of string => int - */ - private static function newTagUsageStatistics() { $dbr = wfGetDB( DB_REPLICA ); $res = $dbr->select( 'change_tag_def', diff --git a/includes/content/Content.php b/includes/content/Content.php index bb3fb107d7..1bb43f83b6 100644 --- a/includes/content/Content.php +++ b/includes/content/Content.php @@ -241,6 +241,8 @@ interface Content { * that it's also in a countable location (e.g. a current revision in the * main namespace). * + * @see SlotRoleHandler::supportsArticleCount + * * @since 1.21 * * @param bool|null $hasLinks If it is known whether this content contains @@ -352,6 +354,8 @@ interface Content { * Returns whether this Content represents a redirect. * Shorthand for getRedirectTarget() !== null. * + * @see SlotRoleHandler::supportsRedirects + * * @since 1.21 * * @return bool diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index fab043a2ba..5c18a330cb 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -174,62 +174,17 @@ abstract class ContentHandler { * Note: this is used by, and may thus not use, Title::getContentModel() * * @since 1.21 + * @deprecated since 1.33, use SlotRoleHandler::getDefaultModel() together with + * SlotRoleRegistry::getRoleHandler(). * * @param Title $title * * @return string Default model name for the page given by $title */ public static function getDefaultModelFor( Title $title ) { - // NOTE: this method must not rely on $title->getContentModel() directly or indirectly, - // because it is used to initialize the mContentModel member. - - $ns = $title->getNamespace(); - - $ext = false; - $m = null; - $model = MWNamespace::getNamespaceContentModel( $ns ); - - // Hook can determine default model - if ( !Hooks::run( 'ContentHandlerDefaultModelFor', [ $title, &$model ] ) ) { - if ( !is_null( $model ) ) { - return $model; - } - } - - // Could this page contain code based on the title? - $isCodePage = NS_MEDIAWIKI == $ns && preg_match( '!\.(css|js|json)$!u', $title->getText(), $m ); - if ( $isCodePage ) { - $ext = $m[1]; - } - - // Is this a user subpage containing code? - $isCodeSubpage = NS_USER == $ns - && !$isCodePage - && preg_match( "/\\/.*\\.(js|css|json)$/", $title->getText(), $m ); - if ( $isCodeSubpage ) { - $ext = $m[1]; - } - - // Is this wikitext, according to $wgNamespaceContentModels or the DefaultModelFor hook? - $isWikitext = is_null( $model ) || $model == CONTENT_MODEL_WIKITEXT; - $isWikitext = $isWikitext && !$isCodePage && !$isCodeSubpage; - - if ( !$isWikitext ) { - switch ( $ext ) { - case 'js': - return CONTENT_MODEL_JAVASCRIPT; - case 'css': - return CONTENT_MODEL_CSS; - case 'json': - return CONTENT_MODEL_JSON; - default: - return is_null( $model ) ? CONTENT_MODEL_TEXT : $model; - } - } - - // We established that it must be wikitext - - return CONTENT_MODEL_WIKITEXT; + $slotRoleregistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $mainSlotHandler = $slotRoleregistry->getRoleHandler( 'main' ); + return $mainSlotHandler->getDefaultModel( $title ); } /** @@ -777,7 +732,7 @@ abstract class ContentHandler { /** * Determines whether the content type handled by this ContentHandler - * can be used on the given page. + * can be used for the main slot of the given page. * * This default implementation always returns true. * Subclasses may override this to restrict the use of this content model to specific locations, @@ -787,6 +742,8 @@ abstract class ContentHandler { * @note this calls the ContentHandlerCanBeUsedOn hook which may be used to override which * content model can be used where. * + * @see SlotRoleHandler::isAllowedModel + * * @param Title $title The page's title. * * @return bool True if content of this kind can be used on the given page, false otherwise. diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index a7021b1e7b..517d807867 100644 --- a/includes/content/WikitextContent.php +++ b/includes/content/WikitextContent.php @@ -25,6 +25,7 @@ * @author Daniel Kinzler */ +use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; /** @@ -41,6 +42,11 @@ class WikitextContent extends TextContent { */ private $hadSignature = false; + /** + * @var array|null Stack trace of the previous parse + */ + private $previousParseStackTrace = null; + public function __construct( $text ) { parent::__construct( $text, CONTENT_MODEL_WIKITEXT ); } @@ -337,6 +343,28 @@ class WikitextContent extends TextContent { ) { global $wgParser; + $stackTrace = ( new RuntimeException() )->getTraceAsString(); + if ( $this->previousParseStackTrace ) { + // NOTE: there may be legitimate changes to re-parse the same WikiText content, + // e.g. if predicted revision ID for the REVISIONID magic word mismatched. + // But that should be rare. + $logger = LoggerFactory::getInstance( 'DuplicateParse' ); + $logger->debug( + __METHOD__ . ': Possibly redundant parse!', + [ + 'title' => $title->getPrefixedDBkey(), + 'rev' => $revId, + 'options-hash' => $options->optionsHash( + ParserOptions::allCacheVaryingOptions(), + $title + ), + 'trace' => $stackTrace, + 'previous-trace' => $this->previousParseStackTrace, + ] + ); + } + $this->previousParseStackTrace = $stackTrace; + list( $redir, $text ) = $this->getRedirectTargetAndText(); $output = $wgParser->parse( $text, $title, $options, true, true, $revId ); diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php index 5f09555e7a..d4277245c1 100644 --- a/includes/db/CloneDatabase.php +++ b/includes/db/CloneDatabase.php @@ -137,7 +137,7 @@ class CloneDatabase { global $wgDBprefix; $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); - $lbFactory->setDomainPrefix( $prefix ); + $lbFactory->setLocalDomainPrefix( $prefix ); $wgDBprefix = $prefix; } } diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 696e81f50c..628b47bd53 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -972,7 +972,7 @@ class DatabaseOracle extends Database { if ( $sl < 0 ) { continue; } - if ( '-' == $line[0] && '-' == $line[1] ) { + if ( $line[0] == '-' && $line[1] == '-' ) { continue; } @@ -986,7 +986,7 @@ class DatabaseOracle extends Database { $dollarquote = true; } } elseif ( !$dollarquote ) { - if ( ';' == $line[$sl] && ( $sl < 2 || ';' != $line[$sl - 1] ) ) { + if ( $line[$sl] == ';' && ( $sl < 2 || $line[$sl - 1] != ';' ) ) { $done = true; $line = substr( $line, 0, $sl ); } @@ -1017,7 +1017,7 @@ class DatabaseOracle extends Database { call_user_func( $resultCallback, $res, $this ); } - if ( false === $res ) { + if ( $res === false ) { $err = $this->lastError(); return "Query \"{$cmd}\" failed with error code \"$err\".\n"; diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php index 6288a504cc..9f63eded09 100644 --- a/includes/debug/logger/LegacyLogger.php +++ b/includes/debug/logger/LegacyLogger.php @@ -375,7 +375,7 @@ class LegacyLogger extends AbstractLogger { * @return string */ protected static function flatten( $item ) { - if ( null === $item ) { + if ( $item === null ) { return '[Null]'; } diff --git a/includes/debug/logger/monolog/CeeFormatter.php b/includes/debug/logger/monolog/CeeFormatter.php new file mode 100644 index 0000000000..4b0c6cb608 --- /dev/null +++ b/includes/debug/logger/monolog/CeeFormatter.php @@ -0,0 +1,23 @@ +mExternals, $existing ); foreach ( $diffs as $url => $dummy ) { - foreach ( wfMakeUrlIndexes( $url ) as $index ) { + foreach ( LinkFilter::makeIndexes( $url ) as $index ) { $arr[] = [ 'el_from' => $this->mId, 'el_to' => $url, diff --git a/includes/deferred/UserEditCountUpdate.php b/includes/deferred/UserEditCountUpdate.php index 5194e4f1cc..4ce0b18ec6 100644 --- a/includes/deferred/UserEditCountUpdate.php +++ b/includes/deferred/UserEditCountUpdate.php @@ -68,14 +68,15 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate { public function doUpdate() { $lb = MediaWikiServices::getInstance()->getDBLoadBalancer(); $dbw = $lb->getConnection( DB_MASTER ); + $fname = __METHOD__; - ( new AutoCommitUpdate( $dbw, __METHOD__, function () use ( $lb, $dbw ) { + ( new AutoCommitUpdate( $dbw, __METHOD__, function () use ( $lb, $dbw, $fname ) { foreach ( $this->infoByUser as $userId => $info ) { $dbw->update( 'user', [ 'user_editcount=user_editcount+' . (int)$info['increment'] ], [ 'user_id' => $userId, 'user_editcount IS NOT NULL' ], - __METHOD__ + $fname ); /** @var User[] $affectedInstances */ $affectedInstances = $info['instances']; @@ -87,7 +88,7 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate { if ( $dbr !== $dbw ) { // This method runs after the new revisions were committed. // Wait for the replica to catch up so they will all be counted. - $dbr->flushSnapshot( __METHOD__ ); + $dbr->flushSnapshot( $fname ); $lb->safeWaitForMasterPos( $dbr ); } $affectedInstances[0]->initEditCountInternal(); @@ -96,7 +97,7 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate { 'user', [ 'user_editcount' ], [ 'user_id' => $userId ], - __METHOD__ + $fname ); // Update the edit count in the instance caches. This is mostly useful diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 8d0971e659..826eecbb56 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -21,8 +21,10 @@ * @ingroup DifferenceEngine */ +use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Storage\NameTableAccessException; /** * DifferenceEngine is responsible for rendering the difference between two revisions as HTML. @@ -1055,7 +1057,7 @@ class DifferenceEngine extends ContextSource { $slotDiff = $slotDiffRenderer->getDiff( $slotContents[$role]['old'], $slotContents[$role]['new'] ); if ( $slotDiff && $role !== SlotRecord::MAIN ) { - // TODO use human-readable role name at least + // FIXME: ask SlotRoleHandler::getSlotNameMessage $slotTitle = $role; $difftext .= $this->getSlotHeader( $slotTitle ); } @@ -1797,22 +1799,42 @@ class DifferenceEngine extends ContextSource { // Load tags information for both revisions $dbr = wfGetDB( DB_REPLICA ); + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); if ( $this->mOldid !== false ) { - $this->mOldTags = $dbr->selectField( - 'tag_summary', - 'ts_tags', - [ 'ts_rev_id' => $this->mOldid ], + $tagIds = $dbr->selectFieldValues( + 'change_tag', + 'ct_tag_id', + [ 'ct_rev_id' => $this->mOldid ], __METHOD__ ); + $tags = []; + foreach ( $tagIds as $tagId ) { + try { + $tags[] = $changeTagDefStore->getName( (int)$tagId ); + } catch ( NameTableAccessException $exception ) { + continue; + } + } + $this->mOldTags = implode( ',', $tags ); } else { $this->mOldTags = false; } - $this->mNewTags = $dbr->selectField( - 'tag_summary', - 'ts_tags', - [ 'ts_rev_id' => $this->mNewid ], + + $tagIds = $dbr->selectFieldValues( + 'change_tag', + 'ct_tag_id', + [ 'ct_rev_id' => $this->mNewid ], __METHOD__ ); + $tags = []; + foreach ( $tagIds as $tagId ) { + try { + $tags[] = $changeTagDefStore->getName( (int)$tagId ); + } catch ( NameTableAccessException $exception ) { + continue; + } + } + $this->mNewTags = implode( ',', $tags ); return true; } diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php index af835e4776..7f70c4fbaf 100644 --- a/includes/exception/MWException.php +++ b/includes/exception/MWException.php @@ -121,7 +121,7 @@ class MWException extends Exception { "Fatal exception of type $1", $type, $logId, - MWExceptionHandler::getURL( $this ) + MWExceptionHandler::getURL() ) ) ) . " # Somethingcool> @@ -2026,7 +2028,19 @@ class Parser { * @return string */ public static function normalizeLinkUrl( $url ) { - # First, make sure unsafe characters are encoded + # Test for RFC 3986 IPv6 syntax + $scheme = '[a-z][a-z0-9+.-]*:'; + $userinfo = '(?:[a-z0-9\-._~!$&\'()*+,;=:]|%[0-9a-f]{2})*'; + $ipv6Host = '\\[((?:[0-9a-f:]|%3[0-A]|%[46][1-6])+)\\]'; + if ( preg_match( "<^(?:{$scheme})?//(?:{$userinfo}@)?{$ipv6Host}(?:[:/?#].*|)$>i", $url, $m ) && + IP::isValid( rawurldecode( $m[1] ) ) + ) { + $isIPv6 = rawurldecode( $m[1] ); + } else { + $isIPv6 = false; + } + + # Make sure unsafe characters are encoded $url = preg_replace_callback( '/[\x00-\x20"<>\[\\\\\]^`{|}\x7F-\xFF]/', function ( $m ) { return rawurlencode( $m[0] ); @@ -2058,6 +2072,16 @@ class Parser { $ret = self::normalizeUrlComponent( substr( $url, 0, $end ), '"#%<>[\]^`{|}/?' ) . $ret; + # Fix IPv6 syntax + if ( $isIPv6 !== false ) { + $ipv6Host = "%5B({$isIPv6})%5D"; + $ret = preg_replace( + "<^((?:{$scheme})?//(?:{$userinfo}@)?){$ipv6Host}(?=[:/?#]|$)>i", + "$1[$2]", + $ret + ); + } + return $ret; } @@ -3122,7 +3146,7 @@ class Parser { # $args is a list of argument nodes, starting from index 0, not including $part1 # @todo FIXME: If piece['parts'] is null then the call to getLength() # below won't work b/c this $args isn't an object - $args = ( null == $piece['parts'] ) ? [] : $piece['parts']; + $args = ( $piece['parts'] == null ) ? [] : $piece['parts']; $profileSection = null; // profile templates @@ -5042,9 +5066,10 @@ class Parser { $ig->setShowFilename( false ); } if ( isset( $params['caption'] ) ) { - $caption = $params['caption']; - $caption = htmlspecialchars( $caption ); - $caption = $this->replaceInternalLinks( $caption ); + // NOTE: We aren't passing a frame here or below. Frame info + // is currently opaque to Parsoid, which acts on OT_PREPROCESS. + // See T107332#4030581 + $caption = $this->recursiveTagParse( $params['caption'] ); $ig->setCaptionHtml( $caption ); } if ( isset( $params['perrow'] ) ) { @@ -5445,6 +5470,7 @@ class Parser { * Adds an entry to appropriate link tables. * * @since 1.32 + * @param string $value * @return array of `[ type, target ]`, where: * - `type` is one of: * - `null`: Given value is not a valid link target, use default @@ -5500,6 +5526,40 @@ class Parser { # that are later expanded to html- so expand them now and # remove the tags $tooltip = $this->mStripState->unstripBoth( $tooltip ); + # Compatibility hack! In HTML certain entity references not terminated + # by a semicolon are decoded (but not if we're in an attribute; that's + # how link URLs get away without properly escaping & in queries). + # But wikitext has always required semicolon-termination of entities, + # so encode & where needed to avoid decode of semicolon-less entities. + # See T209236 and + # https://www.w3.org/TR/html5/syntax.html#named-character-references + # T210437 discusses moving this workaround to Sanitizer::stripAllTags. + $tooltip = preg_replace( "/ + & # 1. entity prefix + (?= # 2. followed by: + (?: # a. one of the legacy semicolon-less named entities + A(?:Elig|MP|acute|circ|grave|ring|tilde|uml)| + C(?:OPY|cedil)|E(?:TH|acute|circ|grave|uml)| + GT|I(?:acute|circ|grave|uml)|LT|Ntilde| + O(?:acute|circ|grave|slash|tilde|uml)|QUOT|REG|THORN| + U(?:acute|circ|grave|uml)|Yacute| + a(?:acute|c(?:irc|ute)|elig|grave|mp|ring|tilde|uml)|brvbar| + c(?:cedil|edil|urren)|cent(?!erdot;)|copy(?!sr;)|deg| + divide(?!ontimes;)|e(?:acute|circ|grave|th|uml)| + frac(?:1(?:2|4)|34)| + gt(?!c(?:c|ir)|dot|lPar|quest|r(?:a(?:pprox|rr)|dot|eq(?:less|qless)|less|sim);)| + i(?:acute|circ|excl|grave|quest|uml)|laquo| + lt(?!c(?:c|ir)|dot|hree|imes|larr|quest|r(?:Par|i(?:e|f|));)| + m(?:acr|i(?:cro|ddot))|n(?:bsp|tilde)| + not(?!in(?:E|dot|v(?:a|b|c)|)|ni(?:v(?:a|b|c)|);)| + o(?:acute|circ|grave|rd(?:f|m)|slash|tilde|uml)| + p(?:lusmn|ound)|para(?!llel;)|quot|r(?:aquo|eg)| + s(?:ect|hy|up(?:1|2|3)|zlig)|thorn|times(?!b(?:ar|)|d;)| + u(?:acute|circ|grave|ml|uml)|y(?:acute|en|uml) + ) + (?:[^;]|$)) # b. and not followed by a semicolon + # S = study, for efficiency + /Sx", '&', $tooltip ); $tooltip = Sanitizer::stripAllTags( $tooltip ); return $tooltip; diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index de67b84740..8407992ba1 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -57,7 +57,7 @@ class ParserOptions { /** * Lazy-loaded options - * @var callback[] + * @var callable[] */ private static $lazyOptions = [ 'dateformat' => [ __CLASS__, 'initDateFormat' ], @@ -650,8 +650,10 @@ class ParserOptions { /** * Lazy initializer for dateFormat + * @param ParserOptions $popt + * @return string */ - private static function initDateFormat( $popt ) { + private static function initDateFormat( ParserOptions $popt ) { return $popt->mUser->getDatePreference(); } diff --git a/includes/parser/RemexStripTagHandler.php b/includes/parser/RemexStripTagHandler.php index 41c6bf41df..a41e7b60ed 100644 --- a/includes/parser/RemexStripTagHandler.php +++ b/includes/parser/RemexStripTagHandler.php @@ -66,7 +66,6 @@ class RemexStripTagHandler implements TokenHandler { 'fieldset' => true, 'figcaption' => true, 'figure' => true, - 'figcaption' => true, 'footer' => true, 'form' => true, 'h1' => true, diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php index 85c71eeb44..f8c3bc2c72 100644 --- a/includes/parser/Sanitizer.php +++ b/includes/parser/Sanitizer.php @@ -349,18 +349,18 @@ class Sanitizer { /** * Regular expression to match HTML/XML attribute pairs within a tag. - * Allows some... latitude. Based on, - * https://www.w3.org/TR/html5/syntax.html#before-attribute-value-state - * Used in Sanitizer::fixTagAttributes and Sanitizer::decodeTagAttributes + * Based on https://www.w3.org/TR/html5/syntax.html#before-attribute-name-state + * Used in Sanitizer::decodeTagAttributes * @return string */ static function getAttribsRegex() { if ( self::$attribsRegex === null ) { - $attribFirst = "[:_\p{L}\p{N}]"; - $attrib = "[:_\.\-\p{L}\p{N}]"; - $space = '[\x09\x0a\x0c\x0d\x20]'; + $spaceChars = '\x09\x0a\x0c\x0d\x20'; + $space = "[{$spaceChars}]"; + $attrib = "[^{$spaceChars}\/>=]"; + $attribFirst = "(?:{$attrib}|=)"; self::$attribsRegex = - "/(?:^|$space)({$attribFirst}{$attrib}*) + "/({$attribFirst}{$attrib}*) ($space*=$space* (?: # The attribute value: quoted or alone @@ -368,11 +368,29 @@ class Sanitizer { | '([^']*)(?:'|\$) | (((?!$space|>).)*) ) - )?(?=$space|\$)/sxu"; + )?/sxu"; } return self::$attribsRegex; } + /** + * Lazy-initialised attribute name regex, see getAttribNameRegex() + */ + private static $attribNameRegex; + + /** + * Used in Sanitizer::decodeTagAttributes to filter attributes. + * @return string + */ + static function getAttribNameRegex() { + if ( self::$attribNameRegex === null ) { + $attribFirst = "[:_\p{L}\p{N}]"; + $attrib = "[:_\.\-\p{L}\p{N}]"; + self::$attribNameRegex = "/^({$attribFirst}{$attrib}*)$/sxu"; + } + return self::$attribNameRegex; + } + /** * Return the various lists of recognized tags * @param array $extratags For any extra tags to include @@ -495,6 +513,7 @@ class Sanitizer { $bits = explode( '<', $text ); $text = str_replace( '>', '>', array_shift( $bits ) ); if ( !MWTidy::isEnabled() ) { + wfDeprecated( 'disabling tidy', '1.33' ); $tagstack = $tablestack = []; foreach ( $bits as $x ) { $regs = []; @@ -1433,18 +1452,24 @@ class Sanitizer { return []; } - $attribs = []; $pairs = []; if ( !preg_match_all( self::getAttribsRegex(), $text, $pairs, PREG_SET_ORDER ) ) { - return $attribs; + return []; } + $attribs = []; foreach ( $pairs as $set ) { $attribute = strtolower( $set[1] ); + + // Filter attribute names with unacceptable characters + if ( !preg_match( self::getAttribNameRegex(), $attribute ) ) { + continue; + } + $value = self::getTagAttributeCallback( $set ); // Normalize whitespace diff --git a/includes/password/PasswordPolicyChecks.php b/includes/password/PasswordPolicyChecks.php index 837e959780..c3af88f07d 100644 --- a/includes/password/PasswordPolicyChecks.php +++ b/includes/password/PasswordPolicyChecks.php @@ -22,15 +22,23 @@ use Cdb\Reader as CdbReader; use MediaWiki\MediaWikiServices; +use Wikimedia\PasswordBlacklist; /** - * Functions to check passwords against a policy requirement + * Functions to check passwords against a policy requirement. + * + * $policyVal is the value configured in $wgPasswordPolicy. If the return status is fatal, + * the user won't be allowed to login. If the status is not good but not fatal, the user + * will not be allowed to set the given password (on registration or password change), + * but can still log in after bypassing a warning. + * * @since 1.26 + * @see $wgPasswordPolicy */ class PasswordPolicyChecks { /** - * Check password is longer than minimum, not fatal + * Check password is longer than minimum, not fatal. * @param int $policyVal minimal length * @param User $user * @param string $password @@ -45,7 +53,7 @@ class PasswordPolicyChecks { } /** - * Check password is longer than minimum, fatal + * Check password is longer than minimum, fatal. * @param int $policyVal minimal length * @param User $user * @param string $password @@ -60,7 +68,8 @@ class PasswordPolicyChecks { } /** - * Check password is shorter than maximum, fatal + * Check password is shorter than maximum, fatal. + * Intended for preventing DoS attacks when using a more expensive password hash like PBKDF2. * @param int $policyVal maximum length * @param User $user * @param string $password @@ -75,7 +84,7 @@ class PasswordPolicyChecks { } /** - * Check if username and password match + * Check if username and password are a (case-insensitive) match. * @param bool $policyVal true to force compliance. * @param User $user * @param string $password @@ -86,7 +95,7 @@ class PasswordPolicyChecks { $username = $user->getName(); $contLang = MediaWikiServices::getInstance()->getContentLanguage(); if ( - $policyVal && $contLang->lc( $password ) === $contLang->lc( $username ) + $policyVal && hash_equals( $contLang->lc( $username ), $contLang->lc( $password ) ) ) { $status->error( 'password-name-match' ); } @@ -94,7 +103,7 @@ class PasswordPolicyChecks { } /** - * Check if username and password are on a blacklist + * Check if username and password are on a blacklist of past MediaWiki default passwords. * @param bool $policyVal true to force compliance. * @param User $user * @param string $password @@ -109,12 +118,15 @@ class PasswordPolicyChecks { $status = Status::newGood(); $username = $user->getName(); if ( $policyVal ) { - if ( isset( $blockedLogins[$username] ) && $password == $blockedLogins[$username] ) { + if ( + isset( $blockedLogins[$username] ) && + hash_equals( $blockedLogins[$username], $password ) + ) { $status->error( 'password-login-forbidden' ); } // Example from ApiChangeAuthenticationRequest - if ( $password === 'ExamplePassword' ) { + if ( hash_equals( 'ExamplePassword', $password ) ) { $status->error( 'password-login-forbidden' ); } } @@ -122,7 +134,8 @@ class PasswordPolicyChecks { } /** - * Ensure that password isn't in top X most popular passwords + * Ensure that password isn't in top X most popular passwords, as defined by + * $wgPopularPasswordFile. * * @param int $policyVal Cut off to use. Will automatically shrink to the max * supported for error messages if set to more than max number of passwords on file, @@ -130,12 +143,16 @@ class PasswordPolicyChecks { * @param User $user * @param string $password * @since 1.27 + * @deprecated since 1.33 * @return Status + * @see $wgPopularPasswordFile */ public static function checkPopularPasswordBlacklist( $policyVal, User $user, $password ) { global $wgPopularPasswordFile, $wgSitename; $status = Status::newGood(); if ( $policyVal > 0 ) { + wfDeprecated( __METHOD__, '1.33' ); + $langEn = Language::factory( 'en' ); $passwordKey = $langEn->lc( trim( $password ) ); @@ -167,4 +184,27 @@ class PasswordPolicyChecks { return $status; } + /** + * Ensure the password isn't in the list of passwords blacklisted by the + * wikimedia/password-blacklist library, which contains (as of 0.1.4) the + * 100.000 top passwords from SecLists (as a Bloom filter, with an + * 0.000001 false positive ratio). + * + * @param bool $policyVal Whether to apply this policy + * @param User $user + * @param string $password + * + * @since 1.33 + * + * @return Status + */ + public static function checkPasswordNotInLargeBlacklist( $policyVal, User $user, $password ) { + $status = Status::newGood(); + if ( $policyVal && PasswordBlacklist\PasswordBlacklist::isBlacklisted( $password ) ) { + $status->error( 'passwordinlargeblacklist' ); + } + + return $status; + } + } diff --git a/includes/password/Pbkdf2Password.php b/includes/password/Pbkdf2Password.php index 60650452fc..ce684ded40 100644 --- a/includes/password/Pbkdf2Password.php +++ b/includes/password/Pbkdf2Password.php @@ -41,54 +41,21 @@ class Pbkdf2Password extends ParameterizedPassword { return ':'; } - protected function shouldUseHashExtension() { - return $this->config['use-hash-extension'] ?? function_exists( 'hash_pbkdf2' ); - } - public function crypt( $password ) { if ( count( $this->args ) == 0 ) { $this->args[] = base64_encode( random_bytes( 16 ) ); } - if ( $this->shouldUseHashExtension() ) { - $hash = hash_pbkdf2( - $this->params['algo'], - $password, - base64_decode( $this->args[0] ), - (int)$this->params['rounds'], - (int)$this->params['length'], - true - ); - if ( !is_string( $hash ) ) { - throw new PasswordError( 'Error when hashing password.' ); - } - } else { - $hashLenHash = hash( $this->params['algo'], '', true ); - if ( !is_string( $hashLenHash ) ) { - throw new PasswordError( 'Error when hashing password.' ); - } - $hashLen = strlen( $hashLenHash ); - $blockCount = ceil( $this->params['length'] / $hashLen ); - - $hash = ''; - $salt = base64_decode( $this->args[0] ); - for ( $i = 1; $i <= $blockCount; ++$i ) { - $roundTotal = $lastRound = hash_hmac( - $this->params['algo'], - $salt . pack( 'N', $i ), - $password, - true - ); - - for ( $j = 1; $j < $this->params['rounds']; ++$j ) { - $lastRound = hash_hmac( $this->params['algo'], $lastRound, $password, true ); - $roundTotal ^= $lastRound; - } - - $hash .= $roundTotal; - } - - $hash = substr( $hash, 0, $this->params['length'] ); + $hash = hash_pbkdf2( + $this->params['algo'], + $password, + base64_decode( $this->args[0] ), + (int)$this->params['rounds'], + (int)$this->params['length'], + true + ); + if ( !is_string( $hash ) ) { + throw new PasswordError( 'Error when hashing password.' ); } $this->hash = base64_encode( $hash ); diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index c552506fe3..512a6b3829 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -127,7 +127,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $this->watchlistPreferences( $user, $context, $preferences ); $this->searchPreferences( $preferences ); - Hooks::run( 'GetPreferences', [ $user, &$preferences, $context ] ); + Hooks::run( 'GetPreferences', [ $user, &$preferences ] ); $this->loadPreferenceValues( $user, $context, $preferences ); $this->logger->debug( "Created form descriptor for user '{$user->getName()}'" ); @@ -796,6 +796,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { 'section' => 'rendering/timeoffset', 'id' => 'wpTimeCorrection', 'filter' => TimezoneFilter::class, + 'placeholder-message' => 'timezone-useoffset-placeholder', ]; } @@ -961,7 +962,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $defaultPreferences['hideminor'] = [ 'type' => 'toggle', 'label-message' => 'tog-hideminor', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', ]; $defaultPreferences['rcfilters-rc-collapsed'] = [ 'type' => 'api', @@ -990,14 +991,14 @@ class DefaultPreferencesFactory implements PreferencesFactory { $defaultPreferences['hidecategorization'] = [ 'type' => 'toggle', 'label-message' => 'tog-hidecategorization', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', ]; } if ( $user->useRCPatrol() ) { $defaultPreferences['hidepatrolled'] = [ 'type' => 'toggle', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', 'label-message' => 'tog-hidepatrolled', ]; } @@ -1005,7 +1006,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $user->useNPPatrol() ) { $defaultPreferences['newpageshidepatrolled'] = [ 'type' => 'toggle', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', 'label-message' => 'tog-newpageshidepatrolled', ]; } @@ -1020,7 +1021,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $defaultPreferences['rcenhancedfilters-disable'] = [ 'type' => 'toggle', - 'section' => 'rc/optoutrc', + 'section' => 'rc/advancedrc', 'label-message' => 'rcfilters-preference-label', 'help-message' => 'rcfilters-preference-help', ]; @@ -1091,27 +1092,27 @@ class DefaultPreferencesFactory implements PreferencesFactory { ]; $defaultPreferences['watchlisthideminor'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthideminor', ]; $defaultPreferences['watchlisthidebots'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthidebots', ]; $defaultPreferences['watchlisthideown'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthideown', ]; $defaultPreferences['watchlisthideanons'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthideanons', ]; $defaultPreferences['watchlisthideliu'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthideliu', ]; @@ -1135,7 +1136,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $this->config->get( 'RCWatchCategoryMembership' ) ) { $defaultPreferences['watchlisthidecategorization'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthidecategorization', ]; } @@ -1143,7 +1144,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $user->useRCPatrol() ) { $defaultPreferences['watchlisthidepatrolled'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthidepatrolled', ]; } @@ -1174,7 +1175,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { // tog-watchrollback $defaultPreferences[$pref] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/pageswatchlist', 'label-message' => "tog-$pref", ]; } @@ -1201,7 +1202,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $defaultPreferences['wlenhancedfilters-disable'] = [ 'type' => 'toggle', - 'section' => 'watchlist/optoutwatchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'rcfilters-watchlist-preference-label', 'help-message' => 'rcfilters-watchlist-preference-help', ]; diff --git a/includes/profiler/ProfilerExcimer.php b/includes/profiler/ProfilerExcimer.php new file mode 100644 index 0000000000..20f9a78508 --- /dev/null +++ b/includes/profiler/ProfilerExcimer.php @@ -0,0 +1,147 @@ +period = $params['period'] ?? 0.01; + $maxDepth = $params['maxDepth'] ?? 100; + + if ( isset( $params['cpuProfiler'] ) ) { + $this->cpuProf = $params['cpuProfiler']; + } else { + $this->cpuProf = new ExcimerProfiler; + $this->cpuProf->setEventType( EXCIMER_CPU ); + $this->cpuProf->setPeriod( $this->period ); + $this->cpuProf->setMaxDepth( $maxDepth ); + $this->cpuProf->start(); + } + + if ( isset( $params['realProfiler'] ) ) { + $this->realProf = $params['realProfiler']; + } else { + $this->realProf = new ExcimerProfiler; + $this->realProf->setEventType( EXCIMER_REAL ); + $this->realProf->setPeriod( $this->period ); + $this->realProf->setMaxDepth( $maxDepth ); + $this->realProf->start(); + } + } + + public function scopedProfileIn( $section ) { + } + + public function close() { + $this->cpuProf->stop(); + $this->realProf->stop(); + } + + public function getFunctionStats() { + $this->close(); + $cpuStats = $this->cpuProf->getLog()->aggregateByFunction(); + $realStats = $this->realProf->getLog()->aggregateByFunction(); + $allNames = array_keys( $realStats + $cpuStats ); + $cpuSamples = $this->cpuProf->getLog()->getEventCount(); + $realSamples = $this->realProf->getLog()->getEventCount(); + + $resultStats = [ [ + 'name' => '-total', + 'calls' => 1, + 'memory' => 0, + '%memory' => 0, + 'min_real' => 0, + 'max_real' => 0, + 'cpu' => $cpuSamples * $this->period * 1000, + '%cpu' => 100, + 'real' => $realSamples * $this->period * 1000, + '%real' => 100, + ] ]; + + foreach ( $allNames as $funcName ) { + $cpuEntry = $cpuStats[$funcName] ?? false; + $realEntry = $realStats[$funcName] ?? false; + $resultEntry = [ + 'name' => $funcName, + 'calls' => 0, + 'memory' => 0, + '%memory' => 0, + 'min_real' => 0, + 'max_real' => 0, + ]; + + if ( $cpuEntry ) { + $resultEntry['cpu'] = $cpuEntry['inclusive'] * $this->period * 1000; + $resultEntry['%cpu'] = $cpuEntry['inclusive'] / $cpuSamples * 100; + } else { + $resultEntry['cpu'] = 0; + $resultEntry['%cpu'] = 0; + } + if ( $realEntry ) { + $resultEntry['real'] = $realEntry['inclusive'] * $this->period * 1000; + $resultEntry['%real'] = $realEntry['inclusive'] / $realSamples * 100; + } else { + $resultEntry['real'] = 0; + $resultEntry['%real'] = 0; + } + + $resultStats[] = $resultEntry; + } + return $resultStats; + } + + public function getOutput() { + $this->close(); + $cpuLog = $this->cpuProf->getLog(); + $realLog = $this->realProf->getLog(); + $cpuStats = $cpuLog->aggregateByFunction(); + $realStats = $realLog->aggregateByFunction(); + $allNames = array_keys( $cpuStats + $realStats ); + $cpuSamples = $cpuLog->getEventCount(); + $realSamples = $realLog->getEventCount(); + + $result = ''; + + $titleFormat = "%-70s %10s %11s %10s %11s %10s %11s %10s %11s\n"; + $statsFormat = "%-70s %10d %10.1f%% %10d %10.1f%% %10d %10.1f%% %10d %10.1f%%\n"; + $result .= sprintf( $titleFormat, + 'Name', + 'CPU incl', 'CPU incl%', 'CPU self', 'CPU self%', + 'Real incl', 'Real incl%', 'Real self', 'Real self%' + ); + + foreach ( $allNames as $funcName ) { + $realEntry = $realStats[$funcName] ?? false; + $cpuEntry = $cpuStats[$funcName] ?? false; + $realIncl = $realEntry ? $realEntry['inclusive'] : 0; + $realSelf = $realEntry ? $realEntry['self'] : 0; + $cpuIncl = $cpuEntry ? $cpuEntry['inclusive'] : 0; + $cpuSelf = $cpuEntry ? $cpuEntry['self'] : 0; + $result .= sprintf( $statsFormat, + $funcName, + $cpuIncl * $this->period * 1000, + $cpuIncl == 0 ? 0 : $cpuIncl / $cpuSamples * 100, + $cpuSelf * $this->period * 1000, + $cpuSelf == 0 ? 0 : $cpuSelf / $cpuSamples * 100, + $realIncl * $this->period * 1000, + $realIncl == 0 ? 0 : $realIncl / $realSamples * 100, + $realSelf * $this->period * 1000, + $realSelf == 0 ? 0 : $realSelf / $realSamples * 100 + ); + } + + return $result; + } +} diff --git a/includes/profiler/output/ProfilerOutputDb.php b/includes/profiler/output/ProfilerOutputDb.php index 6e0085d8fc..ea5f7ad14b 100644 --- a/includes/profiler/output/ProfilerOutputDb.php +++ b/includes/profiler/output/ProfilerOutputDb.php @@ -21,7 +21,6 @@ * @ingroup Profiler */ -use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\DBError; /** @@ -56,7 +55,7 @@ class ProfilerOutputDb extends ProfilerOutput { } $fname = __METHOD__; - $dbw->onTransactionCommitOrIdle( function ( Database $dbw ) use ( $stats, $fname ) { + $dbw->onTransactionCommitOrIdle( function () use ( $stats, $fname, $dbw ) { $pfhost = $this->perHost ? wfHostname() : ''; // Sqlite: avoid excess b-tree rebuilds (mostly for non-WAL mode) // non-Sqlite: lower contention with small transactions diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index e43b3b88fa..07fab78f96 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -46,6 +46,7 @@ class ExtensionProcessor implements Processor { 'PasswordPolicy', 'RateLimits', 'RawHtmlMessages', + 'ReauthenticateTime', 'RecentChangesFlags', 'RemoveCredentialsBlacklist', 'RemoveGroups', diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 2fc81e37b6..9570e038a8 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -1529,10 +1529,12 @@ MESSAGE; self::inDebugMode() ); if ( $js === false ) { - throw new Exception( + $e = new Exception( 'JSON serialization of config data failed. ' . 'This usually means the config data is not valid UTF-8.' ); + MWExceptionHandler::logException( $e ); + $js = Xml::encodeJsCall( 'mw.log.error', [ $e->__toString() ] ); } return $js; } diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index 3ceb915d27..57392b97f8 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -74,7 +74,7 @@ class ResourceLoaderContext implements MessageLocalizer { $this->user = $request->getRawVal( 'user' ); $this->debug = $request->getFuzzyBool( 'debug', - $resourceLoader->getConfig()->get( 'ResourceLoaderDebug' ) + $this->getConfig()->get( 'ResourceLoaderDebug' ) ); $this->only = $request->getRawVal( 'only', null ); $this->version = $request->getRawVal( 'version', null ); @@ -89,7 +89,7 @@ class ResourceLoaderContext implements MessageLocalizer { $skinnames = Skin::getSkinNames(); // If no skin is specified, or we don't recognize the skin, use the default skin if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) { - $this->skin = $resourceLoader->getConfig()->get( 'DefaultSkin' ); + $this->skin = $this->getConfig()->get( 'DefaultSkin' ); } } @@ -149,6 +149,13 @@ class ResourceLoaderContext implements MessageLocalizer { return $this->resourceLoader; } + /** + * @return Config + */ + public function getConfig() { + return $this->getResourceLoader()->getConfig(); + } + /** * @return WebRequest */ @@ -181,7 +188,7 @@ class ResourceLoaderContext implements MessageLocalizer { $lang = $this->getRequest()->getRawVal( 'lang', '' ); // Stricter version of RequestContext::sanitizeLangCode() if ( !Language::isValidBuiltInCode( $lang ) ) { - $lang = $this->getResourceLoader()->getConfig()->get( 'LanguageCode' ); + $lang = $this->getConfig()->get( 'LanguageCode' ); } $this->language = $lang; } diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php index d9c369dd02..ef116283fc 100644 --- a/includes/resourceloader/ResourceLoaderImage.php +++ b/includes/resourceloader/ResourceLoaderImage.php @@ -292,7 +292,7 @@ class ResourceLoaderImage { * @return string New SVG file data */ protected function variantize( $variantConf, ResourceLoaderContext $context ) { - $dom = new DomDocument; + $dom = new DOMDocument; $dom->loadXML( file_get_contents( $this->getPath( $context ) ) ); $root = $dom->documentElement; $wrapper = $dom->createElement( 'g' ); @@ -315,7 +315,7 @@ class ResourceLoaderImage { * @return string Massaged SVG image data */ protected function massageSvgPathdata( $svg ) { - $dom = new DomDocument; + $dom = new DOMDocument; $dom->loadXML( $svg ); foreach ( $dom->getElementsByTagName( 'path' ) as $node ) { $pathData = $node->getAttribute( 'd' ); diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php index a8bf81498f..19fe0c3255 100644 --- a/includes/revisiondelete/RevisionDeleteUser.php +++ b/includes/revisiondelete/RevisionDeleteUser.php @@ -120,14 +120,17 @@ class RevisionDeleteUser { $actorId = $dbw->selectField( 'actor', 'actor_id', [ 'actor_name' => $name ], __METHOD__ ); if ( $actorId ) { # Hide name from live edits - $subquery = $dbw->selectSQLText( + $ids = $dbw->selectFieldValues( 'revision_actor_temp', 'revactor_rev', [ 'revactor_actor' => $actorId ], __METHOD__ ); - $dbw->update( - 'revision', - [ self::buildSetBitDeletedField( 'rev_deleted', $op, $delUser, $dbw ) ], - [ "rev_id IN ($subquery)" ], - __METHOD__ ); + if ( $ids ) { + $dbw->update( + 'revision', + [ self::buildSetBitDeletedField( 'rev_deleted', $op, $delUser, $dbw ) ], + [ 'rev_id' => $ids ], + __METHOD__ + ); + } # Hide name from deleted edits $dbw->update( diff --git a/includes/search/SearchDatabase.php b/includes/search/SearchDatabase.php index 93f8d2301f..54bfd28f68 100644 --- a/includes/search/SearchDatabase.php +++ b/includes/search/SearchDatabase.php @@ -30,7 +30,7 @@ use Wikimedia\Rdbms\IDatabase; */ abstract class SearchDatabase extends SearchEngine { /** - * @var IDatabase Slave database for reading from for results + * @var IDatabase Replica database from which to read results */ protected $db; diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index 2941f0a96a..a0100cab4a 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -287,6 +287,7 @@ abstract class SearchEngine { * @return SearchResultSet */ public static function getNearMatchResultSet( $searchterm ) { + wfDeprecated( __METHOD__, '1.27' ); return static::defaultNearMatcher()->getNearMatchResultSet( $searchterm ); } diff --git a/includes/search/SearchHighlighter.php b/includes/search/SearchHighlighter.php index 5dfc4dfe40..469502fd43 100644 --- a/includes/search/SearchHighlighter.php +++ b/includes/search/SearchHighlighter.php @@ -519,7 +519,7 @@ class SearchHighlighter { $extract = ""; $contLang = MediaWikiServices::getInstance()->getContentLanguage(); foreach ( $lines as $line ) { - if ( 0 == $contextlines ) { + if ( $contextlines == 0 ) { break; } ++$lineno; diff --git a/includes/search/SearchSuggestionSet.php b/includes/search/SearchSuggestionSet.php index cb1f831711..f1da246134 100644 --- a/includes/search/SearchSuggestionSet.php +++ b/includes/search/SearchSuggestionSet.php @@ -80,7 +80,7 @@ class SearchSuggestionSet { /** * Call array_map on the suggestions array - * @param callback $callback + * @param callable $callback * @return array */ public function map( $callback ) { @@ -89,7 +89,7 @@ class SearchSuggestionSet { /** * Filter the suggestions array - * @param callback $callback Callable accepting single SearchSuggestion + * @param callable $callback Callable accepting single SearchSuggestion * instance returning bool false to remove the item. * @return int The number of suggestions removed */ diff --git a/includes/shell/Command.php b/includes/shell/Command.php index 1154e05886..2afc548d08 100644 --- a/includes/shell/Command.php +++ b/includes/shell/Command.php @@ -433,8 +433,9 @@ class Command { // TODO replace with clear_last_error when requirements are bumped to PHP7 set_error_handler( function () { }, 0 ); - // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged - @trigger_error( '' ); + \MediaWiki\suppressWarnings(); + trigger_error( '' ); + \MediaWiki\restoreWarnings(); restore_error_handler(); $readPipes = array_filter( $pipes, function ( $fd ) use ( $desc ) { diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php index 91d9ef7c5d..b106d11794 100644 --- a/includes/site/SiteSQLStore.php +++ b/includes/site/SiteSQLStore.php @@ -44,6 +44,7 @@ class SiteSQLStore { * @return SiteStore */ public static function newInstance( $sitesTable = null, BagOStuff $cache = null ) { + wfDeprecated( __METHOD__, '1.27' ); if ( $sitesTable !== null ) { throw new InvalidArgumentException( __METHOD__ . ': $sitesTable parameter is unused and must be null' diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 1b91c89974..809d411095 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -196,14 +196,15 @@ abstract class Skin extends ContextSource { 'core' => [ 'site', 'mediawiki.page.startup', - 'mediawiki.user', ], // modules that enhance the content in some way 'content' => [ 'mediawiki.page.ready', ], // modules relating to search functionality - 'search' => [], + 'search' => [ + 'mediawiki.searchSuggest', + ], // modules relating to functionality relating to watching an article 'watch' => [], // modules which relate to the current users preferences @@ -242,8 +243,6 @@ abstract class Skin extends ContextSource { $modules['watch'][] = 'mediawiki.page.watch.ajax'; } - $modules['search'][] = 'mediawiki.searchSuggest'; - if ( $user->getBoolOption( 'editsectiononrightclick' ) ) { $modules['user'][] = 'mediawiki.action.view.rightClickEdit'; } @@ -438,6 +437,7 @@ abstract class Skin extends ContextSource { */ function getPageClasses( $title ) { $numeric = 'ns-' . $title->getNamespace(); + $user = $this->getUser(); if ( $title->isSpecialPage() ) { $type = 'ns-special'; @@ -449,10 +449,16 @@ abstract class Skin extends ContextSource { } else { $type .= ' mw-invalidspecialpage'; } - } elseif ( $title->isTalkPage() ) { - $type = 'ns-talk'; } else { - $type = 'ns-subject'; + if ( $title->isTalkPage() ) { + $type = 'ns-talk'; + } else { + $type = 'ns-subject'; + } + // T208315: add HTML class when the user can edit the page + if ( $title->quickUserCan( 'edit', $user ) ) { + $type .= ' mw-editable'; + } } $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() ); diff --git a/includes/sparql/SparqlClient.php b/includes/sparql/SparqlClient.php index 778a3b3248..20fc9b3255 100644 --- a/includes/sparql/SparqlClient.php +++ b/includes/sparql/SparqlClient.php @@ -170,7 +170,7 @@ class SparqlClient { $status = $request->execute(); if ( !$status->isOK() ) { - throw new SparqlException( "HTTP error: {$status->getWikiText()}" ); + throw new SparqlException( 'HTTP error: ' . $status->getWikiText( false, false, 'en' ) ); } $result = $request->getContent(); \Wikimedia\suppressWarnings(); diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index 1476e85eb8..c56cc65db4 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -254,7 +254,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage { $allReqs = AuthManager::singleton()->getAuthenticationRequests( $this->authAction, $this->getUser() ); - $this->authRequests = array_filter( $allReqs, function ( $req ) use ( $subPage ) { + $this->authRequests = array_filter( $allReqs, function ( $req ) { return !in_array( get_class( $req ), $this->getRequestBlacklist(), true ); } ); } @@ -456,7 +456,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage { // Let's just submit the data to AuthManager directly instead. LoggerFactory::getInstance( 'authentication' ) ->warning( 'Validation error on return', [ 'data' => $form->mFieldData, - 'status' => $status->getWikiText() ] ); + 'status' => $status->getWikiText( false, false, 'en' ) ] ); $status = $this->handleFormSubmit( $form->mFieldData ); } } diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 6b9b9d4b83..c9ce2b0837 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -66,7 +66,6 @@ class SpecialBlock extends FormSpecialPage { */ protected function checkExecutePermissions( User $user ) { parent::checkExecutePermissions( $user ); - # T17810: blocked admins should have limited access here $status = self::checkUnblockSelf( $this->target, $user ); if ( $status !== true ) { @@ -74,6 +73,15 @@ class SpecialBlock extends FormSpecialPage { } } + /** + * We allow certain special cases where user is blocked + * + * @return bool + */ + public function requiresUnblock() { + return false; + } + /** * Handle some magic here * @@ -171,6 +179,10 @@ class SpecialBlock extends FormSpecialPage { 'exists' => true, 'max' => 10, 'cssclass' => 'mw-block-page-restrictions', + 'showMissing' => false, + 'input' => [ + 'autocomplete' => false + ], ]; } @@ -382,6 +394,7 @@ class SpecialBlock extends FormSpecialPage { * @return string */ protected function preText() { + $this->getOutput()->addModuleStyles( 'mediawiki.widgets.TagMultiselectWidget.styles' ); $this->getOutput()->addModules( [ 'mediawiki.special.block' ] ); $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); @@ -869,6 +882,7 @@ class SpecialBlock extends FormSpecialPage { } $status = $currentBlock->update(); + // TODO handle failure $logaction = 'reblock'; @@ -881,6 +895,8 @@ class SpecialBlock extends FormSpecialPage { if ( (bool)$currentBlock->mHideName ) { $data['HideUser'] = true; } + + $block = $currentBlock; } } else { $logaction = 'block'; @@ -925,9 +941,8 @@ class SpecialBlock extends FormSpecialPage { $logEntry->setComment( $data['Reason'][0] ); $logEntry->setPerformer( $performer ); $logEntry->setParameters( $logParams ); - # Relate log ID to block IDs (T27763) - $blockIds = array_merge( [ $status['id'] ], $status['autoIds'] ); - $logEntry->setRelations( [ 'ipb_id' => $blockIds ] ); + # Relate log ID to block ID (T27763) + $logEntry->setRelations( [ 'ipb_id' => $block->getId() ] ); $logId = $logEntry->insert(); if ( !empty( $data['Tags'] ) ) { @@ -1017,19 +1032,24 @@ class SpecialBlock extends FormSpecialPage { * T17810: blocked admins should not be able to block/unblock * others, and probably shouldn't be able to unblock themselves * either. - * @param User|int|string $user + * + * Exception: Users can block the user who blocked them, to reduce + * advantage of a malicious account blocking all admins (T150826) + * + * @param User|int|string|null $target Target to block or unblock; could be a User object, + * or a user ID or username, or null when the target is not known yet (e.g. when + * displaying Special:Block) * @param User $performer User doing the request * @return bool|string True or error message key */ - public static function checkUnblockSelf( $user, User $performer ) { - if ( is_int( $user ) ) { - $user = User::newFromId( $user ); - } elseif ( is_string( $user ) ) { - $user = User::newFromName( $user ); + public static function checkUnblockSelf( $target, User $performer ) { + if ( is_int( $target ) ) { + $target = User::newFromId( $target ); + } elseif ( is_string( $target ) ) { + $target = User::newFromName( $target ); } - if ( $performer->isBlocked() ) { - if ( $user instanceof User && $user->getId() == $performer->getId() ) { + if ( $target instanceof User && $target->getId() == $performer->getId() ) { # User is trying to unblock themselves if ( $performer->isAllowed( 'unblockself' ) ) { return true; @@ -1039,6 +1059,19 @@ class SpecialBlock extends FormSpecialPage { } else { return 'ipbnounblockself'; } + } elseif ( + $target instanceof User && + $performer->getBlock() instanceof Block && + $performer->getBlock()->getBy() && + $performer->getBlock()->getBy() === $target->getId() + ) { + // Allow users to block the user that blocked them. + // This is to prevent a situation where a malicious user + // blocks all other users. This way, the non-malicious + // user can block the malicious user back, resulting + // in a stalemate. + return true; + } else { # User is trying to block/unblock someone else return 'ipbblocked'; diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 43c7d2921d..5b939efbee 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -607,7 +607,7 @@ class SpecialContributions extends IncludableSpecialPage { '' ) . "\u{00A0}" . Html::namespaceSelector( - [ 'selected' => $this->opts['namespace'], 'all' => '' ], + [ 'selected' => $this->opts['namespace'], 'all' => '', 'in-user-lang' => true ], [ 'name' => 'namespace', 'id' => 'namespace', diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php index 16cebe0fae..70b4207638 100644 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@ -159,7 +159,6 @@ class SpecialEditWatchlist extends UnlistedSpecialPage { $out->addReturnTo( SpecialPage::getTitleFor( 'Watchlist' ) ); } elseif ( $this->toc !== false ) { $out->prependHTML( $this->toc ); - $out->addModules( 'mediawiki.toc' ); $out->addModuleStyles( 'mediawiki.toc.styles' ); } } diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php index 4587d40609..619665bdb4 100644 --- a/includes/specials/SpecialExpandTemplates.php +++ b/includes/specials/SpecialExpandTemplates.php @@ -117,6 +117,8 @@ class SpecialExpandTemplates extends SpecialPage { $config = $this->getConfig(); if ( MWTidy::isEnabled() && $options->getTidy() ) { $tmp = MWTidy::tidy( $tmp ); + } else { + wfDeprecated( 'disabling tidy', '1.33' ); } $out->addHTML( $tmp ); diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index 513e7a96b8..ef61ac5b33 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -378,7 +378,6 @@ class SpecialExport extends SpecialPage { } /* Ok, let's get to it... */ - $lb = false; $db = wfGetDB( DB_REPLICA ); $exporter = new WikiExporter( $db, $history ); @@ -406,10 +405,6 @@ class SpecialExport extends SpecialPage { } $exporter->closeStream(); - - if ( $lb ) { - $lb->closeAll(); - } } /** diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php index 839a9bc487..a985bcc638 100644 --- a/includes/specials/SpecialImport.php +++ b/includes/specials/SpecialImport.php @@ -280,6 +280,7 @@ class SpecialImport extends SpecialPage { 'selected' => ( $isSameSourceAsBefore ? $this->namespace : ( $defaultNamespace || '' ) ), + 'in-user-lang' => true, ], [ 'name' => "namespace", // mw-import-namespace-interwiki, mw-import-namespace-upload diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php index ef9525438c..d08fe5cf4e 100644 --- a/includes/specials/SpecialLinkSearch.php +++ b/includes/specials/SpecialLinkSearch.php @@ -69,7 +69,7 @@ class LinkSearchPage extends QueryPage { } } - $target2 = $target; + $target2 = Parser::normalizeLinkUrl( $target ); // Get protocol, default is http:// $protocol = 'http://'; $bits = wfParseUrl( $target ); @@ -128,7 +128,7 @@ class LinkSearchPage extends QueryPage { if ( $target != '' ) { $this->setParams( [ - 'query' => Parser::normalizeLinkUrl( $target2 ), + 'query' => $target2, 'namespace' => $namespace, 'protocol' => $protocol ] ); parent::execute( $par ); @@ -146,37 +146,6 @@ class LinkSearchPage extends QueryPage { return false; } - /** - * Return an appropriately formatted LIKE query and the clause - * - * @param string $query Search pattern to search for - * @param string $prot Protocol, e.g. 'http://' - * - * @return array - */ - static function mungeQuery( $query, $prot ) { - $field = 'el_index'; - $dbr = wfGetDB( DB_REPLICA ); - - if ( $query === '*' && $prot !== '' ) { - // Allow queries like 'ftp://*' to find all ftp links - $rv = [ $prot, $dbr->anyString() ]; - } else { - $rv = LinkFilter::makeLikeArray( $query, $prot ); - } - - if ( $rv === false ) { - // LinkFilter doesn't handle wildcard in IP, so we'll have to munge here. - $pattern = '/^(:?[0-9]{1,3}\.)+\*\s*$|^(:?[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]*\*\s*$/'; - if ( preg_match( $pattern, $query ) ) { - $rv = [ $prot . rtrim( $query, " \t*" ), $dbr->anyString() ]; - $field = 'el_to'; - } - } - - return [ $rv, $field ]; - } - function linkParameters() { $params = []; $params['target'] = $this->mProt . $this->mQuery; @@ -189,16 +158,29 @@ class LinkSearchPage extends QueryPage { public function getQueryInfo() { $dbr = wfGetDB( DB_REPLICA ); - // strip everything past first wildcard, so that - // index-based-only lookup would be done - list( $this->mungedQuery, $clause ) = self::mungeQuery( $this->mQuery, $this->mProt ); + + if ( $this->mQuery === '*' && $this->mProt !== '' ) { + $this->mungedQuery = [ + 'el_index_60' . $dbr->buildLike( $this->mProt, $dbr->anyString() ), + ]; + } else { + $this->mungedQuery = LinkFilter::getQueryConditions( $this->mQuery, [ + 'protocol' => $this->mProt, + 'oneWildcard' => true, + 'db' => $dbr + ] ); + } if ( $this->mungedQuery === false ) { // Invalid query; return no results return [ 'tables' => 'page', 'fields' => 'page_id', 'conds' => '0=1' ]; } - $stripped = LinkFilter::keepOneWildcard( $this->mungedQuery ); - $like = $dbr->buildLike( $stripped ); + $orderBy = []; + if ( !isset( $this->mungedQuery['el_index_60'] ) ) { + $orderBy[] = 'el_index_60'; + } + $orderBy[] = 'el_id'; + $retval = [ 'tables' => [ 'page', 'externallinks' ], 'fields' => [ @@ -207,11 +189,13 @@ class LinkSearchPage extends QueryPage { 'value' => 'el_index', 'url' => 'el_to' ], - 'conds' => [ - 'page_id = el_from', - "$clause $like" - ], - 'options' => [ 'USE INDEX' => $clause ] + 'conds' => array_merge( + [ + 'page_id = el_from', + ], + $this->mungedQuery + ), + 'options' => [ 'ORDER BY' => $orderBy ] ]; if ( $this->mNs !== null && !$this->getConfig()->get( 'MiserMode' ) ) { @@ -248,9 +232,7 @@ class LinkSearchPage extends QueryPage { /** * Override to squash the ORDER BY. - * We do a truncated index search, so the optimizer won't trust - * it as good enough for optimizing sort. The implicit ordering - * from the scan will usually do well enough for our needs. + * Not much point in descending order here. * @return array */ function getOrderFields() { diff --git a/includes/specials/SpecialLockdb.php b/includes/specials/SpecialLockdb.php index a2c25305ca..c7c45b5510 100644 --- a/includes/specials/SpecialLockdb.php +++ b/includes/specials/SpecialLockdb.php @@ -84,7 +84,7 @@ class SpecialLockdb extends FormSpecialPage { $fp = fopen( $this->getConfig()->get( 'ReadOnlyFile' ), 'w' ); Wikimedia\restoreWarnings(); - if ( false === $fp ) { + if ( $fp === false ) { # This used to show a file not found error, but the likeliest reason for fopen() # to fail at this point is insufficient permission to write to the file...good old # is_writable() is plain wrong in some cases, it seems... diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 5cbad8a33b..599ab31135 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -122,7 +122,7 @@ class MovePageForm extends UnlistedSpecialPage { $this->moveOverShared = $request->getBool( 'wpMoveOverSharedFile' ); $this->watch = $request->getCheck( 'wpWatch' ) && $user->isLoggedIn(); - if ( 'submit' == $request->getVal( 'action' ) && $request->wasPosted() + if ( $request->getVal( 'action' ) == 'submit' && $request->wasPosted() && $user->matchEditToken( $request->getVal( 'wpEditToken' ) ) ) { $this->doSubmit(); @@ -137,8 +137,9 @@ class MovePageForm extends UnlistedSpecialPage { * @param array $err Error messages. Each item is an error message. * It may either be a string message name or array message name and * parameters, like the second argument to OutputPage::wrapWikiMsg(). + * @param bool $isPermError Whether the error message is about user permissions. */ - function showForm( $err ) { + function showForm( $err, $isPermError = false ) { $this->getSkin()->setRelevantTitle( $this->oldTitle ); $out = $this->getOutput(); @@ -235,9 +236,13 @@ class MovePageForm extends UnlistedSpecialPage { } if ( count( $err ) ) { - $action_desc = $this->msg( 'action-move' )->plain(); - $errMsgHtml = $this->msg( 'permissionserrorstext-withaction', - count( $err ), $action_desc )->parseAsBlock(); + if ( $isPermError ) { + $action_desc = $this->msg( 'action-move' )->plain(); + $errMsgHtml = $this->msg( 'permissionserrorstext-withaction', + count( $err ), $action_desc )->parseAsBlock(); + } else { + $errMsgHtml = $this->msg( 'cannotmove', count( $err ) )->parseAsBlock(); + } if ( count( $err ) == 1 ) { $errMsg = $err[0]; @@ -542,7 +547,7 @@ class MovePageForm extends UnlistedSpecialPage { $permErrors = $nt->getUserPermissionsErrors( 'delete', $user ); if ( count( $permErrors ) ) { # Only show the first error - $this->showForm( $permErrors ); + $this->showForm( $permErrors, true ); return; } @@ -596,7 +601,7 @@ class MovePageForm extends UnlistedSpecialPage { $permStatus = $mp->checkPermissions( $user, $this->reason ); if ( !$permStatus->isOK() ) { - $this->showForm( $permStatus->getErrorsArray() ); + $this->showForm( $permStatus->getErrorsArray(), true ); return; } diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 5ba7c88e01..8051b0b4e4 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -76,19 +76,19 @@ class SpecialNewpages extends IncludableSpecialPage { protected function parseParams( $par ) { $bits = preg_split( '/\s*,\s*/', trim( $par ) ); foreach ( $bits as $bit ) { - if ( 'shownav' == $bit ) { + if ( $bit === 'shownav' ) { $this->showNavigation = true; } - if ( 'hideliu' === $bit ) { + if ( $bit === 'hideliu' ) { $this->opts->setValue( 'hideliu', true ); } - if ( 'hidepatrolled' == $bit ) { + if ( $bit === 'hidepatrolled' ) { $this->opts->setValue( 'hidepatrolled', true ); } - if ( 'hidebots' == $bit ) { + if ( $bit === 'hidebots' ) { $this->opts->setValue( 'hidebots', true ); } - if ( 'showredirs' == $bit ) { + if ( $bit === 'showredirs' ) { $this->opts->setValue( 'hideredirs', false ); } if ( is_numeric( $bit ) ) { diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php index 7ea9ba019c..3524d79e65 100644 --- a/includes/specials/SpecialPasswordReset.php +++ b/includes/specials/SpecialPasswordReset.php @@ -79,7 +79,8 @@ class SpecialPasswordReset extends FormSpecialPage { $a = []; if ( isset( $resetRoutes['username'] ) && $resetRoutes['username'] ) { $a['Username'] = [ - 'type' => 'user', + 'type' => 'text', + 'default' => $this->getRequest()->getSession()->suggestLoginUsername(), 'label-message' => 'passwordreset-username', ]; diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php index 04be22b92d..cc7ed5598b 100644 --- a/includes/specials/SpecialPreferences.php +++ b/includes/specials/SpecialPreferences.php @@ -53,7 +53,10 @@ class SpecialPreferences extends SpecialPage { } $out->addModules( 'mediawiki.special.preferences.ooui' ); - $out->addModuleStyles( 'mediawiki.special.preferences.styles.ooui' ); + $out->addModuleStyles( [ + 'mediawiki.special.preferences.styles.ooui', + 'mediawiki.widgets.TagMultiselectWidget.styles', + ] ); $out->addModuleStyles( 'oojs-ui-widgets.styles' ); $session = $this->getRequest()->getSession(); diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 01ad657f3a..60e797e0c3 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -678,7 +678,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { */ protected function namespaceFilterForm( FormOptions $opts ) { $nsSelect = Html::namespaceSelector( - [ 'selected' => $opts['namespace'], 'all' => '' ], + [ 'selected' => $opts['namespace'], 'all' => '', 'in-user-lang' => true ], [ 'name' => 'namespace', 'id' => 'namespace' ] ); $nsLabel = Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ); diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index 7661f28694..50f3710143 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -205,7 +205,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { # Either submit or create our form if ( $this->mIsAllowed && $this->submitClicked ) { - $this->submit( $request ); + $this->submit(); } else { $this->showForm(); } diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php index b2d5a1633b..632415cc1d 100644 --- a/includes/specials/SpecialUnblock.php +++ b/includes/specials/SpecialUnblock.php @@ -248,6 +248,7 @@ class SpecialUnblock extends SpecialPage { if ( isset( $data['Tags'] ) ) { $logEntry->setTags( $data['Tags'] ); } + $logEntry->setRelations( [ 'ipb_id' => $block->getId() ] ); $logId = $logEntry->insert(); $logEntry->publish( $logId ); diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index be0d3faad6..cd754ca03d 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -23,6 +23,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Storage\NameTableAccessException; use Wikimedia\Rdbms\IResultWrapper; /** @@ -555,15 +556,9 @@ class SpecialUndelete extends SpecialPage { $diffContext->setWikiPage( WikiPage::factory( $currentRev->getTitle() ) ); $diffEngine = $currentRev->getContentHandler()->createDifferenceEngine( $diffContext ); + $diffEngine->setRevisions( $previousRev->getRevisionRecord(), $currentRev->getRevisionRecord() ); $diffEngine->showDiffStyle(); - - $formattedDiff = $diffEngine->generateContentDiffBody( - $previousRev->getContent( Revision::FOR_THIS_USER, $this->getUser() ), - $currentRev->getContent( Revision::FOR_THIS_USER, $this->getUser() ) - ); - - $formattedDiff = $diffEngine->addHeader( - $formattedDiff, + $formattedDiff = $diffEngine->getDiff( $this->diffHeader( $previousRev, 'o' ), $this->diffHeader( $currentRev, 'n' ) ); @@ -602,12 +597,22 @@ class SpecialUndelete extends SpecialPage { $minor = $rev->isMinor() ? ChangesList::flag( 'minor' ) : ''; - $tags = wfGetDB( DB_REPLICA )->selectField( - 'tag_summary', - 'ts_tags', - [ 'ts_rev_id' => $rev->getId() ], + $tagIds = wfGetDB( DB_REPLICA )->selectFieldValues( + 'change_tag', + 'ct_tag_id', + [ 'ct_rev_id' => $rev->getId() ], __METHOD__ ); + $tags = []; + $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + foreach ( $tagIds as $tagId ) { + try { + $tags[] = $changeTagDefStore->getName( (int)$tagId ); + } catch ( NameTableAccessException $exception ) { + continue; + } + } + $tags = implode( ',', $tags ); $tagSummary = ChangeTags::formatSummaryRow( $tags, 'deleteddiff', $this->getContext() ); // FIXME This is reimplementing DifferenceEngine#getRevisionHeader diff --git a/includes/specials/SpecialUnusedcategories.php b/includes/specials/SpecialUnusedcategories.php index 1469742a4b..2577a100cf 100644 --- a/includes/specials/SpecialUnusedcategories.php +++ b/includes/specials/SpecialUnusedcategories.php @@ -39,7 +39,7 @@ class UnusedCategoriesPage extends QueryPage { public function getQueryInfo() { return [ - 'tables' => [ 'page', 'categorylinks' ], + 'tables' => [ 'page', 'categorylinks', 'page_props' ], 'fields' => [ 'namespace' => 'page_namespace', 'title' => 'page_title', @@ -48,9 +48,16 @@ class UnusedCategoriesPage extends QueryPage { 'conds' => [ 'cl_from IS NULL', 'page_namespace' => NS_CATEGORY, - 'page_is_redirect' => 0 + 'page_is_redirect' => 0, + 'pp_page IS NULL' ], - 'join_conds' => [ 'categorylinks' => [ 'LEFT JOIN', 'cl_to = page_title' ] ] + 'join_conds' => [ + 'categorylinks' => [ 'LEFT JOIN', 'cl_to = page_title' ], + 'page_props' => [ 'LEFT JOIN', [ + 'page_id = pp_page', + 'pp_propname' => 'expectunusedcategory' + ] ] + ] ]; } diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php index 9fcbf15f78..bcb3b85e36 100644 --- a/includes/specials/SpecialUnusedimages.php +++ b/includes/specials/SpecialUnusedimages.php @@ -76,6 +76,11 @@ class UnusedimagesPage extends ImageQueryPage { } function getPageHeader() { + if ( $this->getConfig()->get( 'CountCategorizedImagesAsUsed' ) ) { + return $this->msg( + 'unusedimagestext-categorizedimgisused' + )->parseAsBlock(); + } return $this->msg( 'unusedimagestext' )->parseAsBlock(); } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index feb449c847..0fc6e13c41 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -155,7 +155,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { 'activeValue' => false, 'default' => $this->getUser()->getBoolOption( 'extendwatchlist' ), 'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, - &$fields, &$conds, &$query_options, &$join_conds ) { + &$fields, &$conds, &$query_options, &$join_conds ) { $nonRevisionTypes = [ RC_LOG ]; Hooks::run( 'SpecialWatchlistGetNonRevisionTypes', [ &$nonRevisionTypes ] ); if ( $nonRevisionTypes ) { @@ -211,7 +211,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { ], 'default' => ChangesListStringOptionsFilterGroup::NONE, 'queryCallable' => function ( $specialPageClassName, $context, $dbr, - &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) { + &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) { if ( $selectedValues === [ 'seen' ] ) { $conds[] = $dbr->makeList( [ 'wl_notificationtimestamp IS NULL', @@ -652,7 +652,8 @@ class SpecialWatchlist extends ChangesListSpecialPage { [ 'selected' => $opts['namespace'], 'all' => '', - 'label' => $this->msg( 'namespace' )->text() + 'label' => $this->msg( 'namespace' )->text(), + 'in-user-lang' => true, ], [ 'name' => 'namespace', 'id' => 'namespace', diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php index 1d3ffd795a..766e190250 100644 --- a/includes/specials/SpecialWhatlinkshere.php +++ b/includes/specials/SpecialWhatlinkshere.php @@ -200,7 +200,7 @@ class SpecialWhatLinksHere extends IncludableSpecialPage { && ( $hidetrans || !$tlRes->numRows() ) && ( $hideimages || !$ilRes->numRows() ) ) { - if ( 0 == $level ) { + if ( $level == 0 ) { if ( !$this->including() ) { $out->addHTML( $this->whatlinkshereForm() ); @@ -461,11 +461,11 @@ class SpecialWhatLinksHere extends IncludableSpecialPage { $changed = $this->opts->getChangedValues(); unset( $changed['target'] ); // Already in the request title - if ( 0 != $prevId ) { + if ( $prevId != 0 ) { $overrides = [ 'from' => $this->opts->getValue( 'back' ) ]; $prev = $this->makeSelfLink( $prev, array_merge( $changed, $overrides ) ); } - if ( 0 != $nextId ) { + if ( $nextId != 0 ) { $overrides = [ 'from' => $nextId, 'back' => $prevId ]; $next = $this->makeSelfLink( $next, array_merge( $changed, $overrides ) ); } @@ -515,7 +515,8 @@ class SpecialWhatLinksHere extends IncludableSpecialPage { [ 'selected' => $namespace, 'all' => '', - 'label' => $this->msg( 'namespace' )->text() + 'label' => $this->msg( 'namespace' )->text(), + 'in-user-lang' => true, ], [ 'name' => 'namespace', 'id' => 'namespace', diff --git a/includes/specials/forms/PreferencesFormOOUI.php b/includes/specials/forms/PreferencesFormOOUI.php index bf4d9af80e..81abf1c8e1 100644 --- a/includes/specials/forms/PreferencesFormOOUI.php +++ b/includes/specials/forms/PreferencesFormOOUI.php @@ -227,8 +227,7 @@ class PreferencesFormOOUI extends OOUIHTMLForm { * @return string */ function getLegend( $key ) { - $aliasKey = ( $key === 'optoutwatchlist' || $key === 'optoutrc' ) ? 'opt-out' : $key; - $legend = parent::getLegend( $aliasKey ); + $legend = parent::getLegend( $key ); Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] ); return $legend; } diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index 552e92fb00..50f1d6b8b0 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -136,7 +136,7 @@ class ActiveUsersPager extends UsersPager { ]; } - function doBatchLookups() { + protected function doBatchLookups() { parent::doBatchLookups(); $uids = []; @@ -149,14 +149,17 @@ class ActiveUsersPager extends UsersPager { // is done in two queries to avoid huge quicksorts and to make COUNT(*) correct. $dbr = $this->getDatabase(); $res = $dbr->select( 'ipblocks', - [ 'ipb_user', 'MAX(ipb_deleted) AS block_status' ], + [ 'ipb_user', 'MAX(ipb_deleted) AS deleted, MAX(ipb_sitewide) AS sitewide' ], [ 'ipb_user' => $uids ], __METHOD__, [ 'GROUP BY' => [ 'ipb_user' ] ] ); $this->blockStatusByUid = []; foreach ( $res as $row ) { - $this->blockStatusByUid[$row->ipb_user] = $row->block_status; // 0 or 1 + $this->blockStatusByUid[$row->ipb_user] = [ + 'deleted' => $row->deleted, + 'sitewide' => $row->sitewide, + ]; } $this->mResult->seek( 0 ); } @@ -181,13 +184,20 @@ class ActiveUsersPager extends UsersPager { $item = $lang->specialList( $ulinks, $groups ); + // If there is a block, 'deleted' and 'sitewide' are both set on + // $this->blockStatusByUid[$row->user_id]. + $blocked = ''; $isBlocked = isset( $this->blockStatusByUid[$row->user_id] ); - if ( $isBlocked && $this->blockStatusByUid[$row->user_id] == 1 ) { - $item = "$item"; + if ( $isBlocked ) { + if ( $this->blockStatusByUid[$row->user_id]['deleted'] == 1 ) { + $item = "$item"; + } + if ( $this->blockStatusByUid[$row->user_id]['sitewide'] == 1 ) { + $blocked = ' ' . $this->msg( 'listusers-blocked', $userName )->escaped(); + } } $count = $this->msg( 'activeusers-count' )->numParams( $row->recentedits ) ->params( $userName )->numParams( $this->RCMaxAge )->escaped(); - $blocked = $isBlocked ? ' ' . $this->msg( 'listusers-blocked', $userName )->escaped() : ''; return Html::rawElement( 'li', [], "{$item} [{$count}]{$blocked}" ); } diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index 6d5f64b7a2..bde7559f46 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -276,7 +276,7 @@ class AllMessagesTablePager extends TablePager { return $result; } - function getStartBody() { + protected function getStartBody() { $tableClass = $this->getTableClass(); return Xml::openElement( 'table', [ 'class' => "mw-datatable $tableClass", @@ -295,7 +295,11 @@ class AllMessagesTablePager extends TablePager {