Merge "Linker: Accept LinkTargets in makeCommentLink()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Sep 2017 10:15:54 +0000 (10:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Sep 2017 10:15:54 +0000 (10:15 +0000)
206 files changed:
autoload.php
composer.json
includes/AjaxDispatcher.php
includes/Block.php
includes/DefaultSettings.php
includes/EditPage.php
includes/FormOptions.php
includes/GlobalFunctions.php
includes/Licenses.php [deleted file]
includes/Linker.php
includes/OrderedStreamingForkController.php
includes/OutputPage.php
includes/Pingback.php
includes/Preferences.php
includes/Sanitizer.php
includes/TemplateParser.php
includes/Title.php
includes/Xml.php
includes/actions/InfoAction.php
includes/actions/MarkpatrolledAction.php
includes/api/ApiCSPReport.php
includes/api/ApiFormatBase.php
includes/api/ApiFormatFeedWrapper.php
includes/api/ApiMain.php
includes/api/ApiQuery.php
includes/api/ApiQueryBase.php
includes/api/ApiQueryGeneratorBase.php
includes/api/ApiQueryWatchlist.php
includes/api/ApiStashEdit.php
includes/api/ApiUsageException.php
includes/changes/ChangesListFilter.php
includes/collation/IcuCollation.php
includes/compat/normal/UtfNormalUtil.php
includes/config/GlobalVarConfig.php
includes/config/HashConfig.php
includes/config/MultiConfig.php
includes/content/AbstractContent.php
includes/debug/logger/monolog/AvroFormatter.php
includes/deferred/WANCacheReapUpdate.php
includes/externalstore/ExternalStoreHttp.php
includes/externalstore/ExternalStoreMwstore.php
includes/filerepo/FileBackendDBRepoWrapper.php
includes/filerepo/ForeignAPIRepo.php
includes/filerepo/file/LocalFile.php
includes/filerepo/file/OldLocalFile.php
includes/htmlform/HTMLFormField.php
includes/http/Http.php
includes/http/PhpHttpRequest.php
includes/installer/InstallerSessionProvider.php
includes/installer/MssqlUpdater.php
includes/installer/MysqlInstaller.php
includes/installer/PostgresUpdater.php
includes/installer/WebInstaller.php
includes/jobqueue/JobQueueSecondTestQueue.php
includes/jobqueue/aggregator/JobQueueAggregator.php
includes/libs/IP.php
includes/libs/MemoizedCallable.php
includes/libs/Xhprof.php
includes/libs/XhprofData.php
includes/libs/filebackend/FileBackendStore.php
includes/libs/mime/IEContentAnalyzer.php
includes/libs/objectcache/BagOStuff.php
includes/libs/objectcache/MemcachedBagOStuff.php
includes/libs/objectcache/WANObjectCache.php
includes/libs/rdbms/TransactionProfiler.php
includes/libs/rdbms/database/Database.php
includes/libs/rdbms/database/DatabaseMssql.php
includes/libs/rdbms/database/DatabasePostgres.php
includes/libs/rdbms/loadmonitor/LoadMonitor.php
includes/libs/stats/NullStatsdDataFactory.php
includes/libs/virtualrest/ParsoidVirtualRESTService.php
includes/libs/virtualrest/RestbaseVirtualRESTService.php
includes/libs/xmp/XMP.php
includes/media/WebP.php
includes/page/Article.php
includes/page/ImageHistoryPseudoPager.php
includes/page/WikiPage.php
includes/parser/BlockLevelPass.php
includes/parser/Parser.php
includes/parser/ParserOutput.php
includes/parser/Preprocessor.php
includes/parser/Preprocessor_Hash.php
includes/rcfeed/IRCColourfulRCFeedFormatter.php
includes/rcfeed/MachineReadableRCFeedFormatter.php
includes/rcfeed/RedisPubSubFeedEngine.php
includes/rcfeed/UDPRCFeedEngine.php
includes/resourceloader/ResourceLoaderImageModule.php
includes/resourceloader/ResourceLoaderSiteModule.php
includes/resourceloader/ResourceLoaderStartUpModule.php
includes/resourceloader/ResourceLoaderUploadDialogModule.php
includes/resourceloader/ResourceLoaderUserModule.php
includes/search/ParserOutputSearchDataExtractor.php
includes/search/SearchEngine.php
includes/search/SearchResultSet.php
includes/search/SearchSuggestionSet.php
includes/session/BotPasswordSessionProvider.php
includes/session/Session.php
includes/site/HashSiteStore.php
includes/skins/SkinTemplate.php
includes/specialpage/ChangesListSpecialPage.php
includes/specialpage/RedirectSpecialPage.php
includes/specialpage/WantedQueryPage.php
includes/specials/SpecialAllPages.php
includes/specials/SpecialBlock.php
includes/specials/SpecialEditWatchlist.php
includes/specials/SpecialImport.php
includes/specials/SpecialLinkSearch.php
includes/specials/SpecialNewpages.php
includes/specials/SpecialUnlinkAccounts.php
includes/specials/SpecialUpload.php
includes/specials/SpecialVersion.php
includes/specials/SpecialWantedfiles.php
includes/specials/SpecialWatchlist.php
includes/specials/formfields/EditWatchlistCheckboxSeriesField.php [new file with mode: 0644]
includes/specials/formfields/Licenses.php [new file with mode: 0644]
includes/specials/formfields/UploadSourceField.php [new file with mode: 0644]
includes/specials/forms/EditWatchlistNormalHTMLForm.php [new file with mode: 0644]
includes/specials/forms/PreferencesForm.php [new file with mode: 0644]
includes/specials/forms/UploadForm.php [new file with mode: 0644]
includes/specials/helpers/ImportReporter.php [new file with mode: 0644]
includes/specials/helpers/License.php [new file with mode: 0644]
includes/tidy/Balancer.php
includes/tidy/TidyDriverBase.php
includes/utils/AutoloadGenerator.php
languages/LanguageConverter.php
languages/data/ZhConversion.php
languages/i18n/ais.json
languages/i18n/az.json
languages/i18n/azb.json
languages/i18n/be-tarask.json
languages/i18n/bn.json
languages/i18n/ca.json
languages/i18n/csb.json
languages/i18n/de.json
languages/i18n/en.json
languages/i18n/fr.json
languages/i18n/glk.json
languages/i18n/gu.json
languages/i18n/he.json
languages/i18n/ko.json
languages/i18n/ku-latn.json
languages/i18n/lfn.json
languages/i18n/mk.json
languages/i18n/ml.json
languages/i18n/mwl.json
languages/i18n/my.json
languages/i18n/nb.json
languages/i18n/nn.json
languages/i18n/pl.json
languages/i18n/pt.json
languages/i18n/qqq.json
languages/i18n/ru.json
languages/i18n/sl.json
languages/i18n/sr-ec.json
languages/i18n/su.json
languages/i18n/zh-hans.json
maintenance/Maintenance.php
maintenance/addSite.php
maintenance/findDeprecated.php
maintenance/generateSitemap.php
maintenance/language/zhtable/toCN.manual
maintenance/language/zhtable/toHK.manual
maintenance/language/zhtable/toSimp.manual
maintenance/language/zhtable/toTW.manual
maintenance/language/zhtable/trad2simp.manual
maintenance/language/zhtable/tradphrases.manual
maintenance/language/zhtable/tradphrases_exclude.manual
maintenance/migrateComments.php
maintenance/populateIpChanges.php
maintenance/userOptions.inc
phpcs.xml
resources/src/mediawiki.action/images/close.png [new file with mode: 0644]
resources/src/mediawiki.action/images/close.svg [new file with mode: 0644]
resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
resources/src/mediawiki.language/mediawiki.language.js
resources/src/mediawiki.legacy/shared.css
resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
resources/src/mediawiki.ui/components/inputs.less
resources/src/mediawiki/mediawiki.feedback.css
resources/src/mediawiki/mediawiki.util.js
tests/integration/includes/http/MWHttpRequestTestCase.php
tests/parser/DbTestPreviewer.php
tests/parser/ParserTestPrinter.php
tests/parser/ParserTestResultNormalizer.php
tests/parser/ParserTestRunner.php
tests/parser/PhpunitTestRecorder.php
tests/parser/TidySupport.php
tests/parser/parserTests.txt
tests/phpunit/MediaWikiTestCase.php
tests/phpunit/ResourceLoaderTestCase.php
tests/phpunit/data/templates/recurse.mustache [new file with mode: 0644]
tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
tests/phpunit/includes/SanitizerTest.php
tests/phpunit/includes/TemplateParserTest.php
tests/phpunit/includes/XmlTest.php
tests/phpunit/includes/db/DatabaseTestHelper.php
tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
tests/phpunit/includes/specials/SpecialPageExecutor.php
tests/phpunit/includes/specials/SpecialPageTestBase.php
tests/phpunit/mocks/content/DummyContentHandlerForTesting.php
tests/phpunit/mocks/content/DummyNonTextContentHandler.php
tests/phpunit/mocks/filebackend/MockFSFile.php
tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js

index 4448204..61fd192 100644 (file)
@@ -421,8 +421,8 @@ $wgAutoloadLocalClasses = [
        'EditAction' => __DIR__ . '/includes/actions/EditAction.php',
        'EditCLI' => __DIR__ . '/maintenance/edit.php',
        'EditPage' => __DIR__ . '/includes/EditPage.php',
-       'EditWatchlistCheckboxSeriesField' => __DIR__ . '/includes/specials/SpecialEditWatchlist.php',
-       'EditWatchlistNormalHTMLForm' => __DIR__ . '/includes/specials/SpecialEditWatchlist.php',
+       'EditWatchlistCheckboxSeriesField' => __DIR__ . '/includes/specials/formfields/EditWatchlistCheckboxSeriesField.php',
+       'EditWatchlistNormalHTMLForm' => __DIR__ . '/includes/specials/forms/EditWatchlistNormalHTMLForm.php',
        'EmailConfirmation' => __DIR__ . '/includes/specials/SpecialConfirmemail.php',
        'EmailInvalidation' => __DIR__ . '/includes/specials/SpecialEmailInvalidate.php',
        'EmailNotification' => __DIR__ . '/includes/mail/EmailNotification.php',
@@ -633,7 +633,7 @@ $wgAutoloadLocalClasses = [
        'ImageQueryPage' => __DIR__ . '/includes/specialpage/ImageQueryPage.php',
        'ImportImages' => __DIR__ . '/maintenance/importImages.php',
        'ImportLogFormatter' => __DIR__ . '/includes/logging/ImportLogFormatter.php',
-       'ImportReporter' => __DIR__ . '/includes/specials/SpecialImport.php',
+       'ImportReporter' => __DIR__ . '/includes/specials/helpers/ImportReporter.php',
        'ImportSiteScripts' => __DIR__ . '/maintenance/importSiteScripts.php',
        'ImportSites' => __DIR__ . '/maintenance/importSites.php',
        'ImportSource' => __DIR__ . '/includes/import/ImportSource.php',
@@ -746,8 +746,8 @@ $wgAutoloadLocalClasses = [
        'Languages' => __DIR__ . '/maintenance/language/languages.inc',
        'LayeredParameterizedPassword' => __DIR__ . '/includes/password/LayeredParameterizedPassword.php',
        'LegacyLogFormatter' => __DIR__ . '/includes/logging/LogFormatter.php',
-       'License' => __DIR__ . '/includes/Licenses.php',
-       'Licenses' => __DIR__ . '/includes/Licenses.php',
+       'License' => __DIR__ . '/includes/specials/helpers/License.php',
+       'Licenses' => __DIR__ . '/includes/specials/formfields/Licenses.php',
        'LinkBatch' => __DIR__ . '/includes/cache/LinkBatch.php',
        'LinkCache' => __DIR__ . '/includes/cache/LinkCache.php',
        'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
@@ -1135,7 +1135,7 @@ $wgAutoloadLocalClasses = [
        'PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
        'PostgresUpdater' => __DIR__ . '/includes/installer/PostgresUpdater.php',
        'Preferences' => __DIR__ . '/includes/Preferences.php',
-       'PreferencesForm' => __DIR__ . '/includes/Preferences.php',
+       'PreferencesForm' => __DIR__ . '/includes/specials/forms/PreferencesForm.php',
        'PrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
        'PreprocessDump' => __DIR__ . '/maintenance/preprocessDump.php',
        'Preprocessor' => __DIR__ . '/includes/parser/Preprocessor.php',
@@ -1532,14 +1532,14 @@ $wgAutoloadLocalClasses = [
        'UploadChunkVerificationException' => __DIR__ . '/includes/upload/UploadFromChunks.php',
        'UploadChunkZeroLengthFileException' => __DIR__ . '/includes/upload/UploadFromChunks.php',
        'UploadDumper' => __DIR__ . '/maintenance/dumpUploads.php',
-       'UploadForm' => __DIR__ . '/includes/specials/SpecialUpload.php',
+       'UploadForm' => __DIR__ . '/includes/specials/forms/UploadForm.php',
        'UploadFromChunks' => __DIR__ . '/includes/upload/UploadFromChunks.php',
        'UploadFromFile' => __DIR__ . '/includes/upload/UploadFromFile.php',
        'UploadFromStash' => __DIR__ . '/includes/upload/UploadFromStash.php',
        'UploadFromUrl' => __DIR__ . '/includes/upload/UploadFromUrl.php',
        'UploadLogFormatter' => __DIR__ . '/includes/logging/UploadLogFormatter.php',
        'UploadSourceAdapter' => __DIR__ . '/includes/import/UploadSourceAdapter.php',
-       'UploadSourceField' => __DIR__ . '/includes/specials/SpecialUpload.php',
+       'UploadSourceField' => __DIR__ . '/includes/specials/formfields/UploadSourceField.php',
        'UploadStash' => __DIR__ . '/includes/upload/UploadStash.php',
        'UploadStashBadPathException' => __DIR__ . '/includes/upload/UploadStash.php',
        'UploadStashCleanup' => __DIR__ . '/maintenance/cleanupUploadStash.php',
index dd7567c..70d2e8f 100644 (file)
@@ -54,7 +54,7 @@
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
                "justinrainbow/json-schema": "~5.2",
-               "mediawiki/mediawiki-codesniffer": "0.11.0",
+               "mediawiki/mediawiki-codesniffer": "0.12.0",
                "monolog/monolog": "~1.22.1",
                "nikic/php-parser": "2.1.0",
                "nmred/kafka-php": "0.1.5",
index 2adbc80..75fcff3 100644 (file)
@@ -56,6 +56,7 @@ class AjaxDispatcher {
 
        /**
         * Load up our object with user supplied data
+        * @param Config $config
         */
        function __construct( Config $config ) {
                $this->config = $config;
index 40095f1..5a4c43e 100644 (file)
@@ -1329,7 +1329,7 @@ class Block {
         * which in turn gives User::getName().
         *
         * @param string|int|User|null $target
-        * @return array( User|String|null, Block::TYPE_ constant|null )
+        * @return array [ User|String|null, Block::TYPE_ constant|null ]
         */
        public static function parseTarget( $target ) {
                # We may have been through this before
@@ -1396,7 +1396,7 @@ class Block {
         * Get the target and target type for this particular Block.  Note that for autoblocks,
         * this returns the unredacted name; frontend functions need to call $block->getRedactedName()
         * in this situation.
-        * @return array( User|String, Block::TYPE_ constant )
+        * @return array [ User|String, Block::TYPE_ constant ]
         * @todo FIXME: This should be an integral part of the Block member variables
         */
        public function getTargetAndType() {
index cf8e089..5b77d16 100644 (file)
@@ -3394,8 +3394,8 @@ $wgExperimentalHtmlIds = false;
 /**
  * How should section IDs be encoded?
  * This array can contain 1 or 2 elements, each of them can be one of:
- * - 'html5'  is modern HTML5 style encoding with minimal escaping. Allows to
- *            display Unicode characters in many browsers' address bars.
+ * - 'html5'  is modern HTML5 style encoding with minimal escaping. Displays Unicode
+ *            characters in most browsers' address bars.
  * - 'legacy' is old MediaWiki-style encoding, e.g. 啤酒 turns into .E5.95.A4.E9.85.92
  * - 'html5-legacy' corresponds to DEPRECATED $wgExperimentalHtmlIds mode. DO NOT use
  *            it for anything but migration off that mode (see below).
@@ -4920,6 +4920,7 @@ $wgDefaultUserOptions = [
        'previewontop' => 1,
        'rcdays' => 7,
        'rcenhancedfilters' => 0,
+       'rcenhancedfilters-disable' => 0,
        'rclimit' => 50,
        'rows' => 25, // @deprecated since 1.29 No longer used in core
        'showhiddencats' => 0,
@@ -6829,19 +6830,37 @@ $wgRCWatchCategoryMembership = false;
  */
 $wgUseRCPatrol = true;
 
+/**
+ * Whether a preference is displayed for structured change filters.
+ * If false, no preference is displayed and structured change filters are disabled.
+ * If true, structured change filters are *enabled* by default, and a preference is displayed
+ * that lets users disable them.
+ *
+ * Temporary variable during development and will be removed.
+ *
+ * @since 1.30
+ */
+$wgStructuredChangeFiltersShowPreference = false;
+
 /**
  * Whether to show the new experimental views (like namespaces, tags, and users) in
  * RecentChanges filters
+ *
+ * Temporary variable during development and will be removed.
  */
 $wgStructuredChangeFiltersEnableExperimentalViews = false;
 
 /**
  * Whether to allow users to use the experimental live update feature in the new RecentChanges UI
+ *
+ * Temporary variable during development and will be removed.
  */
 $wgStructuredChangeFiltersEnableLiveUpdate = false;
 
 /**
  * Whether to enable RCFilters app on Special:Watchlist
+ *
+ * Temporary variable during development and will be removed.
  */
 $wgStructuredChangeFiltersOnWatchlist = false;
 
index 06a5cc3..9f3f586 100644 (file)
@@ -2915,7 +2915,7 @@ class EditPage {
                                }
                        }
 
-                       $buttonLabel = $this->context->msg( $this->getSaveButtonLabel() )->text();
+                       $buttonLabel = $this->context->msg( $this->getSubmitButtonLabel() )->text();
 
                        if ( $this->missingComment ) {
                                $out->wrapWikiMsg( "<div id='mw-missingcommenttext'>\n$1\n</div>", 'missingcommenttext' );
@@ -3794,7 +3794,7 @@ class EditPage {
         * @return string
         */
        public function getPreviewText() {
-               global $wgRawHtml, $wgLang;
+               global $wgRawHtml;
                global $wgAllowUserCss, $wgAllowUserJs;
 
                $out = $this->context->getOutput();
@@ -3830,7 +3830,8 @@ class EditPage {
 
                        # provide a anchor link to the editform
                        $continueEditing = '<span class="mw-continue-editing">' .
-                               '[[#' . self::EDITFORM_ID . '|' . $wgLang->getArrow() . ' ' .
+                               '[[#' . self::EDITFORM_ID . '|' .
+                               $this->context->getLanguage()->getArrow() . ' ' .
                                $this->context->msg( 'continue-editing' )->text() . ']]</span>';
                        if ( $this->mTriedSave && !$this->mTokenOk ) {
                                if ( $this->mTokenOkExceptSuffix ) {
@@ -4333,9 +4334,9 @@ class EditPage {
         *
         * @return string
         */
-       private function getSaveButtonLabel() {
+       protected function getSubmitButtonLabel() {
                $labelAsPublish =
-                       $this->mArticle->getContext()->getConfig()->get( 'EditSubmitButtonLabelPublish' );
+                       $this->context->getConfig()->get( 'EditSubmitButtonLabelPublish' );
 
                // Can't use $this->isNew as that's also true if we're adding a new section to an extant page
                $newPage = !$this->mTitle->exists();
@@ -4360,7 +4361,7 @@ class EditPage {
        public function getEditButtons( &$tabindex ) {
                $buttons = [];
 
-               $buttonLabel = $this->context->msg( $this->getSaveButtonLabel() )->text();
+               $buttonLabel = $this->context->msg( $this->getSubmitButtonLabel() )->text();
 
                $attribs = [
                        'name' => 'wpSave',
@@ -4448,11 +4449,10 @@ class EditPage {
         * @param string|array|bool $match Text (or array of texts) which triggered one or more filters
         */
        public function spamPageWithContent( $match = false ) {
-               global $wgLang;
                $this->textbox2 = $this->textbox1;
 
                if ( is_array( $match ) ) {
-                       $match = $wgLang->listToText( $match );
+                       $match = $this->context->getLanguage()->listToText( $match );
                }
                $out = $this->context->getOutput();
                $out->prepareErrorPage( $this->context->msg( 'spamprotectiontitle' ) );
@@ -4640,19 +4640,20 @@ class EditPage {
         * @since 1.29
         */
        protected function addLongPageWarningHeader() {
-               global $wgMaxArticleSize, $wgLang;
+               global $wgMaxArticleSize;
 
                if ( $this->contentLength === false ) {
                        $this->contentLength = strlen( $this->textbox1 );
                }
 
                $out = $this->context->getOutput();
+               $lang = $this->context->getLanguage();
                if ( $this->tooBig || $this->contentLength > $wgMaxArticleSize * 1024 ) {
                        $out->wrapWikiMsg( "<div class='error' id='mw-edit-longpageerror'>\n$1\n</div>",
                                [
                                        'longpageerror',
-                                       $wgLang->formatNum( round( $this->contentLength / 1024, 3 ) ),
-                                       $wgLang->formatNum( $wgMaxArticleSize )
+                                       $lang->formatNum( round( $this->contentLength / 1024, 3 ) ),
+                                       $lang->formatNum( $wgMaxArticleSize )
                                ]
                        );
                } else {
@@ -4660,7 +4661,7 @@ class EditPage {
                                $out->wrapWikiMsg( "<div id='mw-edit-longpage-hint'>\n$1\n</div>",
                                        [
                                                'longpage-hint',
-                                               $wgLang->formatSize( strlen( $this->textbox1 ) ),
+                                               $lang->formatSize( strlen( $this->textbox1 ) ),
                                                strlen( $this->textbox1 )
                                        ]
                                );
@@ -4717,7 +4718,7 @@ class EditPage {
        protected function addExplainConflictHeader( OutputPage $out ) {
                $out->wrapWikiMsg(
                        "<div class='mw-explainconflict'>\n$1\n</div>",
-                       [ 'explainconflict', $this->context->msg( $this->getSaveButtonLabel() )->text() ]
+                       [ 'explainconflict', $this->context->msg( $this->getSubmitButtonLabel() )->text() ]
                );
        }
 
index 725a512..53c8d3b 100644 (file)
@@ -246,6 +246,9 @@ class FormOptions implements ArrayAccess {
 
        /**
         * @see validateBounds()
+        * @param string $name
+        * @param int $min
+        * @param int $max
         */
        public function validateIntBounds( $name, $min, $max ) {
                $this->validateBounds( $name, $min, $max );
index fa97515..e80ecf1 100644 (file)
@@ -3160,6 +3160,7 @@ function wfShorthandToInteger( $string = '', $default = -1 ) {
 /**
  * Get the normalised IETF language tag
  * See unit test for examples.
+ * See mediawiki.language.bcp47 for the JavaScript implementation.
  *
  * @param string $code The language code.
  * @return string The language code which complying with BCP 47 standards.
diff --git a/includes/Licenses.php b/includes/Licenses.php
deleted file mode 100644 (file)
index 6467777..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * License selector for use on Special:Upload.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup SpecialPage
- * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
- */
-
-/**
- * A License class for use on Special:Upload
- */
-class Licenses extends HTMLFormField {
-       /** @var string */
-       protected $msg;
-
-       /** @var array */
-       protected $licenses = [];
-
-       /** @var string */
-       protected $html;
-       /**#@-*/
-
-       /**
-        * @param array $params
-        */
-       public function __construct( $params ) {
-               parent::__construct( $params );
-
-               $this->msg = empty( $params['licenses'] )
-                       ? wfMessage( 'licenses' )->inContentLanguage()->plain()
-                       : $params['licenses'];
-               $this->selected = null;
-
-               $this->makeLicenses();
-       }
-
-       /**
-        * @private
-        */
-       protected function makeLicenses() {
-               $levels = [];
-               $lines = explode( "\n", $this->msg );
-
-               foreach ( $lines as $line ) {
-                       if ( strpos( $line, '*' ) !== 0 ) {
-                               continue;
-                       } else {
-                               list( $level, $line ) = $this->trimStars( $line );
-
-                               if ( strpos( $line, '|' ) !== false ) {
-                                       $obj = new License( $line );
-                                       $this->stackItem( $this->licenses, $levels, $obj );
-                               } else {
-                                       if ( $level < count( $levels ) ) {
-                                               $levels = array_slice( $levels, 0, $level );
-                                       }
-                                       if ( $level == count( $levels ) ) {
-                                               $levels[$level - 1] = $line;
-                                       } elseif ( $level > count( $levels ) ) {
-                                               $levels[] = $line;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       /**
-        * @param string $str
-        * @return array
-        */
-       protected function trimStars( $str ) {
-               $numStars = strspn( $str, '*' );
-               return [ $numStars, ltrim( substr( $str, $numStars ), ' ' ) ];
-       }
-
-       /**
-        * @param array &$list
-        * @param array $path
-        * @param mixed $item
-        */
-       protected function stackItem( &$list, $path, $item ) {
-               $position =& $list;
-               if ( $path ) {
-                       foreach ( $path as $key ) {
-                               $position =& $position[$key];
-                       }
-               }
-               $position[] = $item;
-       }
-
-       /**
-        * @param array $tagset
-        * @param int $depth
-        */
-       protected function makeHtml( $tagset, $depth = 0 ) {
-               foreach ( $tagset as $key => $val ) {
-                       if ( is_array( $val ) ) {
-                               $this->html .= $this->outputOption(
-                                       $key, '',
-                                       [
-                                               'disabled' => 'disabled',
-                                               'style' => 'color: GrayText', // for MSIE
-                                       ],
-                                       $depth
-                               );
-                               $this->makeHtml( $val, $depth + 1 );
-                       } else {
-                               $this->html .= $this->outputOption(
-                                       $val->text, $val->template,
-                                       [ 'title' => '{{' . $val->template . '}}' ],
-                                       $depth
-                               );
-                       }
-               }
-       }
-
-       /**
-        * @param string $message
-        * @param string $value
-        * @param null|array $attribs
-        * @param int $depth
-        * @return string
-        */
-       protected function outputOption( $message, $value, $attribs = null, $depth = 0 ) {
-               $msgObj = $this->msg( $message );
-               $text = $msgObj->exists() ? $msgObj->text() : $message;
-               $attribs['value'] = $value;
-               if ( $value === $this->selected ) {
-                       $attribs['selected'] = 'selected';
-               }
-
-               $val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $text;
-               return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
-       }
-
-       /**#@-*/
-
-       /**
-        *  Accessor for $this->licenses
-        *
-        * @return array
-        */
-       public function getLicenses() {
-               return $this->licenses;
-       }
-
-       /**
-        * Accessor for $this->html
-        *
-        * @param bool $value
-        *
-        * @return string
-        */
-       public function getInputHTML( $value ) {
-               $this->selected = $value;
-
-               $this->html = $this->outputOption( wfMessage( 'nolicense' )->text(), '',
-                       (bool)$this->selected ? null : [ 'selected' => 'selected' ] );
-               $this->makeHtml( $this->getLicenses() );
-
-               $attribs = [
-                       'name' => $this->mName,
-                       'id' => $this->mID
-               ];
-               if ( !empty( $this->mParams['disabled'] ) ) {
-                       $attibs['disabled'] = 'disabled';
-               }
-
-               return Html::rawElement( 'select', $attribs, $this->html );
-       }
-}
-
-/**
- * A License class for use on Special:Upload (represents a single type of license).
- */
-class License {
-       /** @var string */
-       public $template;
-
-       /** @var string */
-       public $text;
-
-       /**
-        * @param string $str License name??
-        */
-       function __construct( $str ) {
-               list( $text, $template ) = explode( '|', strrev( $str ), 2 );
-
-               $this->template = strrev( $template );
-               $this->text = strrev( $text );
-       }
-}
index a55067d..c24ae41 100644 (file)
@@ -1537,10 +1537,16 @@ class Linker {
                if ( $sectionIndex !== false ) {
                        $classes .= " tocsection-$sectionIndex";
                }
-               return "\n<li class=\"$classes\"><a href=\"#" .
-                       $anchor . '"><span class="tocnumber">' .
-                       $tocnumber . '</span> <span class="toctext">' .
-                       $tocline . '</span></a>';
+
+               // \n<li class="$classes"><a href="#$anchor"><span class="tocnumber">
+               // $tocnumber</span> <span class="toctext">$tocline</span></a>
+               return "\n" . Html::openElement( 'li', [ 'class' => $classes ] )
+                       . Html::rawElement( 'a',
+                               [ 'href' => "#$anchor" ],
+                               Html::element( 'span', [ 'class' => 'tocnumber' ], $tocnumber )
+                                       . ' '
+                                       . Html::rawElement( 'span', [ 'class' => 'toctext' ], $tocline )
+                       );
        }
 
        /**
index 1436c1c..ff29cb5 100644 (file)
@@ -56,7 +56,7 @@ class OrderedStreamingForkController extends ForkController {
        }
 
        /**
-        * {@inheritDoc}
+        * @inheritDoc
         */
        public function start() {
                if ( $this->procsToStart > 0 ) {
index dd21194..5216146 100644 (file)
@@ -139,6 +139,9 @@ class OutputPage extends ContextSource {
        /** @var array Array of elements in "<head>". Parser might add its own headers! */
        protected $mHeadItems = [];
 
+       /** @var array Additional <body> classes; there are also <body> classes from other sources */
+       protected $mAdditionalBodyClasses = [];
+
        /** @var array */
        protected $mModules = [];
 
@@ -705,6 +708,16 @@ class OutputPage extends ContextSource {
                return isset( $this->mHeadItems[$name] );
        }
 
+       /**
+        * Add a class to the <body> element
+        *
+        * @since 1.30
+        * @param string|string[] $classes One or more classes to add
+        */
+       public function addBodyClasses( $classes ) {
+               $this->mAdditionalBodyClasses = array_merge( $this->mAdditionalBodyClasses, (array)$classes );
+       }
+
        /**
         * @deprecated since 1.28 Obsolete - wgUseETag experiment was removed.
         * @param string $tag
@@ -2013,7 +2026,7 @@ class OutputPage extends ContextSource {
                }
 
                $age = time() - wfTimestamp( TS_UNIX, $mtime );
-               $adaptiveTTL = max( .9 * $age, $minTTL );
+               $adaptiveTTL = max( 0.9 * $age, $minTTL );
                $adaptiveTTL = min( $adaptiveTTL, $maxTTL );
 
                $this->lowerCdnMaxage( (int)$adaptiveTTL );
@@ -2923,7 +2936,7 @@ class OutputPage extends ContextSource {
 
                $pieces[] = Html::closeElement( 'head' );
 
-               $bodyClasses = [];
+               $bodyClasses = $this->mAdditionalBodyClasses;
                $bodyClasses[] = 'mediawiki';
 
                # Classes for LTR/RTL directionality support
index bd1b2a2..c3393bc 100644 (file)
@@ -228,6 +228,7 @@ class Pingback {
         *
         * The schema for the data is located at:
         * <https://meta.wikimedia.org/wiki/Schema:MediaWikiPingback>
+        * @return bool
         */
        public function sendPingback() {
                if ( !$this->acquireLock() ) {
index c64e8a8..0bb1d28 100644 (file)
@@ -1,7 +1,5 @@
 <?php
 /**
- * Form to edit user preferences.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -958,6 +956,15 @@ class Preferences {
                                'label-message' => 'tog-shownumberswatching',
                        ];
                }
+
+               if ( $config->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       $defaultPreferences['rcenhancedfilters-disable'] = [
+                               'type' => 'toggle',
+                               'section' => 'rc/advancedrc',
+                               'label-message' => 'rcfilters-preference-label',
+                               'help-message' => 'rcfilters-preference-help',
+                       ];
+               }
        }
 
        /**
@@ -1626,123 +1633,3 @@ class Preferences {
                return $timeZoneList;
        }
 }
-
-/** Some tweaks to allow js prefs to work */
-class PreferencesForm extends HTMLForm {
-       // Override default value from HTMLForm
-       protected $mSubSectionBeforeFields = false;
-
-       private $modifiedUser;
-
-       /**
-        * @param User $user
-        */
-       public function setModifiedUser( $user ) {
-               $this->modifiedUser = $user;
-       }
-
-       /**
-        * @return User
-        */
-       public function getModifiedUser() {
-               if ( $this->modifiedUser === null ) {
-                       return $this->getUser();
-               } else {
-                       return $this->modifiedUser;
-               }
-       }
-
-       /**
-        * Get extra parameters for the query string when redirecting after
-        * successful save.
-        *
-        * @return array
-        */
-       public function getExtraSuccessRedirectParameters() {
-               return [];
-       }
-
-       /**
-        * @param string $html
-        * @return string
-        */
-       function wrapForm( $html ) {
-               $html = Xml::tags( 'div', [ 'id' => 'preferences' ], $html );
-
-               return parent::wrapForm( $html );
-       }
-
-       /**
-        * @return string
-        */
-       function getButtons() {
-               $attrs = [ 'id' => 'mw-prefs-restoreprefs' ];
-
-               if ( !$this->getModifiedUser()->isAllowedAny( 'editmyprivateinfo', 'editmyoptions' ) ) {
-                       return '';
-               }
-
-               $html = parent::getButtons();
-
-               if ( $this->getModifiedUser()->isAllowed( 'editmyoptions' ) ) {
-                       $t = $this->getTitle()->getSubpage( 'reset' );
-
-                       $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-                       $html .= "\n" . $linkRenderer->makeLink( $t, $this->msg( 'restoreprefs' )->text(),
-                               Html::buttonAttributes( $attrs, [ 'mw-ui-quiet' ] ) );
-
-                       $html = Xml::tags( 'div', [ 'class' => 'mw-prefs-buttons' ], $html );
-               }
-
-               return $html;
-       }
-
-       /**
-        * Separate multi-option preferences into multiple preferences, since we
-        * have to store them separately
-        * @param array $data
-        * @return array
-        */
-       function filterDataForSubmit( $data ) {
-               foreach ( $this->mFlatFields as $fieldname => $field ) {
-                       if ( $field instanceof HTMLNestedFilterable ) {
-                               $info = $field->mParams;
-                               $prefix = isset( $info['prefix'] ) ? $info['prefix'] : $fieldname;
-                               foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) {
-                                       $data["$prefix$key"] = $value;
-                               }
-                               unset( $data[$fieldname] );
-                       }
-               }
-
-               return $data;
-       }
-
-       /**
-        * Get the whole body of the form.
-        * @return string
-        */
-       function getBody() {
-               return $this->displaySection( $this->mFieldTree, '', 'mw-prefsection-' );
-       }
-
-       /**
-        * Get the "<legend>" for a given section key. Normally this is the
-        * prefs-$key message but we'll allow extensions to override it.
-        * @param string $key
-        * @return string
-        */
-       function getLegend( $key ) {
-               $legend = parent::getLegend( $key );
-               Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] );
-               return $legend;
-       }
-
-       /**
-        * Get the keys of each top level preference section.
-        * @return array of section keys
-        */
-       function getPreferenceSections() {
-               return array_keys( array_filter( $this->mFieldTree, 'is_array' ) );
-       }
-}
index ed09701..7d17cd1 100644 (file)
@@ -1284,7 +1284,6 @@ class Sanitizer {
                $mode = $wgFragmentMode[self::ID_PRIMARY];
 
                $id = self::escapeIdInternal( $id, $mode );
-               $id = self::urlEscapeId( $id, $mode );
 
                return $id;
        }
@@ -1302,23 +1301,6 @@ class Sanitizer {
                global $wgExternalInterwikiFragmentMode;
 
                $id = self::escapeIdInternal( $id, $wgExternalInterwikiFragmentMode );
-               $id = self::urlEscapeId( $id, $wgExternalInterwikiFragmentMode );
-
-               return $id;
-       }
-
-       /**
-        * Helper for escapeIdFor*() functions. URL-escapes the ID if needed.
-        *
-        * @param string $id String to escape
-        * @param string $mode One of modes from $wgFragmentMode
-        * @return string
-        */
-       private static function urlEscapeId( $id, $mode ) {
-               if ( $mode === 'html5' ) {
-                       $id = urlencode( $id );
-                       $id = str_replace( '%3A', ':', $id );
-               }
 
                return $id;
        }
index 2759ff9..2293dab 100644 (file)
@@ -38,6 +38,13 @@ class TemplateParser {
         */
        protected $forceRecompile = false;
 
+       /**
+        * @var int Compilation flags passed to LightnCandy
+        */
+       // Do not add more flags here without discussion.
+       // If you do add more flags, be sure to update unit tests as well.
+       protected $compileFlags = LightnCandy::FLAG_ERROR_EXCEPTION;
+
        /**
         * @param string $templateDir
         * @param bool $forceRecompile
@@ -47,6 +54,18 @@ class TemplateParser {
                $this->forceRecompile = $forceRecompile;
        }
 
+       /**
+        * Enable/disable the use of recursive partials.
+        * @param bool $enable
+        */
+       public function enableRecursivePartials( $enable ) {
+               if ( $enable ) {
+                       $this->compileFlags = $this->compileFlags | LightnCandy::FLAG_RUNTIMEPARTIAL;
+               } else {
+                       $this->compileFlags = $this->compileFlags & ~LightnCandy::FLAG_RUNTIMEPARTIAL;
+               }
+       }
+
        /**
         * Constructs the location of the the source Mustache template
         * @param string $templateName The name of the template
@@ -73,11 +92,13 @@ class TemplateParser {
         * @throws RuntimeException
         */
        protected function getTemplate( $templateName ) {
+               $templateKey = $templateName . '|' . $this->compileFlags;
+
                // If a renderer has already been defined for this template, reuse it
-               if ( isset( $this->renderers[$templateName] ) &&
-                       is_callable( $this->renderers[$templateName] )
+               if ( isset( $this->renderers[$templateKey] ) &&
+                       is_callable( $this->renderers[$templateKey] )
                ) {
-                       return $this->renderers[$templateName];
+                       return $this->renderers[$templateKey];
                }
 
                $filename = $this->getTemplateFilename( $templateName );
@@ -90,7 +111,7 @@ class TemplateParser {
                $fileContents = file_get_contents( $filename );
 
                // Generate a quick hash for cache invalidation
-               $fastHash = md5( $fileContents );
+               $fastHash = md5( $this->compileFlags . '|' . $fileContents );
 
                // Fetch a secret key for building a keyed hash of the PHP code
                $config = MediaWikiServices::getInstance()->getMainConfig();
@@ -127,7 +148,7 @@ class TemplateParser {
                if ( !is_callable( $renderer ) ) {
                        throw new RuntimeException( "Requested template, {$templateName}, is not callable" );
                }
-               $this->renderers[$templateName] = $renderer;
+               $this->renderers[$templateKey] = $renderer;
                return $renderer;
        }
 
@@ -168,9 +189,7 @@ class TemplateParser {
                return LightnCandy::compile(
                        $code,
                        [
-                               // Do not add more flags here without discussion.
-                               // If you do add more flags, be sure to update unit tests as well.
-                               'flags' => LightnCandy::FLAG_ERROR_EXCEPTION,
+                               'flags' => $this->compileFlags,
                                'basedir' => $this->templateDir,
                                'fileext' => '.mustache',
                        ]
index 8cfeb88..3da6ab9 100644 (file)
@@ -1797,7 +1797,7 @@ class Title implements LinkTarget {
         * @see self::getLocalURL for the arguments.
         * @param array|string $query
         * @param string $proto Protocol type to use in URL
-        * @return String. A url suitable to use in an HTTP location header.
+        * @return string A url suitable to use in an HTTP location header.
         */
        public function getFullUrlForRedirect( $query = '', $proto = PROTO_CURRENT ) {
                $target = $this;
@@ -1975,6 +1975,8 @@ class Title implements LinkTarget {
         * NOTE: Unlike getInternalURL(), the canonical URL includes the fragment
         *
         * @see self::getLocalURL for the arguments.
+        * @param string $query
+        * @param string|bool $query2
         * @return string The URL
         * @since 1.18
         */
index 16a5a9d..0091513 100644 (file)
@@ -493,7 +493,8 @@ class Xml {
        }
 
        /**
-        * Build a drop-down box from a textual list.
+        * Build a drop-down box from a textual list. This is a wrapper
+        * for Xml::listDropDownOptions() plus the XmlSelect class.
         *
         * @param string $name Name and id for the drop-down
         * @param string $list Correctly formatted text (newline delimited) to be
@@ -507,60 +508,91 @@ class Xml {
        public static function listDropDown( $name = '', $list = '', $other = '',
                $selected = '', $class = '', $tabindex = null
        ) {
-               $optgroup = false;
+               $options = self::listDropDownOptions( $list, [ 'other' => $other ] );
+
+               $xmlSelect = new XmlSelect( $name, $name, $selected );
+               $xmlSelect->addOptions( $options );
+
+               if ( $class ) {
+                       $xmlSelect->setAttribute( 'class', $class );
+               }
+               if ( $tabindex ) {
+                       $xmlSelect->setAttribute( 'tabindex', $tabindex );
+               }
 
-               $options = self::option( $other, 'other', $selected === 'other' );
+               return $xmlSelect->getHTML();
+       }
 
+       /**
+        * Build options for a drop-down box from a textual list.
+        *
+        * The result of this function can be passed to XmlSelect::addOptions()
+        * (to render a plain `<select>` dropdown box) or to Xml::listDropDownOptionsOoui()
+        * and then OOUI\DropdownInputWidget() (to render a pretty one).
+        *
+        * @param string $list Correctly formatted text (newline delimited) to be
+        *   used to generate the options.
+        * @param array $params Extra parameters
+        * @param string $params['other'] If set, add an option with this as text and a value of 'other'
+        * @return array Array keys are textual labels, values are internal values
+        */
+       public static function listDropDownOptions( $list, $params = [] ) {
+               $options = [];
+
+               if ( isset( $params['other'] ) ) {
+                       $options[ $params['other'] ] = 'other';
+               }
+
+               $optgroup = false;
                foreach ( explode( "\n", $list ) as $option ) {
                        $value = trim( $option );
                        if ( $value == '' ) {
                                continue;
                        } elseif ( substr( $value, 0, 1 ) == '*' && substr( $value, 1, 1 ) != '*' ) {
-                               // A new group is starting ...
+                               # A new group is starting...
                                $value = trim( substr( $value, 1 ) );
-                               if ( $optgroup ) {
-                                       $options .= self::closeElement( 'optgroup' );
-                               }
-                               $options .= self::openElement( 'optgroup', [ 'label' => $value ] );
-                               $optgroup = true;
+                               $optgroup = $value;
                        } elseif ( substr( $value, 0, 2 ) == '**' ) {
-                               // groupmember
-                               $value = trim( substr( $value, 2 ) );
-                               $options .= self::option( $value, $value, $selected === $value );
-                       } else {
-                               // groupless reason list
-                               if ( $optgroup ) {
-                                       $options .= self::closeElement( 'optgroup' );
+                               # groupmember
+                               $opt = trim( substr( $value, 2 ) );
+                               if ( $optgroup === false ) {
+                                       $options[$opt] = $opt;
+                               } else {
+                                       $options[$optgroup][$opt] = $opt;
                                }
-                               $options .= self::option( $value, $value, $selected === $value );
+                       } else {
+                               # groupless reason list
                                $optgroup = false;
+                               $options[$option] = $option;
                        }
                }
 
-               if ( $optgroup ) {
-                       $options .= self::closeElement( 'optgroup' );
-               }
-
-               $attribs = [];
-
-               if ( $name ) {
-                       $attribs['id'] = $name;
-                       $attribs['name'] = $name;
-               }
+               return $options;
+       }
 
-               if ( $class ) {
-                       $attribs['class'] = $class;
-               }
+       /**
+        * Convert options for a drop-down box into a format accepted by OOUI\DropdownInputWidget etc.
+        *
+        * TODO Find a better home for this function.
+        *
+        * @param array $options Options, as returned e.g. by Xml::listDropDownOptions()
+        * @return array
+        */
+       public static function listDropDownOptionsOoui( $options ) {
+               $optionsOoui = [];
 
-               if ( $tabindex ) {
-                       $attribs['tabindex'] = $tabindex;
+               foreach ( $options as $text => $value ) {
+                       if ( is_array( $value ) ) {
+                               $optionsOoui[] = [ 'optgroup' => (string)$text ];
+                               foreach ( $value as $text2 => $value2 ) {
+                                       $optionsOoui[] = [ 'data' => (string)$value2, 'label' => (string)$text2 ];
+                               }
+                       } else {
+                               $optionsOoui[] = [ 'data' => (string)$value, 'label' => (string)$text ];
+                       }
                }
 
-               return self::openElement( 'select', $attribs )
-                       . "\n"
-                       . $options
-                       . "\n"
-                       . self::closeElement( 'select' );
+               return $optionsOoui;
        }
 
        /**
index d3ba0aa..c5cd89f 100644 (file)
@@ -153,6 +153,7 @@ class InfoAction extends FormlessAction {
         * Creates a header that can be added to the output.
         *
         * @param string $header The header text.
+        * @param string $canonicalId
         * @return string The HTML.
         */
        protected function makeHeader( $header, $canonicalId ) {
index 611e683..66bedb2 100644 (file)
@@ -85,6 +85,7 @@ class MarkpatrolledAction extends FormAction {
        }
 
        /**
+        * @param array $data
         * @return bool|array True for success, false for didn't-try, array of errors on failure
         */
        public function onSubmit( $data ) {
index a4631d6..0df0ca9 100644 (file)
@@ -216,6 +216,7 @@ class ApiCSPReport extends ApiBase {
 
        /**
         * Mark as internal. This isn't meant to be used by normal api users
+        * @return bool
         */
        public function isInternal() {
                return true;
@@ -223,6 +224,7 @@ class ApiCSPReport extends ApiBase {
 
        /**
         * Even if you don't have read rights, we still want your report.
+        * @return bool
         */
        public function isReadMode() {
                return false;
@@ -232,6 +234,7 @@ class ApiCSPReport extends ApiBase {
         * Doesn't touch db, so max lag should be rather irrelavent.
         *
         * Also, this makes sure that reports aren't lost during lag events.
+        * @return bool
         */
        public function shouldCheckMaxLag() {
                return false;
index 36247dd..06eaa19 100644 (file)
@@ -132,6 +132,7 @@ abstract class ApiFormatBase extends ApiBase {
 
        /**
         * Overridden to honor $this->forceDefaultParams(), if applicable
+        * @inheritDoc
         * @since 1.26
         */
        protected function getParameterFromSettings( $paramName, $paramSettings, $parseLimit ) {
index d2bfd48..3ab5ab9 100644 (file)
@@ -72,6 +72,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
         * This class expects the result data to be in a custom format set by self::setResult()
         * $result['_feed'] - an instance of one of the $wgFeedClasses classes
         * $result['_feeditems'] - an array of FeedItem instances
+        * @param bool $unused
         */
        public function initPrinter( $unused = false ) {
                parent::initPrinter( $unused );
index e69300b..1415640 100644 (file)
@@ -1870,7 +1870,7 @@ class ApiMain extends ApiBase {
                ];
        }
 
-       /** @see ApiBase::getExamplesMessages() */
+       /** @inheritDoc */
        protected function getExamplesMessages() {
                return [
                        'action=help'
index 987bb99..44a46b8 100644 (file)
@@ -169,7 +169,7 @@ class ApiQuery extends ApiBase {
         * as the first, regardless of the values of $db and $groups
         * @param string $name Name to assign to the database connection
         * @param int $db One of the DB_* constants
-        * @param array $groups Query groups
+        * @param string|string[] $groups Query groups
         * @return IDatabase
         */
        public function getNamedDB( $name, $db, $groups ) {
index fe16134..6987dfb 100644 (file)
@@ -97,9 +97,7 @@ abstract class ApiQueryBase extends ApiBase {
                return $this->mQueryModule;
        }
 
-       /**
-        * @see ApiBase::getParent()
-        */
+       /** @inheritDoc */
        public function getParent() {
                return $this->getQuery();
        }
@@ -121,7 +119,7 @@ abstract class ApiQueryBase extends ApiBase {
         * See ApiQuery::getNamedDB() for more information
         * @param string $name Name to assign to the database connection
         * @param int $db One of the DB_* constants
-        * @param array $groups Query groups
+        * @param string|string[] $groups Query groups
         * @return IDatabase
         */
        public function selectNamedDB( $name, $db, $groups ) {
index f7b94c7..5acd75f 100644 (file)
@@ -93,12 +93,9 @@ abstract class ApiQueryGeneratorBase extends ApiQueryBase {
                }
        }
 
-       /**
-        * @see ApiBase::getHelpFlags()
-        *
-        * Corresponding messages: api-help-flag-generator
-        */
+       /** @inheritDoc */
        protected function getHelpFlags() {
+               // Corresponding messages: api-help-flag-generator
                $flags = parent::getHelpFlags();
                $flags[] = 'generator';
                return $flags;
index 2ab8524..1e3b2c7 100644 (file)
@@ -34,6 +34,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 
+       /** @var CommentStore */
        private $commentStore;
 
        public function __construct( ApiQuery $query, $moduleName ) {
@@ -260,10 +261,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 
        private function extractOutputData( WatchedItem $watchedItem, array $recentChangeInfo ) {
                /* Determine the title of the page that has been changed. */
-               $title = Title::makeTitle(
-                       $watchedItem->getLinkTarget()->getNamespace(),
-                       $watchedItem->getLinkTarget()->getDBkey()
-               );
+               $title = Title::newFromLinkTarget( $watchedItem->getLinkTarget() );
                $user = $this->getUser();
 
                /* Our output data. */
index d03fca8..8a9de06 100644 (file)
@@ -74,6 +74,9 @@ class ApiStashEdit extends ApiBase {
                if ( strlen( $params['stashedtexthash'] ) ) {
                        // Load from cache since the client indicates the text is the same as last stash
                        $textHash = $params['stashedtexthash'];
+                       if ( !preg_match( '/^[0-9a-f]{40}$/', $textHash ) ) {
+                               $this->dieWithError( 'apierror-stashedit-missingtext', 'missingtext' );
+                       }
                        $textKey = $cache->makeKey( 'stashedit', 'text', $textHash );
                        $text = $cache->get( $textKey );
                        if ( !is_string( $text ) ) {
index 17655ec..47902a7 100644 (file)
@@ -152,7 +152,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
        }
 
        /**
-        * @returns ApiMessage
+        * @return ApiMessage
         */
        private function getApiMessage() {
                $errors = $this->status->getErrorsByType( 'error' );
index 0b34a5d..2fc1006 100644 (file)
@@ -309,6 +309,7 @@ abstract class ChangesListFilter {
         * structured UI.
         *
         * This can either be the exact filter, or a new filter that replaces it.
+        * @return bool
         */
        public function isFeatureAvailableOnStructuredUi() {
                return $this->displaysOnStructuredUi();
index 54b04ee..efda596 100644 (file)
@@ -474,6 +474,8 @@ class IcuCollation extends Collation {
        }
 
        /**
+        * @param string $index
+        * @return string
         * @since 1.16.3
         */
        public function getLetterByIndex( $index ) {
@@ -481,6 +483,8 @@ class IcuCollation extends Collation {
        }
 
        /**
+        * @param string $index
+        * @return string
         * @since 1.16.3
         */
        public function getSortKeyByLetterIndex( $index ) {
@@ -488,6 +492,8 @@ class IcuCollation extends Collation {
        }
 
        /**
+        * @param string $index
+        * @return string
         * @since 1.16.3
         */
        public function getFirstLetterCount() {
@@ -496,6 +502,8 @@ class IcuCollation extends Collation {
 
        /**
         * Test if a code point is a CJK (Chinese, Japanese, Korean) character
+        * @param int $codepoint
+        * @return bool
         * @since 1.16.3
         */
        public static function isCjk( $codepoint ) {
index 8791e4c..d60c8e3 100644 (file)
@@ -90,7 +90,7 @@ function utf8ToCodepoint( $char ) {
  * Escape a string for inclusion in a PHP single-quoted string literal.
  *
  * @param string $string string to be escaped.
- * @return String: escaped string.
+ * @return string escaped string.
  * @public
  * @deprecated since 1.25, use UtfNormal\Utils directly
  */
index 589f7d3..6295371 100644 (file)
@@ -46,7 +46,7 @@ class GlobalVarConfig implements Config {
        }
 
        /**
-        * @see Config::get
+        * @inheritDoc
         */
        public function get( $name ) {
                if ( !$this->has( $name ) ) {
@@ -56,7 +56,7 @@ class GlobalVarConfig implements Config {
        }
 
        /**
-        * @see Config::has
+        * @inheritDoc
         */
        public function has( $name ) {
                return $this->hasWithPrefix( $this->prefix, $name );
index 4d6c68c..d020d20 100644 (file)
@@ -49,7 +49,7 @@ class HashConfig implements Config, MutableConfig {
        }
 
        /**
-        * @see Config::get
+        * @inheritDoc
         */
        public function get( $name ) {
                if ( !$this->has( $name ) ) {
@@ -60,7 +60,8 @@ class HashConfig implements Config, MutableConfig {
        }
 
        /**
-        * @see Config::has
+        * @inheritDoc
+        * @since 1.24
         */
        public function has( $name ) {
                return array_key_exists( $name, $this->settings );
@@ -68,6 +69,8 @@ class HashConfig implements Config, MutableConfig {
 
        /**
         * @see MutableConfig::set
+        * @param string $name
+        * @param mixed $value
         */
        public function set( $name, $value ) {
                $this->settings[$name] = $value;
index cbb65aa..2bbc84c 100644 (file)
@@ -45,7 +45,7 @@ class MultiConfig implements Config {
        }
 
        /**
-        * @see Config::get
+        * @inheritDoc
         */
        public function get( $name ) {
                foreach ( $this->configs as $config ) {
@@ -58,7 +58,7 @@ class MultiConfig implements Config {
        }
 
        /**
-        * @see Config::has
+        * @inheritDoc
         */
        public function has( $name ) {
                foreach ( $this->configs as $config ) {
index 1d472e0..c12d28d 100644 (file)
@@ -55,6 +55,7 @@ abstract class AbstractContent implements Content {
         * @since 1.21
         *
         * @see Content::getModel
+        * @return string
         */
        public function getModel() {
                return $this->model_id;
@@ -82,6 +83,7 @@ abstract class AbstractContent implements Content {
         * @since 1.21
         *
         * @see Content::getContentHandler
+        * @return ContentHandler
         */
        public function getContentHandler() {
                return ContentHandler::getForContent( $this );
@@ -91,6 +93,7 @@ abstract class AbstractContent implements Content {
         * @since 1.21
         *
         * @see Content::getDefaultFormat
+        * @return string
         */
        public function getDefaultFormat() {
                return $this->getContentHandler()->getDefaultFormat();
@@ -100,6 +103,7 @@ abstract class AbstractContent implements Content {
         * @since 1.21
         *
         * @see Content::getSupportedFormats
+        * @return string[]
         */
        public function getSupportedFormats() {
                return $this->getContentHandler()->getSupportedFormats();
@@ -334,6 +338,7 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param string|int $sectionId
         * @return null
         *
         * @see Content::getSection
@@ -345,6 +350,9 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param string|int|null|bool $sectionId
+        * @param Content $with
+        * @param string $sectionTitle
         * @return null
         *
         * @see Content::replaceSection
@@ -356,6 +364,9 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param Title $title
+        * @param User $user
+        * @param ParserOptions $popts
         * @return Content $this
         *
         * @see Content::preSaveTransform
@@ -367,6 +378,7 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param string $header
         * @return Content $this
         *
         * @see Content::addSectionHeader
@@ -378,6 +390,9 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param Title $title
+        * @param ParserOptions $popts
+        * @param array $params
         * @return Content $this
         *
         * @see Content::preloadTransform
@@ -389,6 +404,10 @@ abstract class AbstractContent implements Content {
        /**
         * @since 1.21
         *
+        * @param WikiPage $page
+        * @param int $flags
+        * @param int $parentRevId
+        * @param User $user
         * @return Status
         *
         * @see Content::prepareSave
@@ -405,7 +424,7 @@ abstract class AbstractContent implements Content {
         * @since 1.21
         *
         * @param WikiPage $page
-        * @param ParserOutput $parserOutput
+        * @param ParserOutput|null $parserOutput
         *
         * @return LinksDeletionUpdate[]
         *
index 2a50566..a395e0d 100644 (file)
@@ -61,7 +61,7 @@ class AvroFormatter implements FormatterInterface {
        protected $writer;
 
        /**
-        * @var array $schemas Map from Monolog channel to Avro schema.
+        * @param array $schemas Map from Monolog channel to Avro schema.
         *  Each schema can be either the JSON string or decoded into PHP
         *  arrays.
         */
@@ -120,7 +120,7 @@ class AvroFormatter implements FormatterInterface {
        /**
         * Get the writer for the named channel
         *
-        * @var string $channel Name of the schema to fetch
+        * @param string $channel Name of the schema to fetch
         * @return \AvroSchema|null
         */
        protected function getSchema( $channel ) {
@@ -147,7 +147,7 @@ class AvroFormatter implements FormatterInterface {
        /**
         * Get the writer for the named channel
         *
-        * @var string $channel Name of the schema
+        * @param string $channel Name of the schema
         * @return int|null
         */
        public function getSchemaRevisionId( $channel ) {
index cbeb1fc..2e5298c 100644 (file)
@@ -98,7 +98,7 @@ class WANCacheReapUpdate implements DeferrableUpdate {
         * @see WANObjectCacheRepear
         * @param WANObjectCache $cache
         * @param TitleValue $t
-        * @returns string[]
+        * @return string[]
         */
        public function getEventAffectedKeys( WANObjectCache $cache, TitleValue $t ) {
                /** @var WikiPage[]|LocalFile[]|User[] $entities */
index c1f0651..8e1e49f 100644 (file)
@@ -29,6 +29,9 @@
 class ExternalStoreHttp extends ExternalStoreMedium {
        /**
         * @see ExternalStoreMedium::fetchFromURL()
+        * @param string $url
+        * @return string|bool
+        * @throws MWException
         */
        public function fetchFromURL( $url ) {
                return Http::get( $url, [], __METHOD__ );
@@ -36,6 +39,10 @@ class ExternalStoreHttp extends ExternalStoreMedium {
 
        /**
         * @see ExternalStoreMedium::store()
+        * @param string $cluster
+        * @param string $data
+        * @return string|bool
+        * @throws MWException
         */
        public function store( $cluster, $data ) {
                throw new MWException( "ExternalStoreHttp is read-only and does not support store()." );
index b05843c..5395f56 100644 (file)
@@ -35,6 +35,8 @@ class ExternalStoreMwstore extends ExternalStoreMedium {
         * The URL returned is of the form of the form mwstore://backend/container/wiki/id
         *
         * @see ExternalStoreMedium::fetchFromURL()
+        * @param string $url
+        * @return bool
         */
        public function fetchFromURL( $url ) {
                $be = FileBackendGroup::singleton()->backendFromPath( $url );
@@ -73,6 +75,10 @@ class ExternalStoreMwstore extends ExternalStoreMedium {
 
        /**
         * @see ExternalStoreMedium::store()
+        * @param string $backend
+        * @param string $data
+        * @return string|bool
+        * @throws MWException
         */
        public function store( $backend, $data ) {
                $be = FileBackendGroup::singleton()->get( $backend );
index 0d5a15d..21b7ac2 100644 (file)
@@ -298,6 +298,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
         *
         * @param string $function
         * @param array $params
+        * @return mixed
         */
        protected function translateSrcParams( $function, array $params ) {
                $latest = !empty( $params['latest'] );
index 55a19e8..45a5c82 100644 (file)
@@ -257,7 +257,7 @@ class ForeignAPIRepo extends FileRepo {
         * @param string $name
         * @param int $width
         * @param int $height
-        * @param array $result Out parameter that will be changed by the function.
+        * @param array &$result
         * @param string $otherParams
         *
         * @return bool
index 6d003d6..8aea7ab 100644 (file)
@@ -538,7 +538,8 @@ class LocalFile extends File {
                $this->extraDataLoaded = true;
 
                $this->description = CommentStore::newKey( "{$prefix}description" )
-                       ->getComment( $row )->text;
+                       // $row is probably using getFields() from self::getCacheFields()
+                       ->getCommentLegacy( wfGetDB( DB_REPLICA ), $row )->text;
 
                $array = $this->decodeRow( $row, $prefix );
 
index b46e1e4..ee172e1 100644 (file)
@@ -396,6 +396,7 @@ class OldLocalFile extends LocalFile {
         *
         * This is the case for a couple files on Wikimedia servers where
         * the old version is "lost".
+        * @return bool
         */
        public function exists() {
                $archiveName = $this->getArchiveName();
index 3f1c590..e642c2c 100644 (file)
@@ -660,6 +660,8 @@ abstract class HTMLFormField {
 
        /**
         * Get a FieldLayout (or subclass thereof) to wrap this field in when using OOUI output.
+        * @param string $inputField
+        * @param array $config
         * @return OOUI\FieldLayout|OOUI\ActionFieldLayout
         */
        protected function getFieldLayoutOOUI( $inputField, $config ) {
@@ -1074,33 +1076,8 @@ abstract class HTMLFormField {
                                $this->mOptionsLabelsNotFromMessage = true;
                                $this->mOptions = self::forceToStringRecursive( $this->mParams['options'] );
                        } elseif ( array_key_exists( 'options-message', $this->mParams ) ) {
-                               /** @todo This is copied from Xml::listDropDown(), deprecate/avoid duplication? */
                                $message = $this->getMessage( $this->mParams['options-message'] )->inContentLanguage()->plain();
-
-                               $optgroup = false;
-                               $this->mOptions = [];
-                               foreach ( explode( "\n", $message ) as $option ) {
-                                       $value = trim( $option );
-                                       if ( $value == '' ) {
-                                               continue;
-                                       } elseif ( substr( $value, 0, 1 ) == '*' && substr( $value, 1, 1 ) != '*' ) {
-                                               # A new group is starting...
-                                               $value = trim( substr( $value, 1 ) );
-                                               $optgroup = $value;
-                                       } elseif ( substr( $value, 0, 2 ) == '**' ) {
-                                               # groupmember
-                                               $opt = trim( substr( $value, 2 ) );
-                                               if ( $optgroup === false ) {
-                                                       $this->mOptions[$opt] = $opt;
-                                               } else {
-                                                       $this->mOptions[$optgroup][$opt] = $opt;
-                                               }
-                                       } else {
-                                               # groupless reason list
-                                               $optgroup = false;
-                                               $this->mOptions[$option] = $option;
-                                       }
-                               }
+                               $this->mOptions = Xml::listDropDownOptions( $message );
                        } else {
                                $this->mOptions = null;
                        }
@@ -1120,16 +1097,7 @@ abstract class HTMLFormField {
                        return null;
                }
 
-               $options = [];
-
-               foreach ( $oldoptions as $text => $data ) {
-                       $options[] = [
-                               'data' => (string)$data,
-                               'label' => (string)$text,
-                       ];
-               }
-
-               return $options;
+               return Xml::listDropDownOptionsOoui( $oldoptions );
        }
 
        /**
index c10b312..6eff6c9 100644 (file)
@@ -168,6 +168,7 @@ class Http {
        /**
         * Get a configured MultiHttpClient
         * @param array $options
+        * @return MultiHttpClient
         */
        public static function createMultiClient( $options = [] ) {
                global $wgHTTPConnectTimeout, $wgHTTPTimeout, $wgHTTPProxy;
index 3f3803b..0c5d162 100644 (file)
@@ -88,6 +88,8 @@ class PhpHttpRequest extends MWHttpRequest {
         * so normal methods of handling errors programmatically
         * like get_last_error() don't work.
         * @internal
+        * @param int $errno
+        * @param string $errstr
         */
        public function errorHandler( $errno, $errstr ) {
                $n = count( $this->fopenErrors ) + 1;
index bfb1a69..568ef51 100644 (file)
@@ -30,6 +30,8 @@ use MediaWiki\Session\SessionInfo;
 class InstallerSessionProvider extends SessionProvider {
        /**
         * Pretend there is a session, to avoid MWCryptRand overhead
+        * @param WebRequest $request
+        * @return SessionInfo
         */
        public function provideSessionInfo( WebRequest $request ) {
                return new SessionInfo( 1, [
@@ -40,6 +42,7 @@ class InstallerSessionProvider extends SessionProvider {
 
        /**
         * Yes we will treat your data with great care!
+        * @return bool
         */
        public function persistsSessionId() {
                return true;
@@ -47,6 +50,7 @@ class InstallerSessionProvider extends SessionProvider {
 
        /**
         * Sure, you can be whoever you want, as long as you have ID 0
+        * @return bool
         */
        public function canChangeUser() {
                return true;
index b4de44d..a2aa8c0 100644 (file)
@@ -125,6 +125,7 @@ class MssqlUpdater extends DatabaseUpdater {
         * @param string $updatekey
         * @param string $patch
         * @param bool $fullpath
+        * @return bool
         */
        protected function updateSchema( $table, $updatekey, $patch, $fullpath = false ) {
                if ( !$this->db->tableExists( $table, __METHOD__ ) ) {
index dc63899..c5dd4dc 100644 (file)
@@ -223,6 +223,7 @@ class MysqlInstaller extends DatabaseInstaller {
 
        /**
         * @param string $s
+        * @param string $escapeChar
         * @return string
         */
        protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
@@ -342,6 +343,8 @@ class MysqlInstaller extends DatabaseInstaller {
        /**
         * Convert a wildcard (as used in LIKE) to a regex
         * Slashes are escaped, slash terminators included
+        * @param string $wildcard
+        * @return string
         */
        protected function likeToRegex( $wildcard ) {
                $r = preg_quote( $wildcard, '/' );
index e5a5c94..07aeb13 100644 (file)
@@ -783,7 +783,8 @@ END;
                $info = $this->db->fieldInfo( $table, $field );
                if ( $info->defaultValue() !== $default ) {
                        $this->output( "Changing '$table.$field' default value\n" );
-                       $this->db->query( "ALTER TABLE $table ALTER $field SET DEFAULT " . $default );
+                       $this->db->query( "ALTER TABLE $table ALTER $field SET DEFAULT "
+                               . $this->db->addQuotes( $default ) );
                }
        }
 
index 27300f3..e0e54c8 100644 (file)
@@ -1005,6 +1005,7 @@ class WebInstaller extends Installer {
         *
         * @see getRadioSet
         *
+        * @param mixed[] $params
         * @return array
         */
        public function getRadioElements( $params ) {
index a1935df..4e3409a 100644 (file)
@@ -138,6 +138,7 @@ class JobQueueSecondTestQueue extends JobQueue {
        /**
         * @see JobQueue::ack()
         * @param Job $job
+        * @return Job|bool
         */
        protected function doAck( Job $job ) {
                return $this->mainQueue->doAck( $job );
@@ -172,6 +173,7 @@ class JobQueueSecondTestQueue extends JobQueue {
 
        /**
         * @see JobQueue::delete()
+        * @return bool
         * @throws MWException
         */
        protected function doDelete() {
index 7ce2c74..f26beee 100644 (file)
@@ -79,6 +79,9 @@ abstract class JobQueueAggregator {
 
        /**
         * @see JobQueueAggregator::notifyQueueEmpty()
+        * @param string $wiki
+        * @param string $type
+        * @return bool
         */
        abstract protected function doNotifyQueueEmpty( $wiki, $type );
 
@@ -97,6 +100,9 @@ abstract class JobQueueAggregator {
 
        /**
         * @see JobQueueAggregator::notifyQueueNonEmpty()
+        * @param string $wiki
+        * @param string $type
+        * @return bool
         */
        abstract protected function doNotifyQueueNonEmpty( $wiki, $type );
 
index 3bfb531..1c48f49 100644 (file)
@@ -510,7 +510,7 @@ class IP {
         *     2001:0db8:85a3::7344 - 2001:0db8:85a3::7344   Explicit range
         *     2001:0db8:85a3::7344                          Single IP
         * @param string $range IP range
-        * @return array(string, string)
+        * @return array [ string, string ]
         */
        public static function parseRange( $range ) {
                // CIDR notation
index 90c7a64..14462f1 100644 (file)
@@ -75,6 +75,7 @@ class MemoizedCallable {
         *
         * @param string $key
         * @param bool &$success
+        * @return bool
         */
        protected function fetchResult( $key, &$success ) {
                $success = false;
@@ -148,6 +149,7 @@ class MemoizedCallable {
         * @param callable $callable
         * @param array $args
         * @param int $ttl
+        * @return mixed
         */
        public static function call( $callable, array $args = [], $ttl = 3600 ) {
                $instance = new self( $callable, $ttl );
index 016c9b1..e58d98f 100644 (file)
@@ -37,6 +37,7 @@ class Xhprof {
 
        /**
         * Start xhprof profiler
+        * @return bool
         */
        public static function isEnabled() {
                return self::$enabled;
@@ -44,6 +45,9 @@ class Xhprof {
 
        /**
         * Start xhprof profiler
+        * @param int $flags
+        * @param array $options
+        * @throws Exception
         */
        public static function enable( $flags = 0, $options = [] ) {
                if ( self::isEnabled() ) {
index 2383d2a..0be4ff6 100644 (file)
@@ -107,6 +107,7 @@ class XhprofData {
         * The resulting array is left padded with nulls, so a key
         * with no parent (eg 'main()') will return [null, 'function'].
         *
+        * @param string $key
         * @return array
         */
        public static function splitKey( $key ) {
index 77473d1..b8eec3f 100644 (file)
@@ -1714,7 +1714,7 @@ abstract class FileBackendStore extends FileBackend {
                        return; // invalid storage path
                }
                $mtime = ConvertibleTimestamp::convert( TS_UNIX, $val['mtime'] );
-               $ttl = $this->memCache->adaptiveTTL( $mtime, 7 * 86400, 300, .1 );
+               $ttl = $this->memCache->adaptiveTTL( $mtime, 7 * 86400, 300, 0.1 );
                $key = $this->fileCacheKey( $path );
                // Set the cache unless it is currently salted.
                $this->memCache->set( $key, $val, $ttl );
index dfc7c4b..e9fb11f 100644 (file)
@@ -333,7 +333,7 @@ class IEContentAnalyzer {
         * @param string $chunk the first 256 bytes of the file
         * @param string $proposed the MIME type proposed by the server
         *
-        * @return Array: map of IE version to detected MIME type
+        * @return array map of IE version to detected MIME type
         */
        public function getRealMimesFromData( $fileName, $chunk, $proposed ) {
                $types = $this->getMimesFromData( $fileName, $chunk, $proposed );
@@ -371,7 +371,7 @@ class IEContentAnalyzer {
         * @param string $chunk the first 256 bytes of the file
         * @param string $proposed the MIME type proposed by the server
         *
-        * @return Array: map of IE version to detected MIME type
+        * @return array map of IE version to detected MIME type
         */
        public function getMimesFromData( $fileName, $chunk, $proposed ) {
                $types = [];
index f834ccf..8a23db5 100644 (file)
@@ -476,7 +476,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
                $lSince = microtime( true ); // lock timestamp
 
                return new ScopedCallback( function () use ( $key, $lSince, $expiry ) {
-                       $latency = .050; // latency skew (err towards keeping lock present)
+                       $latency = 0.050; // latency skew (err towards keeping lock present)
                        $age = ( microtime( true ) - $lSince + $latency );
                        if ( ( $age + $latency ) >= $expiry ) {
                                $this->logger->warning( "Lock for $key held too long ($age sec)." );
index 5128d82..0188991 100644 (file)
@@ -45,7 +45,7 @@ class MemcachedBagOStuff extends BagOStuff {
        protected function applyDefaultParams( $params ) {
                return $params + [
                        'compress_threshold' => 1500,
-                       'connect_timeout' => .5,
+                       'connect_timeout' => 0.5,
                        'debug' => false
                ];
        }
index c1c9cc1..1f757a4 100644 (file)
@@ -1424,7 +1424,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         * @return int Adaptive TTL
         * @since 1.28
         */
-       public function adaptiveTTL( $mtime, $maxTTL, $minTTL = 30, $factor = .2 ) {
+       public function adaptiveTTL( $mtime, $maxTTL, $minTTL = 30, $factor = 0.2 ) {
                if ( is_float( $mtime ) || ctype_digit( $mtime ) ) {
                        $mtime = (int)$mtime; // handle fractional seconds and string integers
                }
index af431a6..57a12a4 100644 (file)
@@ -39,7 +39,7 @@ class TransactionProfiler implements LoggerAwareInterface {
        /** @var float Seconds */
        protected $dbLockThreshold = 3.0;
        /** @var float Seconds */
-       protected $eventThreshold = .25;
+       protected $eventThreshold = 0.25;
        /** @var bool */
        protected $silenced = false;
 
index 64fbea3..c904092 100644 (file)
@@ -54,8 +54,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
        const PING_TTL = 1.0;
        const PING_QUERY = 'SELECT 1 AS ping';
 
-       const TINY_WRITE_SEC = .010;
-       const SLOW_WRITE_SEC = .500;
+       const TINY_WRITE_SEC = 0.010;
+       const SLOW_WRITE_SEC = 0.500;
        const SMALL_WRITE_ROWS = 100;
 
        /** @var string SQL query */
@@ -2106,6 +2106,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
        /**
         * @param string $s
+        * @param string $escapeChar
         * @return string
         */
        protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
@@ -2416,6 +2417,15 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
         * we don't want to select everything into memory
         *
         * @see IDatabase::insertSelect()
+        * @param string $destTable
+        * @param string|array $srcTable
+        * @param array $varMap
+        * @param array $conds
+        * @param string $fname
+        * @param array $insertOptions
+        * @param array $selectOptions
+        * @param array $selectJoinConds
+        * @return bool
         */
        protected function nativeInsertSelect( $destTable, $srcTable, $varMap, $conds,
                $fname = __METHOD__,
index 8f3cab8..4ebc623 100644 (file)
@@ -1110,6 +1110,7 @@ class DatabaseMssql extends Database {
         * MS SQL supports more pattern operators than other databases (ex: [,],^)
         *
         * @param string $s
+        * @param string $escapeChar
         * @return string
         */
        protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
index ac59bd6..672b345 100644 (file)
@@ -1158,8 +1158,8 @@ SQL;
        }
 
        /**
-        * @var string $table
-        * @var string $field
+        * @param string $table
+        * @param string $field
         * @return PostgresField|null
         */
        public function fieldInfo( $table, $field ) {
index fdc5ac8..8292c03 100644 (file)
@@ -157,7 +157,7 @@ class LoadMonitor implements ILoadMonitor {
                        $newWeight = $movAveRatio * $coefficient + ( 1 - $movAveRatio ) * $lastWeight;
 
                        // Scale from 10% to 100% of nominal weight
-                       $weightScales[$i] = max( $newWeight, .10 );
+                       $weightScales[$i] = max( $newWeight, 0.10 );
 
                        if ( !$conn ) {
                                $lagTimes[$i] = false;
index 7369751..d346f65 100644 (file)
@@ -40,8 +40,8 @@ class NullStatsdDataFactory implements IBufferingStatsdDataFactory {
         * and logged in users by sending the current userId of a user
         * with each request with a key of "uniques" (or similar).
         *
-        * @param  string|array $key The metric(s) to set.
-        * @param  float $value The value for the stats.
+        * @param string|array $key The metric(s) to set.
+        * @param float $value The value for the stats.
         *
         * @return array
         */
index b03a647..37a967f 100644 (file)
@@ -146,6 +146,10 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
         * Visual Editor "pretends" the V1 API is like.  A previous version of
         * ParsoidVirtualRESTService translated these to the "real" Parsoid v1
         * API.  We now translate these to the "real" Parsoid v3 API.
+        * @param array $req
+        * @param Closure $idGeneratorFunc
+        * @return array
+        * @throws Exception
         */
        public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
                $parts = explode( '/', $req['url'] );
index 90865ff..192b4bd 100644 (file)
@@ -112,6 +112,10 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 
        /**
         * Remaps Parsoid v1/v3 requests to RESTBase v1 requests.
+        * @param array $reqs
+        * @param Closure $idGeneratorFunc
+        * @return array
+        * @throws Exception
         */
        public function onParsoidRequests( array $reqs, Closure $idGeneratorFunc ) {
                $result = [];
@@ -145,6 +149,10 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
         * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
         * Visual Editor "pretends" the V1 API is like.  (See
         * ParsoidVirtualRESTService.)
+        * @param array $req
+        * @param Closure $idGeneratorFunc
+        * @return array
+        * @throws Exception
         */
        public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
                $parts = explode( '/', $req['url'] );
@@ -233,6 +241,10 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
         *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body_only' => true/false )
         *   * $title is optional
         *   * $revision is optional
+        * @param array $req
+        * @param Closure $idGeneratorFunc
+        * @return array
+        * @throws Exception
         */
        public function onParsoid3Request( array $req, Closure $idGeneratorFunc ) {
                $parts = explode( '/', $req['url'] );
index e12766a..c46acc6 100644 (file)
@@ -131,6 +131,7 @@ class XMPReader implements LoggerAwareInterface {
 
        /**
         * Primary job is to initialize the XMLParser
+        * @param LoggerInterface|null $logger
         */
        function __construct( LoggerInterface $logger = null ) {
                if ( !function_exists( 'xml_parser_create_ns' ) ) {
@@ -189,6 +190,7 @@ class XMPReader implements LoggerAwareInterface {
 
        /**
         * Check if this instance supports using this class
+        * @return bool
         */
        public static function isSupported() {
                return function_exists( 'xml_parser_create_ns' ) && class_exists( 'XMLReader' );
index 3e4731a..e23989d 100644 (file)
@@ -299,6 +299,8 @@ class WebPHandler extends BitmapHandler {
        /**
         * Must use "im" for XCF
         *
+        * @param string $dstPath
+        * @param bool $checkDstPath
         * @return string
         */
        protected function getScalerType( $dstPath, $checkDstPath = true ) {
index 5b03a22..b91bd9a 100644 (file)
@@ -1695,24 +1695,11 @@ class Article implements Page {
 
                $outputPage->enableOOUI();
 
-               $options = [];
-               $options[] = [
-                       'data' => 'other',
-                       'label' => $ctx->msg( 'deletereasonotherlist' )->inContentLanguage()->text(),
-               ];
-               $list = $ctx->msg( 'deletereason-dropdown' )->inContentLanguage()->text();
-               foreach ( explode( "\n", $list ) as $option ) {
-                       $value = trim( $option );
-                       if ( $value == '' ) {
-                               continue;
-                       } elseif ( substr( $value, 0, 1 ) == '*' && substr( $value, 1, 1 ) != '*' ) {
-                               $options[] = [ 'optgroup' => trim( substr( $value, 1 ) ) ];
-                       } elseif ( substr( $value, 0, 2 ) == '**' ) {
-                               $options[] = [ 'data' => trim( substr( $value, 2 ) ) ];
-                       } else {
-                               $options[] = [ 'data' => trim( $value ) ];
-                       }
-               }
+               $options = Xml::listDropDownOptions(
+                       $ctx->msg( 'deletereason-dropdown' )->inContentLanguage()->text(),
+                       [ 'other' => $ctx->msg( 'deletereasonotherlist' )->inContentLanguage()->text() ]
+               );
+               $options = Xml::listDropDownOptionsOoui( $options );
 
                $fields[] = new OOUI\FieldLayout(
                        new OOUI\DropdownInputWidget( [
index 4785ef1..20bc614 100644 (file)
@@ -55,8 +55,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
        public function __construct( $imagePage ) {
                parent::__construct( $imagePage->getContext() );
                $this->mImagePage = $imagePage;
-               $this->mTitle = clone $imagePage->getTitle();
-               $this->mTitle->setFragment( '#filehistory' );
+               $this->mTitle = $imagePage->getTitle()->createFragmentTarget( 'filehistory' );
                $this->mImg = null;
                $this->mHist = [];
                $this->mRange = [ 0, 0 ]; // display range
index 312edbd..6fc36f6 100644 (file)
@@ -213,6 +213,7 @@ class WikiPage implements Page, IDBAccessObject {
         * @todo Move this UI stuff somewhere else
         *
         * @see ContentHandler::getActionOverrides
+        * @return array
         */
        public function getActionOverrides() {
                return $this->getContentHandler()->getActionOverrides();
@@ -2733,6 +2734,7 @@ class WikiPage implements Page, IDBAccessObject {
         * @param array|string &$error Array of errors to append to
         * @param User $user The deleting user
         * @param array $tags Tags to apply to the deletion action
+        * @param string $logsubtype
         * @return Status Status object; if successful, $status->value is the log_id of the
         *   deletion log entry. If the page couldn't be deleted because it wasn't
         *   found, $status is a non-fatal 'cannotdelete' error
index 599fbf6..fab9ab7 100644 (file)
@@ -257,12 +257,17 @@ class BlockLevelPass {
                                        $output .= $this->nextItem( $prefix[$commonPrefixLength - 1] );
                                }
 
+                               # Close an open <dt> if we have a <dd> (":") starting on this line
+                               if ( $this->DTopen && $commonPrefixLength > 0 && $prefix[$commonPrefixLength - 1] === ':' ) {
+                                       $output .= $this->nextItem( ':' );
+                               }
+
                                # Open prefixes where appropriate.
                                if ( $lastPrefix && $prefixLength > $commonPrefixLength ) {
                                        $output .= "\n";
                                }
                                while ( $prefixLength > $commonPrefixLength ) {
-                                       $char = substr( $prefix, $commonPrefixLength, 1 );
+                                       $char = $prefix[$commonPrefixLength];
                                        $output .= $this->openList( $char );
 
                                        if ( ';' === $char ) {
index 988e248..ff4936d 100644 (file)
@@ -3231,6 +3231,8 @@ class Parser {
                                        . wfMessage( 'parser-template-loop-warning', $titleText )->inContentLanguage()->text()
                                        . '</span>';
                                $this->addTrackingCategory( 'template-loop-category' );
+                               $this->mOutput->addWarning( wfMessage( 'template-loop-warning',
+                                       wfEscapeWikiText( $titleText ) )->text() );
                                wfDebug( __METHOD__ . ": template loop broken at '$titleText'\n" );
                        }
                }
index 2dd4085..06319e5 100644 (file)
@@ -223,7 +223,7 @@ class ParserOutput extends CacheTime {
        // finalizeAdaptiveCacheExpiry() uses TTL = MAX( m * PARSE_TIME + b, MIN_AR_TTL)
        // Current values imply that m=3933.333333 and b=-333.333333
        // See https://www.nngroup.com/articles/website-response-times/
-       const PARSE_FAST_SEC = .100; // perceived "fast" page parse
+       const PARSE_FAST_SEC = 0.100; // perceived "fast" page parse
        const PARSE_SLOW_SEC = 1.0; // perceived "slow" page parse
        const FAST_AR_TTL = 60; // adaptive TTL for "fast" pages
        const SLOW_AR_TTL = 3600; // adaptive TTL for "slow" pages
@@ -243,6 +243,7 @@ class ParserOutput extends CacheTime {
         * return value is suitable for writing back via setText() but is not valid
         * for display to the user.
         *
+        * @return string
         * @since 1.27
         */
        public function getRawText() {
@@ -298,7 +299,10 @@ class ParserOutput extends CacheTime {
                $this->mSpeculativeRevId = $id;
        }
 
-       /** @since 1.28 */
+       /**
+        * @return int|null
+        * @since 1.28
+        */
        public function getSpeculativeRevIdUsed() {
                return $this->mSpeculativeRevId;
        }
@@ -320,6 +324,7 @@ class ParserOutput extends CacheTime {
        }
 
        /**
+        * @return array
         * @since 1.25
         */
        public function getIndicators() {
@@ -382,7 +387,10 @@ class ParserOutput extends CacheTime {
                return $this->mModuleStyles;
        }
 
-       /** @since 1.23 */
+       /**
+        * @return array
+        * @since 1.23
+        */
        public function getJsConfigVars() {
                return $this->mJsConfigVars;
        }
@@ -471,6 +479,8 @@ class ParserOutput extends CacheTime {
        }
 
        /**
+        * @param string $id
+        * @param string $content
         * @since 1.25
         */
        public function setIndicator( $id, $content ) {
@@ -836,6 +846,8 @@ class ParserOutput extends CacheTime {
         * @code
         *    $parser->getOutput()->my_ext_foo = '...';
         * @endcode
+        * @param string $name
+        * @param mixed $value
         */
        public function setProperty( $name, $value ) {
                $this->mProperties[$name] = $value;
index 24474d5..627d112 100644 (file)
@@ -62,6 +62,7 @@ abstract class Preprocessor {
         *
         * @param string $text
         * @param int $flags
+        * @param string $tree
         */
        protected function cacheSetTree( $text, $flags, $tree ) {
                $config = RequestContext::getMain()->getConfig();
index 8e84cb2..332f8e9 100644 (file)
@@ -1869,6 +1869,8 @@ class PPNode_Hash_Tree implements PPNode {
 
        /**
         * Like splitArg() but for a raw child array. For internal use only.
+        * @param array $children
+        * @return array
         */
        public static function splitRawArg( array $children ) {
                $bits = [];
@@ -1910,6 +1912,8 @@ class PPNode_Hash_Tree implements PPNode {
 
        /**
         * Like splitExt() but for a raw child array. For internal use only.
+        * @param array $children
+        * @return array
         */
        public static function splitRawExt( array $children ) {
                $bits = [];
@@ -1953,6 +1957,8 @@ class PPNode_Hash_Tree implements PPNode {
 
        /**
         * Like splitHeading() but for a raw child array. For internal use only.
+        * @param array $children
+        * @return array
         */
        public static function splitRawHeading( array $children ) {
                $bits = [];
@@ -1984,6 +1990,8 @@ class PPNode_Hash_Tree implements PPNode {
 
        /**
         * Like splitTemplate() but for a raw child array. For internal use only.
+        * @param array $children
+        * @return array
         */
        public static function splitRawTemplate( array $children ) {
                $parts = [];
index 10ba83f..531a3eb 100644 (file)
 class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
        /**
         * @see RCFeedFormatter::getLine
+        * @param array $feed
+        * @param RecentChange $rc
+        * @param string|null $actionComment
+        * @return string|null
         */
        public function getLine( array $feed, RecentChange $rc, $actionComment ) {
                global $wgUseRCPatrol, $wgUseNPPatrol, $wgLocalInterwikis,
index 20f88bd..a90d648 100644 (file)
@@ -36,6 +36,10 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
        /**
         * Generates a notification that can be easily interpreted by a machine.
         * @see RCFeedFormatter::getLine
+        * @param array $feed
+        * @param RecentChange $rc
+        * @param string|null $actionComment
+        * @return string|null
         */
        public function getLine( array $feed, RecentChange $rc, $actionComment ) {
                global $wgCanonicalServer, $wgServerName, $wgScriptPath;
index f0fcd7d..3abc9c1 100644 (file)
@@ -41,6 +41,9 @@ class RedisPubSubFeedEngine extends RCFeedEngine {
 
        /**
         * @see FormattedRCFeed::send
+        * @param array $feed
+        * @param string $line
+        * @return bool
         */
        public function send( array $feed, $line ) {
                $parsed = wfParseUrl( $feed['uri'] );
index 61ced5f..f76d771 100644 (file)
@@ -25,6 +25,9 @@
 class UDPRCFeedEngine extends RCFeedEngine {
        /**
         * @see RCFeedEngine::send
+        * @param array $feed
+        * @param string $line
+        * @return bool
         */
        public function send( array $feed, $line ) {
                $transport = UDPTransport::newFromString( $feed['uri'] );
index d26c961..cbcf5a0 100644 (file)
@@ -427,6 +427,8 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 
        /**
         * Helper method for getDefinitionSummary.
+        * @param ResourceLoaderContext $context
+        * @return array
         */
        protected function getFileHashes( ResourceLoaderContext $context ) {
                $this->loadFromDefinition();
index 08641b0..236112e 100644 (file)
@@ -43,6 +43,7 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
        }
 
        /**
+        * @param ResourceLoaderContext|null $context
         * @return array
         */
        public function getDependencies( ResourceLoaderContext $context = null ) {
index d535ffc..8b9feeb 100644 (file)
@@ -297,6 +297,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
        }
 
        /**
+        * @param ResourceLoaderContext $context
         * @return array
         */
        public function getPreloadLinks( ResourceLoaderContext $context ) {
index 9377ed6..1a390cf 100644 (file)
@@ -30,6 +30,7 @@ class ResourceLoaderUploadDialogModule extends ResourceLoaderModule {
        protected $targets = [ 'desktop', 'mobile' ];
 
        /**
+        * @param ResourceLoaderContext $context
         * @return string JavaScript code
         */
        public function getScript( ResourceLoaderContext $context ) {
index 8f58040..8e21381 100644 (file)
@@ -78,6 +78,7 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
        }
 
        /**
+        * @param ResourceLoaderContext|null $context
         * @return array
         */
        public function getDependencies( ResourceLoaderContext $context = null ) {
index df653f1..4b60a0c 100644 (file)
@@ -31,6 +31,7 @@ class ParserOutputSearchDataExtractor {
        /**
         * Get a list of categories, as an array with title text strings.
         *
+        * @param ParserOutput $parserOutput
         * @return string[]
         */
        public function getCategories( ParserOutput $parserOutput ) {
@@ -46,6 +47,7 @@ class ParserOutputSearchDataExtractor {
        /**
         * Get a list of external links from ParserOutput, as an array of strings.
         *
+        * @param ParserOutput $parserOutput
         * @return string[]
         */
        public function getExternalLinks( ParserOutput $parserOutput ) {
@@ -56,6 +58,7 @@ class ParserOutputSearchDataExtractor {
         * Get a list of outgoing wiki links (including interwiki links), as
         * an array of prefixed title strings.
         *
+        * @param ParserOutput $parserOutput
         * @return string[]
         */
        public function getOutgoingLinks( ParserOutput $parserOutput ) {
@@ -74,6 +77,7 @@ class ParserOutputSearchDataExtractor {
        /**
         * Get a list of templates used in the ParserOutput content, as prefixed title strings
         *
+        * @param ParserOutput $parserOutput
         * @return string[]
         */
        public function getTemplates( ParserOutput $parserOutput ) {
index 7c2f0f2..3c8fe60 100644 (file)
@@ -269,7 +269,7 @@ abstract class SearchEngine {
         * might support more. The default in all implementations should be 'relevance.'
         *
         * @since 1.25
-        * @return array(string) the valid sort directions for setSort
+        * @return string[] the valid sort directions for setSort
         */
        public function getValidSorts() {
                return [ 'relevance' ];
index 89d2299..f25c728 100644 (file)
@@ -152,6 +152,7 @@ class SearchResultSet {
        /**
         * Return a result set of hits on other (multiple) wikis associated with this one
         *
+        * @param int $type
         * @return SearchResultSet[]
         */
        function getInterwikiResults( $type = self::SECONDARY_RESULTS ) {
@@ -161,6 +162,7 @@ class SearchResultSet {
        /**
         * Check if there are results on other wikis
         *
+        * @param int $type
         * @return bool
         */
        function hasInterwikiResults( $type = self::SECONDARY_RESULTS ) {
index 6d54dad..aced5e1 100644 (file)
@@ -106,6 +106,7 @@ class SearchSuggestionSet {
 
        /**
         * Move the suggestion at index $key to the first position
+        * @param string $key
         */
        public function rescore( $key ) {
                $removed = array_splice( $this->suggestions, $key, 1 );
index 5831b09..a588aee 100644 (file)
@@ -167,6 +167,7 @@ class BotPasswordSessionProvider extends ImmutableSessionProviderWithCookie {
 
        /**
         * @codeCoverageIgnore
+        * @inheritDoc
         */
        public function preventSessionsForUser( $username ) {
                BotPassword::removeAllPasswordsForUser( $username );
index 12f16b6..23d9ab3 100644 (file)
@@ -654,6 +654,7 @@ final class Session implements \Countable, \Iterator, \ArrayAccess {
        /**
         * @note Despite the name, this seems to be intended to implement isset()
         *  rather than array_key_exists(). So do that.
+        * @inheritDoc
         */
        public function offsetExists( $offset ) {
                $data = &$this->backend->getData();
@@ -666,6 +667,7 @@ final class Session implements \Countable, \Iterator, \ArrayAccess {
         *  data to detect such changes.
         * @note Accessing a nonexistent key via this mechanism causes that key to
         *  be created with a null value, and does not raise a PHP warning.
+        * @inheritDoc
         */
        public function &offsetGet( $offset ) {
                $data = &$this->backend->getData();
index 2c7965c..6d98e72 100644 (file)
@@ -113,6 +113,7 @@ class HashSiteStore implements SiteStore {
        /**
         * Deletes all sites from the database. After calling clear(), getSites() will return an empty
         * list and getSite() will return null until saveSite() or saveSites() is called.
+        * @return bool
         */
        public function clear() {
                $this->sites = [];
index 180a6df..4fcc865 100644 (file)
@@ -811,6 +811,9 @@ class SkinTemplate extends Skin {
 
        /**
         * @todo is this even used?
+        * @param string $name
+        * @param string $urlaction
+        * @return array
         */
        function makeArticleUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
index 04d03f5..0762bf7 100644 (file)
@@ -573,10 +573,12 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        /**
         * Include the modules and configuration for the RCFilters app.
         * Conditional on the user having the feature enabled.
+        *
+        * If it is disabled, add a <body> class marking that
         */
        protected function includeRcFiltersApp() {
+               $out = $this->getOutput();
                if ( $this->isStructuredFilterUiEnabled() ) {
-                       $out = $this->getOutput();
                        $jsData = $this->getStructuredFilterJsData();
 
                        $messages = [];
@@ -584,6 +586,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                $messages[$key] = $this->msg( $key )->plain();
                        }
 
+                       $out->addBodyClasses( 'mw-rcfilters-enabled' );
+
                        $out->addHTML(
                                ResourceLoader::makeInlineScript(
                                        ResourceLoader::makeMessageSetScript( $messages )
@@ -616,6 +620,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                        'daysDefault' => $this->getDefaultDays(),
                                ]
                        );
+               } else {
+                       $out->addBodyClasses( 'mw-rcfilters-disabled' );
                }
        }
 
@@ -808,6 +814,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         * ChangesListFilterGroup constructors.
         *
         * There is light processing to simplify core maintenance.
+        * @param array $definition
         */
        protected function registerFiltersFromDefinitions( array $definition ) {
                $autoFillPriority = -1;
@@ -1550,7 +1557,29 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         * @return bool
         */
        public function isStructuredFilterUiEnabled() {
-               return $this->getUser()->getOption( 'rcenhancedfilters' );
+               if ( $this->getRequest()->getBool( 'rcfilters' ) ) {
+                       return true;
+               }
+
+               if ( $this->getConfig()->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       return !$this->getUser()->getOption( 'rcenhancedfilters-disable' );
+               } else {
+                       return $this->getUser()->getOption( 'rcenhancedfilters' );
+               }
+       }
+
+       /**
+        * Check whether the structured filter UI is enabled by default (regardless of
+        * this particular user's setting)
+        *
+        * @return bool
+        */
+       public function isStructuredFilterUiEnabledByDefault() {
+               if ( $this->getConfig()->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       return !$this->getUser()->getDefaultOption( 'rcenhancedfilters-disable' );
+               } else {
+                       return $this->getUser()->getDefaultOption( 'rcenhancedfilters' );
+               }
        }
 
        abstract function getDefaultLimit();
index d3e22a0..8d39c99 100644 (file)
@@ -35,6 +35,7 @@ abstract class RedirectSpecialPage extends UnlistedSpecialPage {
 
        /**
         * @param string|null $subpage
+        * @return Title|bool
         */
        public function execute( $subpage ) {
                $redirect = $this->getRedirect( $subpage );
index 5318895..8b60387 100644 (file)
@@ -102,6 +102,7 @@ abstract class WantedQueryPage extends QueryPage {
         * @note This will only be run if the page is cached (ie $wgMiserMode = true)
         *   unless forceExistenceCheck() is true.
         * @since 1.24
+        * @param Title $title
         * @return bool
         */
        protected function existenceCheck( Title $title ) {
index 4d84e31..f9c917d 100644 (file)
@@ -341,7 +341,7 @@ class SpecialAllPages extends IncludableSpecialPage {
        /**
         * @param int $ns The namespace of the article
         * @param string $text The name of the article
-        * @return array( int namespace, string dbkey, string pagename ) or null on error
+        * @return array|null [ int namespace, string dbkey, string pagename ] or null on error
         */
        protected function getNamespaceKeyAndText( $ns, $text ) {
                if ( $text == '' ) {
index 252dc68..cd3c028 100644 (file)
@@ -484,7 +484,7 @@ class SpecialBlock extends FormSpecialPage {
         * @param string $par Subpage parameter passed to setup, or data value from
         *     the HTMLForm
         * @param WebRequest $request Optionally try and get data from a request too
-        * @return array( User|string|null, Block::TYPE_ constant|null )
+        * @return array [ User|string|null, Block::TYPE_ constant|null ]
         */
        public static function getTargetAndType( $par, WebRequest $request = null ) {
                $i = 0;
index e1ecfe8..d2940e4 100644 (file)
@@ -770,38 +770,3 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                );
        }
 }
-
-/**
- * Extend HTMLForm purely so we can have a more sane way of getting the section headers
- */
-class EditWatchlistNormalHTMLForm extends HTMLForm {
-       public function getLegend( $namespace ) {
-               $namespace = substr( $namespace, 2 );
-
-               return $namespace == NS_MAIN
-                       ? $this->msg( 'blanknamespace' )->escaped()
-                       : htmlspecialchars( $this->getContext()->getLanguage()->getFormattedNsText( $namespace ) );
-       }
-
-       public function getBody() {
-               return $this->displaySection( $this->mFieldTree, '', 'editwatchlist-' );
-       }
-}
-
-class EditWatchlistCheckboxSeriesField extends HTMLMultiSelectField {
-       /**
-        * HTMLMultiSelectField throws validation errors if we get input data
-        * that doesn't match the data set in the form setup. This causes
-        * problems if something gets removed from the watchlist while the
-        * form is open (T34126), but we know that invalid items will
-        * be harmless so we can override it here.
-        *
-        * @param string $value The value the field was submitted with
-        * @param array $alldata The data collected from the form
-        * @return bool|string Bool true on success, or String error to display.
-        */
-       function validate( $value, $alldata ) {
-               // Need to call into grandparent to be a good citizen. :)
-               return HTMLFormField::validate( $value, $alldata );
-       }
-}
index beb454d..9ce52ef 100644 (file)
@@ -24,8 +24,6 @@
  * @ingroup SpecialPage
  */
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * MediaWiki page data importer
  *
@@ -524,172 +522,3 @@ class SpecialImport extends SpecialPage {
                return 'pagetools';
        }
 }
-
-/**
- * Reporting callback
- * @ingroup SpecialPage
- */
-class ImportReporter extends ContextSource {
-       private $reason = false;
-       private $logTags = [];
-       private $mOriginalLogCallback = null;
-       private $mOriginalPageOutCallback = null;
-       private $mLogItemCount = 0;
-
-       /**
-        * @param WikiImporter $importer
-        * @param bool $upload
-        * @param string $interwiki
-        * @param string|bool $reason
-        */
-       function __construct( $importer, $upload, $interwiki, $reason = false ) {
-               $this->mOriginalPageOutCallback =
-                       $importer->setPageOutCallback( [ $this, 'reportPage' ] );
-               $this->mOriginalLogCallback =
-                       $importer->setLogItemCallback( [ $this, 'reportLogItem' ] );
-               $importer->setNoticeCallback( [ $this, 'reportNotice' ] );
-               $this->mPageCount = 0;
-               $this->mIsUpload = $upload;
-               $this->mInterwiki = $interwiki;
-               $this->reason = $reason;
-       }
-
-       /**
-        * Sets change tags to apply to the import log entry and null revision.
-        *
-        * @param array $tags
-        * @since 1.29
-        */
-       public function setChangeTags( array $tags ) {
-               $this->logTags = $tags;
-       }
-
-       function open() {
-               $this->getOutput()->addHTML( "<ul>\n" );
-       }
-
-       function reportNotice( $msg, array $params ) {
-               $this->getOutput()->addHTML(
-                       Html::element( 'li', [], $this->msg( $msg, $params )->text() )
-               );
-       }
-
-       function reportLogItem( /* ... */ ) {
-               $this->mLogItemCount++;
-               if ( is_callable( $this->mOriginalLogCallback ) ) {
-                       call_user_func_array( $this->mOriginalLogCallback, func_get_args() );
-               }
-       }
-
-       /**
-        * @param Title $title
-        * @param ForeignTitle $foreignTitle
-        * @param int $revisionCount
-        * @param int $successCount
-        * @param array $pageInfo
-        * @return void
-        */
-       public function reportPage( $title, $foreignTitle, $revisionCount,
-                       $successCount, $pageInfo ) {
-               $args = func_get_args();
-               call_user_func_array( $this->mOriginalPageOutCallback, $args );
-
-               if ( $title === null ) {
-                       # Invalid or non-importable title; a notice is already displayed
-                       return;
-               }
-
-               $this->mPageCount++;
-               $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-               if ( $successCount > 0 ) {
-                       // <bdi> prevents jumbling of the versions count
-                       // in RTL wikis in case the page title is LTR
-                       $this->getOutput()->addHTML(
-                               "<li>" . $linkRenderer->makeLink( $title ) . " " .
-                                       "<bdi>" .
-                                       $this->msg( 'import-revision-count' )->numParams( $successCount )->escaped() .
-                                       "</bdi>" .
-                                       "</li>\n"
-                       );
-
-                       $logParams = [ '4:number:count' => $successCount ];
-                       if ( $this->mIsUpload ) {
-                               $detail = $this->msg( 'import-logentry-upload-detail' )->numParams(
-                                       $successCount )->inContentLanguage()->text();
-                               $action = 'upload';
-                       } else {
-                               $pageTitle = $foreignTitle->getFullText();
-                               $fullInterwikiPrefix = $this->mInterwiki;
-                               Hooks::run( 'ImportLogInterwikiLink', [ &$fullInterwikiPrefix, &$pageTitle ] );
-
-                               $interwikiTitleStr = $fullInterwikiPrefix . ':' . $pageTitle;
-                               $interwiki = '[[:' . $interwikiTitleStr . ']]';
-                               $detail = $this->msg( 'import-logentry-interwiki-detail' )->numParams(
-                                       $successCount )->params( $interwiki )->inContentLanguage()->text();
-                               $action = 'interwiki';
-                               $logParams['5:title-link:interwiki'] = $interwikiTitleStr;
-                       }
-                       if ( $this->reason ) {
-                               $detail .= $this->msg( 'colon-separator' )->inContentLanguage()->text()
-                                       . $this->reason;
-                       }
-
-                       $comment = $detail; // quick
-                       $dbw = wfGetDB( DB_MASTER );
-                       $latest = $title->getLatestRevID();
-                       $nullRevision = Revision::newNullRevision(
-                               $dbw,
-                               $title->getArticleID(),
-                               $comment,
-                               true,
-                               $this->getUser()
-                       );
-
-                       $nullRevId = null;
-                       if ( !is_null( $nullRevision ) ) {
-                               $nullRevId = $nullRevision->insertOn( $dbw );
-                               $page = WikiPage::factory( $title );
-                               # Update page record
-                               $page->updateRevisionOn( $dbw, $nullRevision );
-                               Hooks::run(
-                                       'NewRevisionFromEditComplete',
-                                       [ $page, $nullRevision, $latest, $this->getUser() ]
-                               );
-                       }
-
-                       // Create the import log entry
-                       $logEntry = new ManualLogEntry( 'import', $action );
-                       $logEntry->setTarget( $title );
-                       $logEntry->setComment( $this->reason );
-                       $logEntry->setPerformer( $this->getUser() );
-                       $logEntry->setParameters( $logParams );
-                       $logid = $logEntry->insert();
-                       if ( count( $this->logTags ) ) {
-                               $logEntry->setTags( $this->logTags );
-                       }
-                       // Make sure the null revision will be tagged as well
-                       $logEntry->setAssociatedRevId( $nullRevId );
-
-                       $logEntry->publish( $logid );
-
-               } else {
-                       $this->getOutput()->addHTML( "<li>" . $linkRenderer->makeKnownLink( $title ) . " " .
-                               $this->msg( 'import-nonewrevisions' )->escaped() . "</li>\n" );
-               }
-       }
-
-       function close() {
-               $out = $this->getOutput();
-               if ( $this->mLogItemCount > 0 ) {
-                       $msg = $this->msg( 'imported-log-entries' )->numParams( $this->mLogItemCount )->parse();
-                       $out->addHTML( Xml::tags( 'li', null, $msg ) );
-               } elseif ( $this->mPageCount == 0 && $this->mLogItemCount == 0 ) {
-                       $out->addHTML( "</ul>\n" );
-
-                       return Status::newFatal( 'importnopages' );
-               }
-               $out->addHTML( "</ul>\n" );
-
-               return Status::newGood( $this->mPageCount );
-       }
-}
index dae6074..cda0854 100644 (file)
@@ -266,6 +266,7 @@ class LinkSearchPage extends QueryPage {
         *
         * @see T130058
         * @todo FIXME This special page should not use LIMIT for paging
+        * @return int
         */
        protected function getMaxResults() {
                return max( parent::getMaxResults(), 60000 );
index 61590d7..edfaa7c 100644 (file)
@@ -294,7 +294,7 @@ class SpecialNewpages extends IncludableSpecialPage {
        }
 
        /**
-        * @param stdClass $row Result row from recent changes
+        * @param stdClass $result Result row from recent changes
         * @return Revision|bool
         */
        protected function revisionFromRcResult( stdClass $result ) {
index 86bc7ed..b159fff 100644 (file)
@@ -21,6 +21,7 @@ class SpecialUnlinkAccounts extends AuthManagerSpecialPage {
 
        /**
         * Under which header this special page is listed in Special:SpecialPages.
+        * @return string
         */
        protected function getGroupName() {
                return 'users';
index d0eb8e3..59f9796 100644 (file)
@@ -22,7 +22,6 @@
  * @ingroup Upload
  */
 
-use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -839,482 +838,10 @@ class SpecialUpload extends SpecialPage {
         * This controls js: mw.config.get( 'wgFileCanRotate' )
         *
         * @todo What about non-BitmapHandler handled files?
+        * @return bool
         */
        public static function rotationEnabled() {
                $bitmapHandler = new BitmapHandler();
                return $bitmapHandler->autoRotateEnabled();
        }
 }
-
-/**
- * Sub class of HTMLForm that provides the form section of SpecialUpload
- */
-class UploadForm extends HTMLForm {
-       protected $mWatch;
-       protected $mForReUpload;
-       protected $mSessionKey;
-       protected $mHideIgnoreWarning;
-       protected $mDestWarningAck;
-       protected $mDestFile;
-
-       protected $mComment;
-       protected $mTextTop;
-       protected $mTextAfterSummary;
-
-       protected $mSourceIds;
-
-       protected $mMaxFileSize = [];
-
-       protected $mMaxUploadSize = [];
-
-       public function __construct( array $options = [], IContextSource $context = null,
-               LinkRenderer $linkRenderer = null
-       ) {
-               if ( $context instanceof IContextSource ) {
-                       $this->setContext( $context );
-               }
-
-               if ( !$linkRenderer ) {
-                       $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-               }
-
-               $this->mWatch = !empty( $options['watch'] );
-               $this->mForReUpload = !empty( $options['forreupload'] );
-               $this->mSessionKey = isset( $options['sessionkey'] ) ? $options['sessionkey'] : '';
-               $this->mHideIgnoreWarning = !empty( $options['hideignorewarning'] );
-               $this->mDestWarningAck = !empty( $options['destwarningack'] );
-               $this->mDestFile = isset( $options['destfile'] ) ? $options['destfile'] : '';
-
-               $this->mComment = isset( $options['description'] ) ?
-                       $options['description'] : '';
-
-               $this->mTextTop = isset( $options['texttop'] )
-                       ? $options['texttop'] : '';
-
-               $this->mTextAfterSummary = isset( $options['textaftersummary'] )
-                       ? $options['textaftersummary'] : '';
-
-               $sourceDescriptor = $this->getSourceSection();
-               $descriptor = $sourceDescriptor
-                       + $this->getDescriptionSection()
-                       + $this->getOptionsSection();
-
-               Hooks::run( 'UploadFormInitDescriptor', [ &$descriptor ] );
-               parent::__construct( $descriptor, $context, 'upload' );
-
-               # Add a link to edit MediaWiki:Licenses
-               if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
-                       $this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
-                       $licensesLink = $linkRenderer->makeKnownLink(
-                               $this->msg( 'licenses' )->inContentLanguage()->getTitle(),
-                               $this->msg( 'licenses-edit' )->text(),
-                               [],
-                               [ 'action' => 'edit' ]
-                       );
-                       $editLicenses = '<p class="mw-upload-editlicenses">' . $licensesLink . '</p>';
-                       $this->addFooterText( $editLicenses, 'description' );
-               }
-
-               # Set some form properties
-               $this->setSubmitText( $this->msg( 'uploadbtn' )->text() );
-               $this->setSubmitName( 'wpUpload' );
-               # Used message keys: 'accesskey-upload', 'tooltip-upload'
-               $this->setSubmitTooltip( 'upload' );
-               $this->setId( 'mw-upload-form' );
-
-               # Build a list of IDs for javascript insertion
-               $this->mSourceIds = [];
-               foreach ( $sourceDescriptor as $field ) {
-                       if ( !empty( $field['id'] ) ) {
-                               $this->mSourceIds[] = $field['id'];
-                       }
-               }
-       }
-
-       /**
-        * Get the descriptor of the fieldset that contains the file source
-        * selection. The section is 'source'
-        *
-        * @return array Descriptor array
-        */
-       protected function getSourceSection() {
-               if ( $this->mSessionKey ) {
-                       return [
-                               'SessionKey' => [
-                                       'type' => 'hidden',
-                                       'default' => $this->mSessionKey,
-                               ],
-                               'SourceType' => [
-                                       'type' => 'hidden',
-                                       'default' => 'Stash',
-                               ],
-                       ];
-               }
-
-               $canUploadByUrl = UploadFromUrl::isEnabled()
-                       && ( UploadFromUrl::isAllowed( $this->getUser() ) === true )
-                       && $this->getConfig()->get( 'CopyUploadsFromSpecialUpload' );
-               $radio = $canUploadByUrl;
-               $selectedSourceType = strtolower( $this->getRequest()->getText( 'wpSourceType', 'File' ) );
-
-               $descriptor = [];
-               if ( $this->mTextTop ) {
-                       $descriptor['UploadFormTextTop'] = [
-                               'type' => 'info',
-                               'section' => 'source',
-                               'default' => $this->mTextTop,
-                               'raw' => true,
-                       ];
-               }
-
-               $this->mMaxUploadSize['file'] = min(
-                       UploadBase::getMaxUploadSize( 'file' ),
-                       UploadBase::getMaxPhpUploadSize()
-               );
-
-               $help = $this->msg( 'upload-maxfilesize',
-                               $this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['file'] )
-                       )->parse();
-
-               // If the user can also upload by URL, there are 2 different file size limits.
-               // This extra message helps stress which limit corresponds to what.
-               if ( $canUploadByUrl ) {
-                       $help .= $this->msg( 'word-separator' )->escaped();
-                       $help .= $this->msg( 'upload_source_file' )->parse();
-               }
-
-               $descriptor['UploadFile'] = [
-                       'class' => 'UploadSourceField',
-                       'section' => 'source',
-                       'type' => 'file',
-                       'id' => 'wpUploadFile',
-                       'radio-id' => 'wpSourceTypeFile',
-                       'label-message' => 'sourcefilename',
-                       'upload-type' => 'File',
-                       'radio' => &$radio,
-                       'help' => $help,
-                       'checked' => $selectedSourceType == 'file',
-               ];
-
-               if ( $canUploadByUrl ) {
-                       $this->mMaxUploadSize['url'] = UploadBase::getMaxUploadSize( 'url' );
-                       $descriptor['UploadFileURL'] = [
-                               'class' => 'UploadSourceField',
-                               'section' => 'source',
-                               'id' => 'wpUploadFileURL',
-                               'radio-id' => 'wpSourceTypeurl',
-                               'label-message' => 'sourceurl',
-                               'upload-type' => 'url',
-                               'radio' => &$radio,
-                               'help' => $this->msg( 'upload-maxfilesize',
-                                       $this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] )
-                               )->parse() .
-                                       $this->msg( 'word-separator' )->escaped() .
-                                       $this->msg( 'upload_source_url' )->parse(),
-                               'checked' => $selectedSourceType == 'url',
-                       ];
-               }
-               Hooks::run( 'UploadFormSourceDescriptors', [ &$descriptor, &$radio, $selectedSourceType ] );
-
-               $descriptor['Extensions'] = [
-                       'type' => 'info',
-                       'section' => 'source',
-                       'default' => $this->getExtensionsMessage(),
-                       'raw' => true,
-               ];
-
-               return $descriptor;
-       }
-
-       /**
-        * Get the messages indicating which extensions are preferred and prohibitted.
-        *
-        * @return string HTML string containing the message
-        */
-       protected function getExtensionsMessage() {
-               # Print a list of allowed file extensions, if so configured.  We ignore
-               # MIME type here, it's incomprehensible to most people and too long.
-               $config = $this->getConfig();
-
-               if ( $config->get( 'CheckFileExtensions' ) ) {
-                       $fileExtensions = array_unique( $config->get( 'FileExtensions' ) );
-                       if ( $config->get( 'StrictFileExtensions' ) ) {
-                               # Everything not permitted is banned
-                               $extensionsList =
-                                       '<div id="mw-upload-permitted">' .
-                                       $this->msg( 'upload-permitted' )
-                                               ->params( $this->getLanguage()->commaList( $fileExtensions ) )
-                                               ->numParams( count( $fileExtensions ) )
-                                               ->parseAsBlock() .
-                                       "</div>\n";
-                       } else {
-                               # We have to list both preferred and prohibited
-                               $fileBlacklist = array_unique( $config->get( 'FileBlacklist' ) );
-                               $extensionsList =
-                                       '<div id="mw-upload-preferred">' .
-                                               $this->msg( 'upload-preferred' )
-                                                       ->params( $this->getLanguage()->commaList( $fileExtensions ) )
-                                                       ->numParams( count( $fileExtensions ) )
-                                                       ->parseAsBlock() .
-                                       "</div>\n" .
-                                       '<div id="mw-upload-prohibited">' .
-                                               $this->msg( 'upload-prohibited' )
-                                                       ->params( $this->getLanguage()->commaList( $fileBlacklist ) )
-                                                       ->numParams( count( $fileBlacklist ) )
-                                                       ->parseAsBlock() .
-                                       "</div>\n";
-                       }
-               } else {
-                       # Everything is permitted.
-                       $extensionsList = '';
-               }
-
-               return $extensionsList;
-       }
-
-       /**
-        * Get the descriptor of the fieldset that contains the file description
-        * input. The section is 'description'
-        *
-        * @return array Descriptor array
-        */
-       protected function getDescriptionSection() {
-               $config = $this->getConfig();
-               if ( $this->mSessionKey ) {
-                       $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
-                       try {
-                               $file = $stash->getFile( $this->mSessionKey );
-                       } catch ( Exception $e ) {
-                               $file = null;
-                       }
-                       if ( $file ) {
-                               global $wgContLang;
-
-                               $mto = $file->transform( [ 'width' => 120 ] );
-                               if ( $mto ) {
-                                       $this->addHeaderText(
-                                               '<div class="thumb t' . $wgContLang->alignEnd() . '">' .
-                                               Html::element( 'img', [
-                                                       'src' => $mto->getUrl(),
-                                                       'class' => 'thumbimage',
-                                               ] ) . '</div>', 'description' );
-                               }
-                       }
-               }
-
-               $descriptor = [
-                       'DestFile' => [
-                               'type' => 'text',
-                               'section' => 'description',
-                               'id' => 'wpDestFile',
-                               'label-message' => 'destfilename',
-                               'size' => 60,
-                               'default' => $this->mDestFile,
-                               # @todo FIXME: Hack to work around poor handling of the 'default' option in HTMLForm
-                               'nodata' => strval( $this->mDestFile ) !== '',
-                       ],
-                       'UploadDescription' => [
-                               'type' => 'textarea',
-                               'section' => 'description',
-                               'id' => 'wpUploadDescription',
-                               'label-message' => $this->mForReUpload
-                                       ? 'filereuploadsummary'
-                                       : 'fileuploadsummary',
-                               'default' => $this->mComment,
-                               'cols' => 80,
-                               'rows' => 8,
-                       ]
-               ];
-               if ( $this->mTextAfterSummary ) {
-                       $descriptor['UploadFormTextAfterSummary'] = [
-                               'type' => 'info',
-                               'section' => 'description',
-                               'default' => $this->mTextAfterSummary,
-                               'raw' => true,
-                       ];
-               }
-
-               $descriptor += [
-                       'EditTools' => [
-                               'type' => 'edittools',
-                               'section' => 'description',
-                               'message' => 'edittools-upload',
-                       ]
-               ];
-
-               if ( $this->mForReUpload ) {
-                       $descriptor['DestFile']['readonly'] = true;
-               } else {
-                       $descriptor['License'] = [
-                               'type' => 'select',
-                               'class' => 'Licenses',
-                               'section' => 'description',
-                               'id' => 'wpLicense',
-                               'label-message' => 'license',
-                       ];
-               }
-
-               if ( $config->get( 'UseCopyrightUpload' ) ) {
-                       $descriptor['UploadCopyStatus'] = [
-                               'type' => 'text',
-                               'section' => 'description',
-                               'id' => 'wpUploadCopyStatus',
-                               'label-message' => 'filestatus',
-                       ];
-                       $descriptor['UploadSource'] = [
-                               'type' => 'text',
-                               'section' => 'description',
-                               'id' => 'wpUploadSource',
-                               'label-message' => 'filesource',
-                       ];
-               }
-
-               return $descriptor;
-       }
-
-       /**
-        * Get the descriptor of the fieldset that contains the upload options,
-        * such as "watch this file". The section is 'options'
-        *
-        * @return array Descriptor array
-        */
-       protected function getOptionsSection() {
-               $user = $this->getUser();
-               if ( $user->isLoggedIn() ) {
-                       $descriptor = [
-                               'Watchthis' => [
-                                       'type' => 'check',
-                                       'id' => 'wpWatchthis',
-                                       'label-message' => 'watchthisupload',
-                                       'section' => 'options',
-                                       'default' => $this->mWatch,
-                               ]
-                       ];
-               }
-               if ( !$this->mHideIgnoreWarning ) {
-                       $descriptor['IgnoreWarning'] = [
-                               'type' => 'check',
-                               'id' => 'wpIgnoreWarning',
-                               'label-message' => 'ignorewarnings',
-                               'section' => 'options',
-                       ];
-               }
-
-               $descriptor['DestFileWarningAck'] = [
-                       'type' => 'hidden',
-                       'id' => 'wpDestFileWarningAck',
-                       'default' => $this->mDestWarningAck ? '1' : '',
-               ];
-
-               if ( $this->mForReUpload ) {
-                       $descriptor['ForReUpload'] = [
-                               'type' => 'hidden',
-                               'id' => 'wpForReUpload',
-                               'default' => '1',
-                       ];
-               }
-
-               return $descriptor;
-       }
-
-       /**
-        * Add the upload JS and show the form.
-        */
-       public function show() {
-               $this->addUploadJS();
-               parent::show();
-       }
-
-       /**
-        * Add upload JS to the OutputPage
-        */
-       protected function addUploadJS() {
-               $config = $this->getConfig();
-
-               $useAjaxDestCheck = $config->get( 'UseAjax' ) && $config->get( 'AjaxUploadDestCheck' );
-               $useAjaxLicensePreview = $config->get( 'UseAjax' ) &&
-                       $config->get( 'AjaxLicensePreview' ) && $config->get( 'EnableAPI' );
-               $this->mMaxUploadSize['*'] = UploadBase::getMaxUploadSize();
-
-               $scriptVars = [
-                       'wgAjaxUploadDestCheck' => $useAjaxDestCheck,
-                       'wgAjaxLicensePreview' => $useAjaxLicensePreview,
-                       'wgUploadAutoFill' => !$this->mForReUpload &&
-                               // If we received mDestFile from the request, don't autofill
-                               // the wpDestFile textbox
-                               $this->mDestFile === '',
-                       'wgUploadSourceIds' => $this->mSourceIds,
-                       'wgCheckFileExtensions' => $config->get( 'CheckFileExtensions' ),
-                       'wgStrictFileExtensions' => $config->get( 'StrictFileExtensions' ),
-                       'wgFileExtensions' => array_values( array_unique( $config->get( 'FileExtensions' ) ) ),
-                       'wgCapitalizeUploads' => MWNamespace::isCapitalized( NS_FILE ),
-                       'wgMaxUploadSize' => $this->mMaxUploadSize,
-                       'wgFileCanRotate' => SpecialUpload::rotationEnabled(),
-               ];
-
-               $out = $this->getOutput();
-               $out->addJsConfigVars( $scriptVars );
-
-               $out->addModules( [
-                       'mediawiki.special.upload', // Extras for thumbnail and license preview.
-               ] );
-       }
-
-       /**
-        * Empty function; submission is handled elsewhere.
-        *
-        * @return bool False
-        */
-       function trySubmit() {
-               return false;
-       }
-}
-
-/**
- * A form field that contains a radio box in the label
- */
-class UploadSourceField extends HTMLTextField {
-
-       /**
-        * @param array $cellAttributes
-        * @return string
-        */
-       function getLabelHtml( $cellAttributes = [] ) {
-               $id = $this->mParams['id'];
-               $label = Html::rawElement( 'label', [ 'for' => $id ], $this->mLabel );
-
-               if ( !empty( $this->mParams['radio'] ) ) {
-                       if ( isset( $this->mParams['radio-id'] ) ) {
-                               $radioId = $this->mParams['radio-id'];
-                       } else {
-                               // Old way. For the benefit of extensions that do not define
-                               // the 'radio-id' key.
-                               $radioId = 'wpSourceType' . $this->mParams['upload-type'];
-                       }
-
-                       $attribs = [
-                               'name' => 'wpSourceType',
-                               'type' => 'radio',
-                               'id' => $radioId,
-                               'value' => $this->mParams['upload-type'],
-                       ];
-
-                       if ( !empty( $this->mParams['checked'] ) ) {
-                               $attribs['checked'] = 'checked';
-                       }
-
-                       $label .= Html::element( 'input', $attribs );
-               }
-
-               return Html::rawElement( 'td', [ 'class' => 'mw-label' ] + $cellAttributes, $label );
-       }
-
-       /**
-        * @return int
-        */
-       function getSize() {
-               return isset( $this->mParams['size'] )
-                       ? $this->mParams['size']
-                       : 60;
-       }
-}
index 3ea1d03..f176b40 100644 (file)
@@ -203,6 +203,7 @@ class SpecialVersion extends SpecialPage {
                        'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh', 'Sam Reed',
                        'Victor Vasiliev', 'Rotem Liss', 'Platonides', 'Antoine Musso',
                        'Timo Tijhof', 'Daniel Kinzler', 'Jeroen De Dauw', 'Brad Jorsch',
+                       'Bartosz Dziewoński', 'Ed Sanders', 'Moriel Schottlender',
                        $othersLink, $translatorsLink
                ];
 
index 6d481f8..2ebbc2d 100644 (file)
@@ -74,6 +74,7 @@ class WantedFilesPage extends WantedQueryPage {
         * In its own function to allow subclasses to override.
         * @see SpecialWantedFilesGUOverride in GlobalUsage extension.
         * @since 1.24
+        * @return bool
         */
        protected function likelyToHaveFalsePositives() {
                return RepoGroup::singleton()->hasForeignRepos();
@@ -99,6 +100,7 @@ class WantedFilesPage extends WantedQueryPage {
         * Use wfFindFile so we still think file namespace pages without
         * files are missing, but valid file redirects and foreign files are ok.
         *
+        * @param Title $title
         * @return bool
         */
        protected function existenceCheck( Title $title ) {
index 7049744..ec64869 100644 (file)
@@ -112,9 +112,15 @@ class SpecialWatchlist extends ChangesListSpecialPage {
        }
 
        public function isStructuredFilterUiEnabled() {
-               return parent::isStructuredFilterUiEnabled()
-                       && ( $this->getConfig()->get( 'StructuredChangeFiltersOnWatchlist' )
-                               || $this->getRequest()->getBool( 'rcfilters' ) );
+               return $this->getRequest()->getBool( 'rcfilters' ) || (
+                       $this->getConfig()->get( 'StructuredChangeFiltersOnWatchlist' ) &&
+                       $this->getUser()->getOption( 'rcenhancedfilters' )
+               );
+       }
+
+       public function isStructuredFilterUiEnabledByDefault() {
+               return $this->getConfig()->get( 'StructuredChangeFiltersOnWatchlist' ) &&
+                       $this->getUser()->getDefaultOption( 'rcenhancedfilters' );
        }
 
        /**
diff --git a/includes/specials/formfields/EditWatchlistCheckboxSeriesField.php b/includes/specials/formfields/EditWatchlistCheckboxSeriesField.php
new file mode 100644 (file)
index 0000000..cb93bb2
--- /dev/null
@@ -0,0 +1,37 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+class EditWatchlistCheckboxSeriesField extends HTMLMultiSelectField {
+       /**
+        * HTMLMultiSelectField throws validation errors if we get input data
+        * that doesn't match the data set in the form setup. This causes
+        * problems if something gets removed from the watchlist while the
+        * form is open (T34126), but we know that invalid items will
+        * be harmless so we can override it here.
+        *
+        * @param string $value The value the field was submitted with
+        * @param array $alldata The data collected from the form
+        * @return bool|string Bool true on success, or String error to display.
+        */
+       function validate( $value, $alldata ) {
+               // Need to call into grandparent to be a good citizen. :)
+               return HTMLFormField::validate( $value, $alldata );
+       }
+}
diff --git a/includes/specials/formfields/Licenses.php b/includes/specials/formfields/Licenses.php
new file mode 100644 (file)
index 0000000..f499cc1
--- /dev/null
@@ -0,0 +1,189 @@
+<?php
+/**
+ * License selector for use on Special:Upload.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+
+/**
+ * A License class for use on Special:Upload
+ */
+class Licenses extends HTMLFormField {
+       /** @var string */
+       protected $msg;
+
+       /** @var array */
+       protected $licenses = [];
+
+       /** @var string */
+       protected $html;
+       /**#@-*/
+
+       /**
+        * @param array $params
+        */
+       public function __construct( $params ) {
+               parent::__construct( $params );
+
+               $this->msg = empty( $params['licenses'] )
+                       ? wfMessage( 'licenses' )->inContentLanguage()->plain()
+                       : $params['licenses'];
+               $this->selected = null;
+
+               $this->makeLicenses();
+       }
+
+       /**
+        * @private
+        */
+       protected function makeLicenses() {
+               $levels = [];
+               $lines = explode( "\n", $this->msg );
+
+               foreach ( $lines as $line ) {
+                       if ( strpos( $line, '*' ) !== 0 ) {
+                               continue;
+                       } else {
+                               list( $level, $line ) = $this->trimStars( $line );
+
+                               if ( strpos( $line, '|' ) !== false ) {
+                                       $obj = new License( $line );
+                                       $this->stackItem( $this->licenses, $levels, $obj );
+                               } else {
+                                       if ( $level < count( $levels ) ) {
+                                               $levels = array_slice( $levels, 0, $level );
+                                       }
+                                       if ( $level == count( $levels ) ) {
+                                               $levels[$level - 1] = $line;
+                                       } elseif ( $level > count( $levels ) ) {
+                                               $levels[] = $line;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       /**
+        * @param string $str
+        * @return array
+        */
+       protected function trimStars( $str ) {
+               $numStars = strspn( $str, '*' );
+               return [ $numStars, ltrim( substr( $str, $numStars ), ' ' ) ];
+       }
+
+       /**
+        * @param array &$list
+        * @param array $path
+        * @param mixed $item
+        */
+       protected function stackItem( &$list, $path, $item ) {
+               $position =& $list;
+               if ( $path ) {
+                       foreach ( $path as $key ) {
+                               $position =& $position[$key];
+                       }
+               }
+               $position[] = $item;
+       }
+
+       /**
+        * @param array $tagset
+        * @param int $depth
+        */
+       protected function makeHtml( $tagset, $depth = 0 ) {
+               foreach ( $tagset as $key => $val ) {
+                       if ( is_array( $val ) ) {
+                               $this->html .= $this->outputOption(
+                                       $key, '',
+                                       [
+                                               'disabled' => 'disabled',
+                                               'style' => 'color: GrayText', // for MSIE
+                                       ],
+                                       $depth
+                               );
+                               $this->makeHtml( $val, $depth + 1 );
+                       } else {
+                               $this->html .= $this->outputOption(
+                                       $val->text, $val->template,
+                                       [ 'title' => '{{' . $val->template . '}}' ],
+                                       $depth
+                               );
+                       }
+               }
+       }
+
+       /**
+        * @param string $message
+        * @param string $value
+        * @param null|array $attribs
+        * @param int $depth
+        * @return string
+        */
+       protected function outputOption( $message, $value, $attribs = null, $depth = 0 ) {
+               $msgObj = $this->msg( $message );
+               $text = $msgObj->exists() ? $msgObj->text() : $message;
+               $attribs['value'] = $value;
+               if ( $value === $this->selected ) {
+                       $attribs['selected'] = 'selected';
+               }
+
+               $val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $text;
+               return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
+       }
+
+       /**#@-*/
+
+       /**
+        *  Accessor for $this->licenses
+        *
+        * @return array
+        */
+       public function getLicenses() {
+               return $this->licenses;
+       }
+
+       /**
+        * Accessor for $this->html
+        *
+        * @param bool $value
+        *
+        * @return string
+        */
+       public function getInputHTML( $value ) {
+               $this->selected = $value;
+
+               $this->html = $this->outputOption( wfMessage( 'nolicense' )->text(), '',
+                       (bool)$this->selected ? null : [ 'selected' => 'selected' ] );
+               $this->makeHtml( $this->getLicenses() );
+
+               $attribs = [
+                       'name' => $this->mName,
+                       'id' => $this->mID
+               ];
+               if ( !empty( $this->mParams['disabled'] ) ) {
+                       $attibs['disabled'] = 'disabled';
+               }
+
+               return Html::rawElement( 'select', $attribs, $this->html );
+       }
+}
diff --git a/includes/specials/formfields/UploadSourceField.php b/includes/specials/formfields/UploadSourceField.php
new file mode 100644 (file)
index 0000000..251a286
--- /dev/null
@@ -0,0 +1,68 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * A form field that contains a radio box in the label
+ */
+class UploadSourceField extends HTMLTextField {
+
+       /**
+        * @param array $cellAttributes
+        * @return string
+        */
+       function getLabelHtml( $cellAttributes = [] ) {
+               $id = $this->mParams['id'];
+               $label = Html::rawElement( 'label', [ 'for' => $id ], $this->mLabel );
+
+               if ( !empty( $this->mParams['radio'] ) ) {
+                       if ( isset( $this->mParams['radio-id'] ) ) {
+                               $radioId = $this->mParams['radio-id'];
+                       } else {
+                               // Old way. For the benefit of extensions that do not define
+                               // the 'radio-id' key.
+                               $radioId = 'wpSourceType' . $this->mParams['upload-type'];
+                       }
+
+                       $attribs = [
+                               'name' => 'wpSourceType',
+                               'type' => 'radio',
+                               'id' => $radioId,
+                               'value' => $this->mParams['upload-type'],
+                       ];
+
+                       if ( !empty( $this->mParams['checked'] ) ) {
+                               $attribs['checked'] = 'checked';
+                       }
+
+                       $label .= Html::element( 'input', $attribs );
+               }
+
+               return Html::rawElement( 'td', [ 'class' => 'mw-label' ] + $cellAttributes, $label );
+       }
+
+       /**
+        * @return int
+        */
+       function getSize() {
+               return isset( $this->mParams['size'] )
+                       ? $this->mParams['size']
+                       : 60;
+       }
+}
diff --git a/includes/specials/forms/EditWatchlistNormalHTMLForm.php b/includes/specials/forms/EditWatchlistNormalHTMLForm.php
new file mode 100644 (file)
index 0000000..723093a
--- /dev/null
@@ -0,0 +1,36 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Extend HTMLForm purely so we can have a more sane way of getting the section headers
+ */
+class EditWatchlistNormalHTMLForm extends HTMLForm {
+       public function getLegend( $namespace ) {
+               $namespace = substr( $namespace, 2 );
+
+               return $namespace == NS_MAIN
+                       ? $this->msg( 'blanknamespace' )->escaped()
+                       : htmlspecialchars( $this->getContext()->getLanguage()->getFormattedNsText( $namespace ) );
+       }
+
+       public function getBody() {
+               return $this->displaySection( $this->mFieldTree, '', 'editwatchlist-' );
+       }
+}
diff --git a/includes/specials/forms/PreferencesForm.php b/includes/specials/forms/PreferencesForm.php
new file mode 100644 (file)
index 0000000..d4e5ef4
--- /dev/null
@@ -0,0 +1,143 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Form to edit user preferences.
+ */
+class PreferencesForm extends HTMLForm {
+       // Override default value from HTMLForm
+       protected $mSubSectionBeforeFields = false;
+
+       private $modifiedUser;
+
+       /**
+        * @param User $user
+        */
+       public function setModifiedUser( $user ) {
+               $this->modifiedUser = $user;
+       }
+
+       /**
+        * @return User
+        */
+       public function getModifiedUser() {
+               if ( $this->modifiedUser === null ) {
+                       return $this->getUser();
+               } else {
+                       return $this->modifiedUser;
+               }
+       }
+
+       /**
+        * Get extra parameters for the query string when redirecting after
+        * successful save.
+        *
+        * @return array
+        */
+       public function getExtraSuccessRedirectParameters() {
+               return [];
+       }
+
+       /**
+        * @param string $html
+        * @return string
+        */
+       function wrapForm( $html ) {
+               $html = Xml::tags( 'div', [ 'id' => 'preferences' ], $html );
+
+               return parent::wrapForm( $html );
+       }
+
+       /**
+        * @return string
+        */
+       function getButtons() {
+               $attrs = [ 'id' => 'mw-prefs-restoreprefs' ];
+
+               if ( !$this->getModifiedUser()->isAllowedAny( 'editmyprivateinfo', 'editmyoptions' ) ) {
+                       return '';
+               }
+
+               $html = parent::getButtons();
+
+               if ( $this->getModifiedUser()->isAllowed( 'editmyoptions' ) ) {
+                       $t = $this->getTitle()->getSubpage( 'reset' );
+
+                       $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+                       $html .= "\n" . $linkRenderer->makeLink( $t, $this->msg( 'restoreprefs' )->text(),
+                               Html::buttonAttributes( $attrs, [ 'mw-ui-quiet' ] ) );
+
+                       $html = Xml::tags( 'div', [ 'class' => 'mw-prefs-buttons' ], $html );
+               }
+
+               return $html;
+       }
+
+       /**
+        * Separate multi-option preferences into multiple preferences, since we
+        * have to store them separately
+        * @param array $data
+        * @return array
+        */
+       function filterDataForSubmit( $data ) {
+               foreach ( $this->mFlatFields as $fieldname => $field ) {
+                       if ( $field instanceof HTMLNestedFilterable ) {
+                               $info = $field->mParams;
+                               $prefix = isset( $info['prefix'] ) ? $info['prefix'] : $fieldname;
+                               foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) {
+                                       $data["$prefix$key"] = $value;
+                               }
+                               unset( $data[$fieldname] );
+                       }
+               }
+
+               return $data;
+       }
+
+       /**
+        * Get the whole body of the form.
+        * @return string
+        */
+       function getBody() {
+               return $this->displaySection( $this->mFieldTree, '', 'mw-prefsection-' );
+       }
+
+       /**
+        * Get the "<legend>" for a given section key. Normally this is the
+        * prefs-$key message but we'll allow extensions to override it.
+        * @param string $key
+        * @return string
+        */
+       function getLegend( $key ) {
+               $legend = parent::getLegend( $key );
+               Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] );
+               return $legend;
+       }
+
+       /**
+        * Get the keys of each top level preference section.
+        * @return array of section keys
+        */
+       function getPreferenceSections() {
+               return array_keys( array_filter( $this->mFieldTree, 'is_array' ) );
+       }
+}
diff --git a/includes/specials/forms/UploadForm.php b/includes/specials/forms/UploadForm.php
new file mode 100644 (file)
index 0000000..44d91a8
--- /dev/null
@@ -0,0 +1,446 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Sub class of HTMLForm that provides the form section of SpecialUpload
+ */
+class UploadForm extends HTMLForm {
+       protected $mWatch;
+       protected $mForReUpload;
+       protected $mSessionKey;
+       protected $mHideIgnoreWarning;
+       protected $mDestWarningAck;
+       protected $mDestFile;
+
+       protected $mComment;
+       protected $mTextTop;
+       protected $mTextAfterSummary;
+
+       protected $mSourceIds;
+
+       protected $mMaxFileSize = [];
+
+       protected $mMaxUploadSize = [];
+
+       public function __construct( array $options = [], IContextSource $context = null,
+               LinkRenderer $linkRenderer = null
+       ) {
+               if ( $context instanceof IContextSource ) {
+                       $this->setContext( $context );
+               }
+
+               if ( !$linkRenderer ) {
+                       $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+               }
+
+               $this->mWatch = !empty( $options['watch'] );
+               $this->mForReUpload = !empty( $options['forreupload'] );
+               $this->mSessionKey = isset( $options['sessionkey'] ) ? $options['sessionkey'] : '';
+               $this->mHideIgnoreWarning = !empty( $options['hideignorewarning'] );
+               $this->mDestWarningAck = !empty( $options['destwarningack'] );
+               $this->mDestFile = isset( $options['destfile'] ) ? $options['destfile'] : '';
+
+               $this->mComment = isset( $options['description'] ) ?
+                       $options['description'] : '';
+
+               $this->mTextTop = isset( $options['texttop'] )
+                       ? $options['texttop'] : '';
+
+               $this->mTextAfterSummary = isset( $options['textaftersummary'] )
+                       ? $options['textaftersummary'] : '';
+
+               $sourceDescriptor = $this->getSourceSection();
+               $descriptor = $sourceDescriptor
+                       + $this->getDescriptionSection()
+                       + $this->getOptionsSection();
+
+               Hooks::run( 'UploadFormInitDescriptor', [ &$descriptor ] );
+               parent::__construct( $descriptor, $context, 'upload' );
+
+               # Add a link to edit MediaWiki:Licenses
+               if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
+                       $this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
+                       $licensesLink = $linkRenderer->makeKnownLink(
+                               $this->msg( 'licenses' )->inContentLanguage()->getTitle(),
+                               $this->msg( 'licenses-edit' )->text(),
+                               [],
+                               [ 'action' => 'edit' ]
+                       );
+                       $editLicenses = '<p class="mw-upload-editlicenses">' . $licensesLink . '</p>';
+                       $this->addFooterText( $editLicenses, 'description' );
+               }
+
+               # Set some form properties
+               $this->setSubmitText( $this->msg( 'uploadbtn' )->text() );
+               $this->setSubmitName( 'wpUpload' );
+               # Used message keys: 'accesskey-upload', 'tooltip-upload'
+               $this->setSubmitTooltip( 'upload' );
+               $this->setId( 'mw-upload-form' );
+
+               # Build a list of IDs for javascript insertion
+               $this->mSourceIds = [];
+               foreach ( $sourceDescriptor as $field ) {
+                       if ( !empty( $field['id'] ) ) {
+                               $this->mSourceIds[] = $field['id'];
+                       }
+               }
+       }
+
+       /**
+        * Get the descriptor of the fieldset that contains the file source
+        * selection. The section is 'source'
+        *
+        * @return array Descriptor array
+        */
+       protected function getSourceSection() {
+               if ( $this->mSessionKey ) {
+                       return [
+                               'SessionKey' => [
+                                       'type' => 'hidden',
+                                       'default' => $this->mSessionKey,
+                               ],
+                               'SourceType' => [
+                                       'type' => 'hidden',
+                                       'default' => 'Stash',
+                               ],
+                       ];
+               }
+
+               $canUploadByUrl = UploadFromUrl::isEnabled()
+                       && ( UploadFromUrl::isAllowed( $this->getUser() ) === true )
+                       && $this->getConfig()->get( 'CopyUploadsFromSpecialUpload' );
+               $radio = $canUploadByUrl;
+               $selectedSourceType = strtolower( $this->getRequest()->getText( 'wpSourceType', 'File' ) );
+
+               $descriptor = [];
+               if ( $this->mTextTop ) {
+                       $descriptor['UploadFormTextTop'] = [
+                               'type' => 'info',
+                               'section' => 'source',
+                               'default' => $this->mTextTop,
+                               'raw' => true,
+                       ];
+               }
+
+               $this->mMaxUploadSize['file'] = min(
+                       UploadBase::getMaxUploadSize( 'file' ),
+                       UploadBase::getMaxPhpUploadSize()
+               );
+
+               $help = $this->msg( 'upload-maxfilesize',
+                               $this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['file'] )
+                       )->parse();
+
+               // If the user can also upload by URL, there are 2 different file size limits.
+               // This extra message helps stress which limit corresponds to what.
+               if ( $canUploadByUrl ) {
+                       $help .= $this->msg( 'word-separator' )->escaped();
+                       $help .= $this->msg( 'upload_source_file' )->parse();
+               }
+
+               $descriptor['UploadFile'] = [
+                       'class' => 'UploadSourceField',
+                       'section' => 'source',
+                       'type' => 'file',
+                       'id' => 'wpUploadFile',
+                       'radio-id' => 'wpSourceTypeFile',
+                       'label-message' => 'sourcefilename',
+                       'upload-type' => 'File',
+                       'radio' => &$radio,
+                       'help' => $help,
+                       'checked' => $selectedSourceType == 'file',
+               ];
+
+               if ( $canUploadByUrl ) {
+                       $this->mMaxUploadSize['url'] = UploadBase::getMaxUploadSize( 'url' );
+                       $descriptor['UploadFileURL'] = [
+                               'class' => 'UploadSourceField',
+                               'section' => 'source',
+                               'id' => 'wpUploadFileURL',
+                               'radio-id' => 'wpSourceTypeurl',
+                               'label-message' => 'sourceurl',
+                               'upload-type' => 'url',
+                               'radio' => &$radio,
+                               'help' => $this->msg( 'upload-maxfilesize',
+                                       $this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] )
+                               )->parse() .
+                                       $this->msg( 'word-separator' )->escaped() .
+                                       $this->msg( 'upload_source_url' )->parse(),
+                               'checked' => $selectedSourceType == 'url',
+                       ];
+               }
+               Hooks::run( 'UploadFormSourceDescriptors', [ &$descriptor, &$radio, $selectedSourceType ] );
+
+               $descriptor['Extensions'] = [
+                       'type' => 'info',
+                       'section' => 'source',
+                       'default' => $this->getExtensionsMessage(),
+                       'raw' => true,
+               ];
+
+               return $descriptor;
+       }
+
+       /**
+        * Get the messages indicating which extensions are preferred and prohibitted.
+        *
+        * @return string HTML string containing the message
+        */
+       protected function getExtensionsMessage() {
+               # Print a list of allowed file extensions, if so configured.  We ignore
+               # MIME type here, it's incomprehensible to most people and too long.
+               $config = $this->getConfig();
+
+               if ( $config->get( 'CheckFileExtensions' ) ) {
+                       $fileExtensions = array_unique( $config->get( 'FileExtensions' ) );
+                       if ( $config->get( 'StrictFileExtensions' ) ) {
+                               # Everything not permitted is banned
+                               $extensionsList =
+                                       '<div id="mw-upload-permitted">' .
+                                       $this->msg( 'upload-permitted' )
+                                               ->params( $this->getLanguage()->commaList( $fileExtensions ) )
+                                               ->numParams( count( $fileExtensions ) )
+                                               ->parseAsBlock() .
+                                       "</div>\n";
+                       } else {
+                               # We have to list both preferred and prohibited
+                               $fileBlacklist = array_unique( $config->get( 'FileBlacklist' ) );
+                               $extensionsList =
+                                       '<div id="mw-upload-preferred">' .
+                                               $this->msg( 'upload-preferred' )
+                                                       ->params( $this->getLanguage()->commaList( $fileExtensions ) )
+                                                       ->numParams( count( $fileExtensions ) )
+                                                       ->parseAsBlock() .
+                                       "</div>\n" .
+                                       '<div id="mw-upload-prohibited">' .
+                                               $this->msg( 'upload-prohibited' )
+                                                       ->params( $this->getLanguage()->commaList( $fileBlacklist ) )
+                                                       ->numParams( count( $fileBlacklist ) )
+                                                       ->parseAsBlock() .
+                                       "</div>\n";
+                       }
+               } else {
+                       # Everything is permitted.
+                       $extensionsList = '';
+               }
+
+               return $extensionsList;
+       }
+
+       /**
+        * Get the descriptor of the fieldset that contains the file description
+        * input. The section is 'description'
+        *
+        * @return array Descriptor array
+        */
+       protected function getDescriptionSection() {
+               $config = $this->getConfig();
+               if ( $this->mSessionKey ) {
+                       $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
+                       try {
+                               $file = $stash->getFile( $this->mSessionKey );
+                       } catch ( Exception $e ) {
+                               $file = null;
+                       }
+                       if ( $file ) {
+                               global $wgContLang;
+
+                               $mto = $file->transform( [ 'width' => 120 ] );
+                               if ( $mto ) {
+                                       $this->addHeaderText(
+                                               '<div class="thumb t' . $wgContLang->alignEnd() . '">' .
+                                               Html::element( 'img', [
+                                                       'src' => $mto->getUrl(),
+                                                       'class' => 'thumbimage',
+                                               ] ) . '</div>', 'description' );
+                               }
+                       }
+               }
+
+               $descriptor = [
+                       'DestFile' => [
+                               'type' => 'text',
+                               'section' => 'description',
+                               'id' => 'wpDestFile',
+                               'label-message' => 'destfilename',
+                               'size' => 60,
+                               'default' => $this->mDestFile,
+                               # @todo FIXME: Hack to work around poor handling of the 'default' option in HTMLForm
+                               'nodata' => strval( $this->mDestFile ) !== '',
+                       ],
+                       'UploadDescription' => [
+                               'type' => 'textarea',
+                               'section' => 'description',
+                               'id' => 'wpUploadDescription',
+                               'label-message' => $this->mForReUpload
+                                       ? 'filereuploadsummary'
+                                       : 'fileuploadsummary',
+                               'default' => $this->mComment,
+                               'cols' => 80,
+                               'rows' => 8,
+                       ]
+               ];
+               if ( $this->mTextAfterSummary ) {
+                       $descriptor['UploadFormTextAfterSummary'] = [
+                               'type' => 'info',
+                               'section' => 'description',
+                               'default' => $this->mTextAfterSummary,
+                               'raw' => true,
+                       ];
+               }
+
+               $descriptor += [
+                       'EditTools' => [
+                               'type' => 'edittools',
+                               'section' => 'description',
+                               'message' => 'edittools-upload',
+                       ]
+               ];
+
+               if ( $this->mForReUpload ) {
+                       $descriptor['DestFile']['readonly'] = true;
+               } else {
+                       $descriptor['License'] = [
+                               'type' => 'select',
+                               'class' => 'Licenses',
+                               'section' => 'description',
+                               'id' => 'wpLicense',
+                               'label-message' => 'license',
+                       ];
+               }
+
+               if ( $config->get( 'UseCopyrightUpload' ) ) {
+                       $descriptor['UploadCopyStatus'] = [
+                               'type' => 'text',
+                               'section' => 'description',
+                               'id' => 'wpUploadCopyStatus',
+                               'label-message' => 'filestatus',
+                       ];
+                       $descriptor['UploadSource'] = [
+                               'type' => 'text',
+                               'section' => 'description',
+                               'id' => 'wpUploadSource',
+                               'label-message' => 'filesource',
+                       ];
+               }
+
+               return $descriptor;
+       }
+
+       /**
+        * Get the descriptor of the fieldset that contains the upload options,
+        * such as "watch this file". The section is 'options'
+        *
+        * @return array Descriptor array
+        */
+       protected function getOptionsSection() {
+               $user = $this->getUser();
+               if ( $user->isLoggedIn() ) {
+                       $descriptor = [
+                               'Watchthis' => [
+                                       'type' => 'check',
+                                       'id' => 'wpWatchthis',
+                                       'label-message' => 'watchthisupload',
+                                       'section' => 'options',
+                                       'default' => $this->mWatch,
+                               ]
+                       ];
+               }
+               if ( !$this->mHideIgnoreWarning ) {
+                       $descriptor['IgnoreWarning'] = [
+                               'type' => 'check',
+                               'id' => 'wpIgnoreWarning',
+                               'label-message' => 'ignorewarnings',
+                               'section' => 'options',
+                       ];
+               }
+
+               $descriptor['DestFileWarningAck'] = [
+                       'type' => 'hidden',
+                       'id' => 'wpDestFileWarningAck',
+                       'default' => $this->mDestWarningAck ? '1' : '',
+               ];
+
+               if ( $this->mForReUpload ) {
+                       $descriptor['ForReUpload'] = [
+                               'type' => 'hidden',
+                               'id' => 'wpForReUpload',
+                               'default' => '1',
+                       ];
+               }
+
+               return $descriptor;
+       }
+
+       /**
+        * Add the upload JS and show the form.
+        */
+       public function show() {
+               $this->addUploadJS();
+               parent::show();
+       }
+
+       /**
+        * Add upload JS to the OutputPage
+        */
+       protected function addUploadJS() {
+               $config = $this->getConfig();
+
+               $useAjaxDestCheck = $config->get( 'UseAjax' ) && $config->get( 'AjaxUploadDestCheck' );
+               $useAjaxLicensePreview = $config->get( 'UseAjax' ) &&
+                       $config->get( 'AjaxLicensePreview' ) && $config->get( 'EnableAPI' );
+               $this->mMaxUploadSize['*'] = UploadBase::getMaxUploadSize();
+
+               $scriptVars = [
+                       'wgAjaxUploadDestCheck' => $useAjaxDestCheck,
+                       'wgAjaxLicensePreview' => $useAjaxLicensePreview,
+                       'wgUploadAutoFill' => !$this->mForReUpload &&
+                               // If we received mDestFile from the request, don't autofill
+                               // the wpDestFile textbox
+                               $this->mDestFile === '',
+                       'wgUploadSourceIds' => $this->mSourceIds,
+                       'wgCheckFileExtensions' => $config->get( 'CheckFileExtensions' ),
+                       'wgStrictFileExtensions' => $config->get( 'StrictFileExtensions' ),
+                       'wgFileExtensions' => array_values( array_unique( $config->get( 'FileExtensions' ) ) ),
+                       'wgCapitalizeUploads' => MWNamespace::isCapitalized( NS_FILE ),
+                       'wgMaxUploadSize' => $this->mMaxUploadSize,
+                       'wgFileCanRotate' => SpecialUpload::rotationEnabled(),
+               ];
+
+               $out = $this->getOutput();
+               $out->addJsConfigVars( $scriptVars );
+
+               $out->addModules( [
+                       'mediawiki.special.upload', // Extras for thumbnail and license preview.
+               ] );
+       }
+
+       /**
+        * Empty function; submission is handled elsewhere.
+        *
+        * @return bool False
+        */
+       function trySubmit() {
+               return false;
+       }
+}
diff --git a/includes/specials/helpers/ImportReporter.php b/includes/specials/helpers/ImportReporter.php
new file mode 100644 (file)
index 0000000..63addb8
--- /dev/null
@@ -0,0 +1,190 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Reporting callback
+ * @ingroup SpecialPage
+ */
+class ImportReporter extends ContextSource {
+       private $reason = false;
+       private $logTags = [];
+       private $mOriginalLogCallback = null;
+       private $mOriginalPageOutCallback = null;
+       private $mLogItemCount = 0;
+
+       /**
+        * @param WikiImporter $importer
+        * @param bool $upload
+        * @param string $interwiki
+        * @param string|bool $reason
+        */
+       function __construct( $importer, $upload, $interwiki, $reason = false ) {
+               $this->mOriginalPageOutCallback =
+                       $importer->setPageOutCallback( [ $this, 'reportPage' ] );
+               $this->mOriginalLogCallback =
+                       $importer->setLogItemCallback( [ $this, 'reportLogItem' ] );
+               $importer->setNoticeCallback( [ $this, 'reportNotice' ] );
+               $this->mPageCount = 0;
+               $this->mIsUpload = $upload;
+               $this->mInterwiki = $interwiki;
+               $this->reason = $reason;
+       }
+
+       /**
+        * Sets change tags to apply to the import log entry and null revision.
+        *
+        * @param array $tags
+        * @since 1.29
+        */
+       public function setChangeTags( array $tags ) {
+               $this->logTags = $tags;
+       }
+
+       function open() {
+               $this->getOutput()->addHTML( "<ul>\n" );
+       }
+
+       function reportNotice( $msg, array $params ) {
+               $this->getOutput()->addHTML(
+                       Html::element( 'li', [], $this->msg( $msg, $params )->text() )
+               );
+       }
+
+       function reportLogItem( /* ... */ ) {
+               $this->mLogItemCount++;
+               if ( is_callable( $this->mOriginalLogCallback ) ) {
+                       call_user_func_array( $this->mOriginalLogCallback, func_get_args() );
+               }
+       }
+
+       /**
+        * @param Title $title
+        * @param ForeignTitle $foreignTitle
+        * @param int $revisionCount
+        * @param int $successCount
+        * @param array $pageInfo
+        * @return void
+        */
+       public function reportPage( $title, $foreignTitle, $revisionCount,
+                       $successCount, $pageInfo ) {
+               $args = func_get_args();
+               call_user_func_array( $this->mOriginalPageOutCallback, $args );
+
+               if ( $title === null ) {
+                       # Invalid or non-importable title; a notice is already displayed
+                       return;
+               }
+
+               $this->mPageCount++;
+               $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+               if ( $successCount > 0 ) {
+                       // <bdi> prevents jumbling of the versions count
+                       // in RTL wikis in case the page title is LTR
+                       $this->getOutput()->addHTML(
+                               "<li>" . $linkRenderer->makeLink( $title ) . " " .
+                                       "<bdi>" .
+                                       $this->msg( 'import-revision-count' )->numParams( $successCount )->escaped() .
+                                       "</bdi>" .
+                                       "</li>\n"
+                       );
+
+                       $logParams = [ '4:number:count' => $successCount ];
+                       if ( $this->mIsUpload ) {
+                               $detail = $this->msg( 'import-logentry-upload-detail' )->numParams(
+                                       $successCount )->inContentLanguage()->text();
+                               $action = 'upload';
+                       } else {
+                               $pageTitle = $foreignTitle->getFullText();
+                               $fullInterwikiPrefix = $this->mInterwiki;
+                               Hooks::run( 'ImportLogInterwikiLink', [ &$fullInterwikiPrefix, &$pageTitle ] );
+
+                               $interwikiTitleStr = $fullInterwikiPrefix . ':' . $pageTitle;
+                               $interwiki = '[[:' . $interwikiTitleStr . ']]';
+                               $detail = $this->msg( 'import-logentry-interwiki-detail' )->numParams(
+                                       $successCount )->params( $interwiki )->inContentLanguage()->text();
+                               $action = 'interwiki';
+                               $logParams['5:title-link:interwiki'] = $interwikiTitleStr;
+                       }
+                       if ( $this->reason ) {
+                               $detail .= $this->msg( 'colon-separator' )->inContentLanguage()->text()
+                                       . $this->reason;
+                       }
+
+                       $comment = $detail; // quick
+                       $dbw = wfGetDB( DB_MASTER );
+                       $latest = $title->getLatestRevID();
+                       $nullRevision = Revision::newNullRevision(
+                               $dbw,
+                               $title->getArticleID(),
+                               $comment,
+                               true,
+                               $this->getUser()
+                       );
+
+                       $nullRevId = null;
+                       if ( !is_null( $nullRevision ) ) {
+                               $nullRevId = $nullRevision->insertOn( $dbw );
+                               $page = WikiPage::factory( $title );
+                               # Update page record
+                               $page->updateRevisionOn( $dbw, $nullRevision );
+                               Hooks::run(
+                                       'NewRevisionFromEditComplete',
+                                       [ $page, $nullRevision, $latest, $this->getUser() ]
+                               );
+                       }
+
+                       // Create the import log entry
+                       $logEntry = new ManualLogEntry( 'import', $action );
+                       $logEntry->setTarget( $title );
+                       $logEntry->setComment( $this->reason );
+                       $logEntry->setPerformer( $this->getUser() );
+                       $logEntry->setParameters( $logParams );
+                       $logid = $logEntry->insert();
+                       if ( count( $this->logTags ) ) {
+                               $logEntry->setTags( $this->logTags );
+                       }
+                       // Make sure the null revision will be tagged as well
+                       $logEntry->setAssociatedRevId( $nullRevId );
+
+                       $logEntry->publish( $logid );
+
+               } else {
+                       $this->getOutput()->addHTML( "<li>" . $linkRenderer->makeKnownLink( $title ) . " " .
+                               $this->msg( 'import-nonewrevisions' )->escaped() . "</li>\n" );
+               }
+       }
+
+       function close() {
+               $out = $this->getOutput();
+               if ( $this->mLogItemCount > 0 ) {
+                       $msg = $this->msg( 'imported-log-entries' )->numParams( $this->mLogItemCount )->parse();
+                       $out->addHTML( Xml::tags( 'li', null, $msg ) );
+               } elseif ( $this->mPageCount == 0 && $this->mLogItemCount == 0 ) {
+                       $out->addHTML( "</ul>\n" );
+
+                       return Status::newFatal( 'importnopages' );
+               }
+               $out->addHTML( "</ul>\n" );
+
+               return Status::newGood( $this->mPageCount );
+       }
+}
diff --git a/includes/specials/helpers/License.php b/includes/specials/helpers/License.php
new file mode 100644 (file)
index 0000000..4f94b4d
--- /dev/null
@@ -0,0 +1,46 @@
+<?php
+/**
+ * License selector for use on Special:Upload.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+
+/**
+ * A License class for use on Special:Upload (represents a single type of license).
+ */
+class License {
+       /** @var string */
+       public $template;
+
+       /** @var string */
+       public $text;
+
+       /**
+        * @param string $str License name??
+        */
+       function __construct( $str ) {
+               list( $text, $template ) = explode( '|', strrev( $str ), 2 );
+
+               $this->template = strrev( $template );
+               $this->text = strrev( $text );
+       }
+}
index 947a572..fbe9270 100644 (file)
@@ -627,6 +627,7 @@ class BalanceElement {
 
        /**
         * Get a string key for the Noah's Ark algorithm
+        * @return string
         */
        public function getNoahKey() {
                if ( $this->noahKey === null ) {
@@ -710,6 +711,7 @@ class BalanceStack implements IteratorAggregate {
        /**
         * Insert a comment at the appropriate place for inserting a node.
         * @param string $value Content of the comment.
+        * @return string
         * @see https://html.spec.whatwg.org/multipage/syntax.html#insert-a-comment
         */
        public function insertComment( $value ) {
@@ -721,6 +723,7 @@ class BalanceStack implements IteratorAggregate {
         * Insert text at the appropriate place for inserting a node.
         * @param string $value
         * @param bool $isComment
+        * @return string
         * @see https://html.spec.whatwg.org/multipage/syntax.html#appropriate-place-for-inserting-a-node
         */
        public function insertText( $value, $isComment = false ) {
@@ -901,6 +904,8 @@ class BalanceStack implements IteratorAggregate {
 
        /**
         * Return the adjusted current node.
+        * @param string $fragmentContext
+        * @return string
         */
        public function adjustedCurrentNode( $fragmentContext ) {
                return ( $fragmentContext && count( $this->elements ) === 1 ) ?
@@ -1513,6 +1518,8 @@ class BalanceActiveFormattingElements {
         * Find and return the last element with the specified tag between the
         * end of the list and the last marker on the list.
         * Used when parsing &lt;a&gt; "in body mode".
+        * @param string $tag
+        * @return null|Node
         */
        public function findElementByTag( $tag ) {
                $elt = $this->tail;
index 6e01894..f88b673 100644 (file)
@@ -14,6 +14,7 @@ abstract class TidyDriverBase {
 
        /**
         * Return true if validate() can be used
+        * @return bool
         */
        public function supportsValidate() {
                return false;
index 19f5100..4f639c1 100644 (file)
@@ -321,7 +321,7 @@ class ClassCollector {
        protected $alias;
 
        /**
-        * @var string $code PHP code (including <?php) to detect class names from
+        * @param string $code PHP code (including <?php) to detect class names from
         * @return array List of FQCN detected within the tokens
         */
        public function getClasses( $code ) {
index 6d0368c..67c0ca7 100644 (file)
@@ -662,7 +662,7 @@ class LanguageConverter {
         *
         * @param string $text Text to be converted
         * @param string $variant The target variant code
-        * @param int $startPos
+        * @param int &$startPos
         * @param int $depth Depth of recursion
         *
         * @throws MWException
index 03ebe21..64cce78 100644 (file)
@@ -3155,6 +3155,7 @@ public static $zh2Hant = [
 '上签约' => '上簽約',
 '上签署' => '上簽署',
 '上签订' => '上簽訂',
+'上签证' => '上簽證',
 '上签' => '上籤',
 '上系上' => '上繫上',
 '上课钟' => '上課鐘',
@@ -3172,6 +3173,7 @@ public static $zh2Hant = [
 '下签约' => '下簽約',
 '下签署' => '下簽署',
 '下签订' => '下簽訂',
+'下签证' => '下簽證',
 '下签' => '下籤',
 '下课钟' => '下課鐘',
 '不干不净' => '不乾不淨',
@@ -3247,6 +3249,7 @@ public static $zh2Hant = [
 '中签约' => '中簽約',
 '中签署' => '中簽署',
 '中签订' => '中簽訂',
+'中签证' => '中簽證',
 '中签' => '中籤',
 '中风后' => '中風後',
 '丰仪' => '丰儀',
@@ -4322,7 +4325,6 @@ public static $zh2Hant = [
 '台子女' => '台子女',
 '台子孙' => '台子孫',
 '台州' => '台州',
-'台布景' => '台布景',
 '台历史' => '台歷史',
 '台钟' => '台鐘',
 '台风奖' => '台風獎',
@@ -4867,6 +4869,8 @@ public static $zh2Hant = [
 '尸祝' => '尸祝',
 '尸祿' => '尸祿',
 '尸禄' => '尸祿',
+'尸罗' => '尸羅',
+'尸羅' => '尸羅',
 '尸罗精舍' => '尸羅精舍',
 '尸羅精舍' => '尸羅精舍',
 '尸臣' => '尸臣',
@@ -5883,6 +5887,7 @@ public static $zh2Hant = [
 '星历' => '星曆',
 '星期后' => '星期後',
 '星历史' => '星歷史',
+'星露谷物语' => '星露谷物語',
 '春游' => '春遊',
 '春香斗学' => '春香鬥學',
 '昭惠后' => '昭惠后',
@@ -6034,6 +6039,7 @@ public static $zh2Hant = [
 '架钟' => '架鐘',
 '某只' => '某隻',
 '染殿后' => '染殿后',
+'染发生' => '染發生',
 '染发' => '染髮',
 '柜上' => '柜上',
 '柜子' => '柜子',
@@ -6063,7 +6069,6 @@ public static $zh2Hant = [
 '杆菌' => '桿菌',
 '梁上君子' => '梁上君子',
 '梁启超' => '梁啓超',
-'条干' => '條幹',
 '条文里' => '條文裡',
 '梨干' => '梨乾',
 '梯冲' => '梯衝',
@@ -6139,7 +6144,6 @@ public static $zh2Hant = [
 '横征暴敛' => '橫徵暴斂',
 '横梁' => '橫樑',
 '横冲' => '橫衝',
-'台布' => '檯布',
 '台历' => '檯曆',
 '台灯' => '檯燈',
 '台球' => '檯球',
@@ -8494,6 +8498,10 @@ public static $zh2Hant = [
 '闯荡' => '闖蕩',
 '闯炼' => '闖鍊',
 '关系' => '關係',
+'关系列' => '關系列',
+'关系所' => '關系所',
+'关系科' => '關系科',
+'关系统' => '關系統',
 '辟佛' => '闢佛',
 '辟作' => '闢作',
 '辟划' => '闢劃',
@@ -9710,6 +9718,7 @@ public static $zh2Hans = [
 '圞' => '𪢮',
 '坿' => '附',
 '垜' => '垛',
+'垻' => '坝',
 '埡' => '垭',
 '執' => '执',
 '堅' => '坚',
@@ -13498,6 +13507,7 @@ public static $zh2Hans = [
 '崑崙' => '昆仑',
 '崑劇' => '昆剧',
 '崑山' => '昆山',
+'崑島' => '昆岛',
 '崑曲' => '昆曲',
 '崑腔' => '昆腔',
 '崑蘇' => '昆苏',
@@ -13875,6 +13885,9 @@ public static $zh2TW = [
 '哥特式' => '哥德式',
 '哥斯达黎加' => '哥斯大黎加',
 '哥斯達黎加' => '哥斯大黎加',
+'唐纳德·特朗普' => '唐納·川普',
+'當勞·特朗普' => '唐納·川普',
+'當奴·特朗普' => '唐納·川普',
 '卡拉奇' => '喀拉蚩',
 '乔治·奥威尔' => '喬治·歐威爾',
 '佐治亚' => '喬治亞',
@@ -13951,6 +13964,7 @@ public static $zh2TW = [
 '尼日尔' => '尼日',
 '尼日爾' => '尼日',
 '雅马哈' => '山葉',
+'特朗普' => '川普',
 '机床' => '工具機',
 '機床' => '工具機',
 '珍寶客機' => '巨無霸客機',
@@ -14105,6 +14119,7 @@ public static $zh2TW = [
 '奥巴马' => '歐巴馬',
 '奧巴馬' => '歐巴馬',
 '正在叱咤' => '正在叱咤',
+'圣佩德罗苏拉' => '汕埠',
 '文莱' => '汶萊',
 '沙律' => '沙拉',
 '沙地阿拉伯' => '沙烏地阿拉伯',
@@ -14270,7 +14285,8 @@ public static $zh2TW = [
 '毛里塔尼亞' => '茅利塔尼亞',
 '霍尔木兹' => '荷姆茲',
 '霍爾木茲' => '荷姆茲',
-'荷李活道' => '荷李活道',
+'荷里活廣場' => '荷里活廣場',
+'荷里活道' => '荷里活道',
 '莫桑比克' => '莫三比克',
 '瓦文萨' => '華勒沙',
 '華里沙' => '華勒沙',
@@ -14349,6 +14365,8 @@ public static $zh2TW = [
 '屏幕' => '螢幕',
 '行人路权' => '行人路權',
 '行人路權' => '行人路權',
+'流動作業系統' => '行動作業系統',
+'移动操作系统' => '行動作業系統',
 '流動網絡' => '行動網路',
 '移动网络' => '行動網路',
 '流動電話' => '行動電話',
@@ -14840,6 +14858,7 @@ public static $zh2HK = [
 '占高枝' => '佔高枝',
 '維德角' => '佛得角',
 '作品里' => '作品裏',
+'操作系统' => '作業系統',
 '來著' => '來着',
 '來著作' => '來著作',
 '來著名' => '來著名',
@@ -15843,6 +15862,8 @@ public static $zh2HK = [
 '數碼訊號' => '數碼訊號',
 '数字电视' => '數碼電視',
 '數位電視' => '數碼電視',
+'数字音乐' => '數碼音樂',
+'數位音樂' => '數碼音樂',
 '數著作' => '數著作',
 '數著名' => '數著名',
 '數著稱' => '數著稱',
@@ -15974,7 +15995,6 @@ public static $zh2HK = [
 '枕著述' => '枕著述',
 '枕著錄' => '枕著錄',
 '檯' => '枱',
-'台布' => '枱布',
 '台历' => '枱曆',
 '台灯' => '枱燈',
 '台面上' => '枱面上',
@@ -16101,6 +16121,8 @@ public static $zh2HK = [
 '活著者' => '活著者',
 '活著述' => '活著述',
 '活著錄' => '活著錄',
+'移动操作系统' => '流動作業系統',
+'行動作業系統' => '流動作業系統',
 '移动网络' => '流動網絡',
 '行動網路' => '流動網絡',
 '移动电话' => '流動電話',
@@ -16313,6 +16335,8 @@ public static $zh2HK = [
 '畫著稱' => '畫著稱',
 '畫著者' => '畫著者',
 '画里' => '畫裏',
+'唐納·川普' => '當勞·特朗普',
+'唐纳德·特朗普' => '當勞·特朗普',
 '當著' => '當着',
 '當著作' => '當著作',
 '過著作' => '當著作',
@@ -18118,6 +18142,9 @@ public static $zh2CN = [
 '哭著稱' => '哭著称',
 '哭著者' => '哭著者',
 '哭著述' => '哭著述',
+'唐納·川普' => '唐纳德·特朗普',
+'當勞·特朗普' => '唐纳德·特朗普',
+'當奴·特朗普' => '唐纳德·特朗普',
 '唱著' => '唱着',
 '唱著書' => '唱著书',
 '唱著作' => '唱著作',
@@ -18180,6 +18207,7 @@ public static $zh2CN = [
 '土魯斯' => '图卢兹',
 '吐瓦魯' => '图瓦卢',
 '原子筆' => '圆珠笔',
+'汕埠' => '圣佩德罗苏拉',
 '聖露西亞' => '圣卢西亚',
 '聖克里斯多福及尼維斯' => '圣基茨和尼维斯',
 '聖吉斯納域斯' => '圣基茨和尼维斯',
@@ -18204,6 +18232,7 @@ public static $zh2CN = [
 '艾菲爾' => '埃菲尔',
 '葉里溫' => '埃里温',
 '功能變數名稱' => '域名',
+'網域名稱' => '域名',
 '吉里巴斯' => '基里巴斯',
 '堂姊' => '堂姐',
 '坎培拉' => '堪培拉',
@@ -18783,6 +18812,7 @@ public static $zh2CN = [
 '數位技術' => '数字技术',
 '數位電視' => '数字电视',
 '數碼電視' => '数字电视',
+'數位音樂' => '数字音乐',
 '資料庫' => '数据库',
 '數著' => '数着',
 '數位照相機' => '数码照相机',
@@ -18964,10 +18994,10 @@ public static $zh2CN = [
 '梳著者' => '梳著者',
 '梳著述' => '梳著述',
 '梵谷' => '梵高',
-'機率' => '概率',
 '欠帳' => '欠账',
 '死帳' => '死账',
 '庇里牛斯' => '比利牛斯',
+'披索' => '比索',
 '畢卡索' => '毕加索',
 '茅利塔尼亞' => '毛里塔尼亚',
 '模里西斯' => '毛里求斯',
@@ -19406,6 +19436,8 @@ public static $zh2CN = [
 '葛摩' => '科摩罗',
 '象牙海岸' => '科特迪瓦',
 '積極份子' => '积极分子',
+'流動作業系統' => '移动操作系统',
+'行動作業系統' => '移动操作系统',
 '流動電話' => '移动电话',
 '行動電話' => '移动电话',
 '流動網絡' => '移动网络',
@@ -19609,6 +19641,8 @@ public static $zh2CN = [
 '螢光棒' => '荧光棒',
 '螢屏' => '荧屏',
 '霍爾斯坦' => '荷尔斯泰因',
+'荷里活廣場' => '荷里活广场',
+'荷里活道' => '荷里活道',
 '莫三比克' => '莫桑比克',
 '雷伊泰灣' => '莱特湾',
 '賴索托' => '莱索托',
index 525be3c..4f0cd70 100644 (file)
@@ -12,7 +12,7 @@
        "tog-watchlisthidecategorization": "midimut kasabelih kakuniza",
        "tog-showhiddencats": "paazih madimutay a kakuniza",
        "underline-always": "mahizatuay",
-       "underline-never": "caaytu",
+       "underline-never": "amana kanca caay",
        "editfont-default": "saazih sakaluk pataayaw tu kawaw a sulyang",
        "editfont-monospace": "malecad ilaed a kataci nu silit",
        "editfont-sansserif": "pacabay tu telay a kataci nu sulit",
        "toolbox": "sakaluk",
        "otherlanguages": "zumaay a kamu",
        "redirectedfrom": "(miliyawtu tazuma nay $1)",
-       "redirectpagesub": "miliyaw tazuma kasabelih",
-       "redirectto": "miliyaw tazuma tu:",
+       "redirectpagesub": "miliyaw patatuzu’",
+       "redirectto": "miliyaw patatuzu’ i:",
        "lastmodifiedat": "uyni kasabelih sazikuz mikawaway tu kalumyiti i $1 $2.",
        "protectedpage": "madiputay a kasabelih",
        "jumpto": "taayaw:",
        "toc": "dilyikotoling",
        "showtoc": "paazih",
        "hidetoc": "midimut",
+       "collapsible-collapse": "piked",
        "collapsible-expand": "micuwat",
        "confirmable-yes": "hang",
        "confirmable-no": "caay",
        "createacct-yourpasswordagain-ph": "pisulitan ku mima kinacacay aca",
        "userlogin-remembermypassword": "i balucu’en aku patalabu setyitase",
        "cannotlogin-title": "la’cus patalabu",
+       "cannotlogin-text": "la’cus patalabu.",
        "cannotloginnow-title": "la’cus patalabu ayza",
        "cannotcreateaccount-title": "la’cusay panganganen ku canghaw",
        "yourdomainname": "numisuay a calay-subal(wangyi):",
        "sig_tip": "misuay a sulit nu ngangan atu demiad, tuki",
        "hr_tip": "Sapisasuala (cayka yadah kawiza)",
        "summary": "pecu’ nu lacul:",
-       "subject": "taazihan tu kawaw:",
+       "subject": "satangahan:",
        "minoredit": "payni mikilulay a mikawaway-kalumyiti",
        "watchthis": "miazih tuyni kasabelih",
        "savearticle": "misuped kasabelih",
        "nextrevision": "kilulay masumad →",
        "currentrevisionlink": "sabaluhay masumad",
        "cur": "ayza",
-       "next": "nuzikuzan",
+       "next": "zikuzan a cacay",
        "last": "ayaway",
        "page_last": "sazikuzay a kasabelih",
        "history-fieldset-title": "mikilim masumad nu ayaway",
        "titlematches": "kasabelih satangah matatungus",
        "textmatches": "kasabelih lacul matatungus",
        "prevn": "ayaw saka {{PLURAL:$1|$1}}",
-       "nextn": "zikuzan saka {{PLURAL:$1|$1}}",
+       "nextn": "zikuzan a cacay {{PLURAL:$1|$1}}",
        "prev-page": "ayaway a belih",
        "next-page": "zikuzan a belih",
        "nextn-title": "nuzikuzan saka {{PLURAL:$1|a heci}}",
        "viewprevnext": "ciwsace ($1 {{int:pipe-separator}} $2) ($3)",
        "searchmenu-new": "<strong> uyni Wiki patizeng ku kasabelih  \"[[:$1]]\"!</strong>{{PLURAL:$2|0=| acasa miazih tu tatenga’ay patalabuay a matepa’ay a heci. |acasa miazih tu tatenga’ay zuma matepa’ay a heci.}}",
        "searchprofile-articles": "lacul kasabelih",
-       "searchprofile-images": "malocimyidiya",
+       "searchprofile-images": "kayadah-myiti",
        "searchprofile-everything": "hamin",
        "searchprofile-advanced": "tapabaw",
        "searchprofile-articles-tooltip": "i labu nu $1 mikilim",
        "searchresultshead": "kilim",
        "stub-threshold-sample-link": "maaziahan",
        "stub-threshold-disabled": "mapasatezep",
+       "timezonelegend": "tatukian a kakitizaan:",
        "localtime": "itiniay a tuki:",
        "servertime": "sefuci-kikay a tuki:",
        "timezoneregion-africa": "Afilika",
        "timezoneregion-america": "Amilikaco",
        "timezoneregion-antarctica": "Nancico",
-       "timezoneregion-arctic": "Sasaamisan",
+       "timezoneregion-arctic": "Sasaamisan nu kitakit",
        "timezoneregion-asia": "Yaco",
        "timezoneregion-australia": "Awco",
        "timezoneregion-europe": "Ouco",
        "group-suppress": "misisipay",
        "group-all": "(hamin)",
        "group-bot-member": "{{GENDER:$1|kikay a tademaw}}",
+       "group-bureaucrat-member": "{{GENDER:$1|situngusay-mikawaway}}",
        "grouppage-bot": "{{ns:project}}:kikay a tademaw",
        "grouppage-sysop": "{{ns:project}}:mikuwanay",
        "grouppage-bureaucrat": "{{ns:project}}:situngusay a mikawaway",
        "grant-uploadfile": "patapabaw ku baluhay a tangan",
        "grant-basic": "anganganay a tungus",
        "newuserlogpage": "patizeng misaungayay nasulitan nakawawan",
+       "action-read": "miasip tina kasabelih",
        "action-edit": "mikawaway-kalumyiti uyni a kasabelih",
+       "action-createpage": "patizeng tina kasabelih",
        "action-move-categorypages": "milimad kakuniza a kasabelih",
        "action-movefile": "milimad tina tangan",
        "action-upload": "patapabaw tina tangan",
+       "action-delete": "misipu tina kasabelih",
        "action-deleterevision": "misipu tu masumaday nu ayaway",
        "action-deletelogentry": "masipu nasulitan nazipa’an  kasacacay",
        "action-sendemail": "pabahel imyiyo(email)",
+       "action-purge": "misipu tina kasabelih",
        "nchanges": "$1 {{PLURAL:$1|misumad}}",
        "enhancedrc-history": "nazipa’an",
        "recentchanges": "capi a demaiday a sumad",
        "upload-file-error": "ilabuay a mungangaw",
        "upload-dialog-button-cancel": "palawpes",
        "upload-dialog-button-back": "tatiku",
-       "upload-dialog-button-done": "pahezek",
+       "upload-dialog-button-done": "malahecitu",
        "upload-dialog-button-save": "suped",
        "upload-dialog-button-upload": "patapabaw",
        "upload-form-label-infoform-title": "pulitaay a kalunasulitan",
        "upload-form-label-infoform-name": "kalungangan",
-       "upload-form-label-infoform-description": "patahkal",
+       "upload-form-label-infoform-description": "sapuelac",
        "upload-form-label-infoform-categories": "kakuniza",
        "upload-form-label-infoform-date": "demiad",
        "uploadstash": "patapabaw ku sulu nu pisipetan",
        "listfiles_name": "kalungangan",
        "listfiles_user": "misaungayay",
        "listfiles_size": "hacica-tabaki",
-       "listfiles_description": "patahkal",
+       "listfiles_description": "sapuelac",
        "listfiles_count": "baziyong",
        "listfiles-latestversion": "ayzaay a baziyong",
        "listfiles-latestversion-yes": "hang",
        "filehist": "tangan nu nazipa’an",
        "filehist-help": "sapecec ku demiad/tuki sapiciwsace ku tuki nina demiad a tangan baziyong",
        "filehist-deleteall": "haminan misipu",
+       "filehist-revert": "patiku",
        "filehist-current": "ayza",
        "filehist-datetime": "demiad/tuki",
        "filehist-thumb": "sukep tu zunga",
        "apihelp": "buhci tu kamu nu API",
        "apisandbox": "bunac haku nu API",
        "apisandbox-fullscreen": "micuwat tu sapat",
+       "apisandbox-unfullscreen": "paazih  kasabelih",
        "apisandbox-submit": "miawaw tu milunguc",
        "apisandbox-reset": "palawpis",
        "apisandbox-retry": "miliyaw mitaneng",
        "emailusernamesubmit": "patayzaan",
        "emailfrom": "patigamiay:",
        "emailto": "katukuh:",
-       "emailsubject": "taazihan tu kawaw:",
+       "emailsubject": "satangahan:",
        "emailmessage": "palatuh:",
        "emailsend": "patigamitu",
        "watchlist": "miazihay a piazihan tu sulit",
        "protect-othertime": "zuma a tatukian:",
        "protect-otherreason-op": "zuma a mahicaay",
        "protect-edit-reasonlist": "midiput a mahicaay nu mikawaway-kalumyiti",
-       "restriction-type": "pabeli tu kinli mahasa:",
+       "restriction-type": "tungus:",
        "restriction-level": "kelec kasaselal:",
        "minimum-size": "makaadidi’ay a sausi",
        "maximum-size": "sakatabakiay a sausi:",
        "restriction-create": "patizeng",
        "restriction-upload": "patapabaw",
        "restriction-level-sysop": "maenapay a diput",
-       "restriction-level-autoconfirmed": "madiputay a kasabelih - satizep mikawaway tu kalumyiti",
+       "restriction-level-autoconfirmed": "lalusa-diput",
        "restriction-level-all": "amahicahicaay a kasalelal",
        "undelete-fieldset-title": "patiku misumad nu ayaway",
        "undeletebtn": "patiku",
+       "undeleteinvert": "kabelihan mipili’",
        "undeletecomment": "mahicaay:",
        "undelete-search-submit": "kilim",
        "undelete-show-file-submit": "hang",
        "whatlinkshere-title": "masasiket tazumaay a \"$1\" kasabelih",
        "whatlinkshere-page": "Kasabelih:",
        "linkshere": "isasaay a kasabelih masasiket tazuma tu <strong>[[:$1]]</strong>:",
-       "isredirect": "miliyaw tazuma kasabelih",
+       "isredirect": "miliyaw patatuzu’",
        "istemplate": "palaculen tu kasabelih",
        "isimage": "tangan-tangan misiket",
        "whatlinkshere-prev": "saka {{PLURAL:$1|nuayaway}}",
        "ipb-confirm": "malucekay tu langat",
        "blockipsuccesssub": "milangat malahci",
        "ipb-edit-dropdown": "malangat a mahicaay nu mikawaway-kalumyiti",
+       "ipb-unblock-addr": "mihulak tu langat $1",
        "ipb-blocklist-duration-left": "$1 pakawili",
        "ipusubmit": "misipu tina langat",
        "autoblocklist-submit": "kilim",
        "noautoblockblock": "mapasatezep lunuk  milangat",
        "emailblock": "mapasatezep imyiyo(email)",
        "blocklink": "milangat",
+       "unblocklink": "mihulak tu langat",
        "change-blocklink": "misumad tu langat",
        "contribslink": "paanin",
        "emaillink": "pabahel imyiyo(email)",
        "allmessages-filter-translate": "mibelih",
        "thumbnail-more": "patabaki(micuwat)",
        "filemissing": "tangan mahedaw",
+       "thumbnail_image-missing": "tangan mahedaw: $1",
        "import": "pacumuden kasabelih",
        "import-interwiki-sourcepage": "saangangan kasabelih:",
        "import-interwiki-templates": "yamalyilu sacahamin  taazihan mitudung",
        "tooltip-ca-edit": "mikawaway-kalumyiti uyni a kasabelih",
        "tooltip-ca-viewsource": "uyni kasabelih madiputay tuway.\nkapah kisu miciwsace tuyni kasabelih sakatizeng bangu",
        "tooltip-ca-history": "uyini kasabelih nasawniay a sumad",
+       "tooltip-ca-protect": "midiput tina kasabelih",
+       "tooltip-ca-delete": "misipu tina kasabelih",
        "tooltip-ca-move": "milimad tina kasabelih",
        "tooltip-ca-watch": "paynien kasabelih micunus misuay cyinse piazihan tu sulit",
        "tooltip-search": "kilim {{SITENAME}}",
        "show-big-image-preview": "pataayaway miazih hacica ku tabaki: $1.",
        "show-big-image-size": "$1 × $2 syangsu",
        "file-info-gif-looped": "palalacalen",
-       "file-info-gif-frames": "$1 {{PLURAL:$1|misabacu}}",
-       "file-info-png-frames": "$1 {{PLURAL:$1|misabacu}}",
+       "file-info-gif-frames": "$1 {{PLURAL:$1|kulit sapat}}",
+       "file-info-png-frames": "$1 {{PLURAL:$1|kulit sapat}}",
        "newimages": "baluhay tangan a sulu nu zunga",
        "newimages-legend": "kilim",
        "noimages": "inayi’ amahicahica tu zunga.",
        "gallery-slideshow-toggle": "ketun mibalic sukep tu zunga",
        "ilsubmit": "kilim",
        "bydate": "ahizan tu demiad",
+       "seconds": "$1 a {{PLURAL:$1|abeti}}",
        "minutes": "{{PLURAL:$1|$1 widi}}",
        "hours": "{{PLURAL:$1|$1 tuki}}",
        "days": "$1 {{PLURAL:$1|a demiad}}",
        "ago": "ayaw nu $1",
        "just-now": "nasawni",
+       "hours-ago": "ayaw $1 {{PLURAL:$1|a tuki}}",
+       "minutes-ago": "ayaw $1 {{PLURAL:$1|widi}}",
+       "seconds-ago": "ayaw $1 {{PLURAL:$1|a beti}}",
        "monday-at": "sakacacay a demiad nu lipay i$1",
        "friday-at": "sakalima a demied nu lipay i $1",
        "saturday-at": "sakaenem a demiad nu lipay i $1",
        "metadata": "pulita tu kalunasulitan",
        "metadata-help": "uyni tangan labuay amin yamalyilu zuma cesyun, uyni a cesyun akay nay suewyi  sasasing asaca sapisekyin i tapang asaca suwyihwa saayaw katukuh pahzekan a nakawawan mapacunusay. anu nay tangan saayaway setyitase masumadtu, hatizaay pulita kalunasulitan akay la’cus mileku mabetil a misumad tu tangan.",
+       "metadata-expand": "paazih pulita kalunasulitan",
+       "metadata-collapse": "midimut pulitaay a kalunasulitan",
        "metadata-fields": "i tini palatuh patahkal i labuay a EXIF pulita tu kalunasulitanay a kakitizaan, yamalyilu i zunga paazih kasabelih, sapipulita tu cudad nu nasulitan malepi’ paazih palatuh.\nzumaay a pulita tu cudad pataayaw tu kawaw midimut.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
        "exif-imagewidth": "ahebal",
        "exif-imagelength": "takalaw sulyang",
        "exif-gaincontrol": "makaazihay misimaw",
        "exif-contrast": "e-contrast",
        "exif-saturation": "matumesay a sulyang",
+       "exif-sharpness": "kacidem",
        "exif-devicesettingdescription": "sakaluk setin sapuelac",
        "exif-gpslatituderef": "pyiwyi asaca nanwyi",
        "exif-gpslongituderef": "tongcing asaca sicing",
        "exif-gpsdatestamp": "GPS a demiad",
        "exif-keywords": "aazihen dulit",
        "exif-worldregioncreated": "zunga masasing a kakitizaan",
+       "exif-countrycreated": "zunga masasingan a kanatal",
        "exif-provinceorstatecreated": "yakuwanan a sasing",
        "exif-citycreated": "yatukay a sasing",
        "exif-countrydest": "paazih tu kanatal",
        "exif-label": "aazihen paya",
        "exif-rightscertificate": "nisanga’an niza tu tungus a kawaw nu makuwanay a pincen",
        "exif-copyrighted": "nisanga’an niza tu tungus a kawaw setyitase",
+       "exif-copyrightowner": "nizaay nisanga’an tu tungus a kawaw",
        "exif-usageterms": "mamaala a cedang",
        "exif-webstatement": "nabalucu'an nu i telay nisanga’an niza tu tungus a kawaw",
        "exif-morepermissionsurl": "paliyuh pabeli tu kinli a cesyun",
        "exif-exposureprogram-4": "kiyata maluayaw",
        "exif-subjectdistance-value": "$1 mi",
        "exif-meteringmode-2": "pikuwanan pacunus lalet",
+       "exif-meteringmode-3": "baniyut-ditek",
+       "exif-meteringmode-4": "kayadah- baniyut-ditek",
        "exif-meteringmode-5": "muse",
+       "exif-meteringmode-6": "liyad",
        "exif-meteringmode-255": "zuma",
        "exif-lightsource-1": "likat",
        "exif-lightsource-2": "inkwang a tinghuy",
        "exif-objectcycle-b": "namalanam atu namalahuk",
        "exif-gpsdirection-t": "tatengaay tatuzu’an",
        "exif-gpsdirection-m": "tatuzu'an nu tyice",
+       "exif-ycbcrpositioning-1": "teban",
        "exif-ycbcrpositioning-2": "palecad miala tu maaziahan",
        "exif-dc-contributor": "paaninay tu kalusasing",
        "exif-dc-date": "demiad",
        "exif-iimcategory-spo": "wundukay",
        "exif-iimcategory-wea": "demidad",
        "exif-urgency-normal": "tatungus ($1)",
+       "exif-urgency-low": "pu’nel ($1)",
        "exif-urgency-high": "takalaw ($1)",
        "namespacesall": "hamin",
        "monthsall": "hamin",
        "recreate": "miliyaw miteka patizeng",
+       "confirm-purge-title": "misipu tina kasabelih",
        "confirm_purge_button": "malucekay",
        "confirm-watch-button": "malucekay",
        "confirm-unwatch-button": "malucekay",
        "confirm-rollback-button": "malucekay",
        "quotation-marks": "\"$1\"",
+       "imgmultipageprev": "ayaway cacay a belih",
        "imgmultipagenext": "zikuzan a belih →",
        "imgmultigo": "mileku!",
        "img-lang-default": "(pataayaw tu kawaw a kamu)",
        "ascending_abbrev": "masalaylay adidi’ay katukuh tabakiay",
        "descending_abbrev": "masalaylay tabakiay katukuh adidi’ay",
        "table_pager_next": "zikuzan a belih",
+       "table_pager_first": "sakacacay a belih",
        "table_pager_last": "sazikuzay a kasabelih",
        "table_pager_limit_label": "paybelih a sulit:",
        "table_pager_limit_submit": "mileku",
        "watchlistedit-normal-title": "miazihay a piazihan tu sulit nu mikawaway-kalumyiti",
        "watchlistedit-normal-submit": "misipu satangahan",
        "watchlistedit-clear-title": "misipu miazihay a piazihan tu sulit",
+       "watchlisttools-clear": "misipu miazihay a piazihan tu sulit",
        "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1| sasukamu ]])",
        "timezone-local": "itizaay",
        "version": "baziyong",
        "version-skins": "malacul tu nuhekalan",
        "version-specialpages": "sazumaay a kasabelih",
        "version-parserhooks": "kulawid nu saheciay sakaluk",
+       "version-variables": "masumaday-sausi",
        "version-other": "zuma",
        "version-mediahandlers": "myiti saungayay a sakaluk",
        "version-hooks": "kulawid",
        "version-skin-colheader-name": "nuhekalan",
        "version-ext-colheader-version": "baziyong",
        "version-ext-colheader-license": "sapabeli tu kinli a cedang",
-       "version-ext-colheader-description": "patahkal",
+       "version-ext-colheader-description": "sapuelac",
        "version-ext-colheader-credits": "masacudaday",
        "version-poweredby-others": "zuma",
        "version-software": "malacul tu ku zwanti",
        "version-libraries-library": "sulu nu cengse",
        "version-libraries-version": "baziyong",
        "version-libraries-license": "sapabeli tu kinli a cedang",
-       "version-libraries-description": "patahkal",
+       "version-libraries-description": "sapuelac",
        "version-libraries-authors": "masacudaday",
        "redirect-submit": "mileku",
+       "redirect-lookup": "palalitemuh tu kawaw:",
+       "redirect-value": "sulyang:",
        "redirect-page": "kasabelih ID",
        "redirect-file": "kalungangan nu tangan",
        "redirect-logid": "nasulitan nazipa’an ID",
        "tag-filter-submit": "kilim",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|aazihen paya’}}]]: $2)",
        "tag-mw-contentmodelchange": "lacul tatudungen misanga’  misumad",
+       "tags-title": "aazihen a paya",
        "tags-tag": "aazihen a paya  kalungangan",
        "tags-source-header": "saangangan",
+       "tags-active-header": "miwawah",
        "tags-actions-header": "saungay",
        "tags-active-yes": "hang",
        "tags-active-no": "caay",
        "rightsnone": "(nayi’)",
        "feedback-back": "tatiku",
        "feedback-cancel": "palawpes",
-       "feedback-close": "pahezek",
+       "feedback-close": "malahecitu",
        "feedback-external-bug-report-button": "munday nu patubeli",
        "feedback-message": "palatuh:",
-       "feedback-subject": "taazihan tu kawaw:",
+       "feedback-subject": "satangahan:",
        "feedback-submit": "patayzaan",
        "feedback-thanks-title": "kukay tisuwanan!",
        "searchsuggest-search": "kilim {{SITENAME}}",
        "api-error-unknownerror": "caay kapulita ku mungangaw: \"$1\".",
        "duration-seconds": "$1 {{PLURAL:$1|a beti}}",
+       "duration-minutes": "$1 {{PLURAL:$1|widi}}",
        "duration-hours": "$1 {{PLURAL:$1|tuki}}",
        "duration-weeks": "$1 {{PLURAL:$1|a lipas}}",
        "duration-years": "$1 {{PLURAL:$1|a mihca}}",
        "action-pagelang": "misumad kasabelih a kamu",
        "log-name-pagelang": "kamu misumad a nasulitan nazipa’an",
        "mediastatistics": "myiti sausi cesyun",
+       "mediastatistics-table-mimetype": "MIME nikalahizaan",
        "mediastatistics-table-extensions": "kapah saungay a mikilulay a ngangan nu tangan",
        "mediastatistics-table-count": "tangan nikayadah",
        "mediastatistics-table-totalbytes": "pulung sausi nu hacica-tabaki",
        "log-action-filter-all": "hamin",
        "log-action-filter-block-block": "milangat",
        "log-action-filter-block-reblock": "milangat tu sapisumad",
+       "log-action-filter-block-unblock": "mihulak tu langat",
        "log-action-filter-delete-delete": "misipu kasabelih",
        "log-action-filter-delete-delete_redir": "miliyaw patatuzu’ mipakutay tu sulit",
        "log-action-filter-delete-restore": "kasabelih milawpes tu sipu",
        "authmanager-provider-temporarypassword": "nanunuz a mima",
        "authprovider-confirmlink-request-label": "manakanca masasiket tu canghaw",
        "authprovider-resetpass-skip-label": "sekipo",
+       "authform-newtoken": "mahedaw mima-sacukcuk. $1",
        "authform-wrongtoken": "mima-sacukcuk mungangaw",
        "specialpage-securitylevel-not-allowed-title": "amana",
        "cannotauth-not-allowed-title": "caykataneng ku tungus",
-       "changecredentials": "misumad tu sapangangan",
+       "changecredentials": "misumad tu sapangangan-wacay",
        "removecredentials": "misipu sapangangan",
        "credentialsform-provider": "pincen nikalahizaan:",
        "credentialsform-account": "canghaw kalungangan:",
index d2173a2..3e3b6e6 100644 (file)
        "recentchanges-legend-heading": "<strong>Legenda:</strong>",
        "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (həmçinin bax: [[Special:NewPages|yeni səhifələrin siyahısı]])",
        "recentchanges-submit": "Göstər",
+       "rcfilters-legend-heading": "<strong>Abreviaturalar siyahısı:</strong>",
+       "rcfilters-other-review-tools": "<strong>Digər yoxlama alətləri</strong>",
+       "rcfilters-group-results-by-page": "Dəyişiklikləri səhifələrə görə qruplaşdır",
+       "rcfilters-grouping-title": "Qruplaşdırma",
+       "rcfilters-activefilters": "Aktiv filtrlər",
+       "rcfilters-advancedfilters": "Geniş filtr",
+       "rcfilters-limit-title": "Göstərilməli dəyişikliklər",
+       "rcfilters-limit-shownum": "Son {{PLURAL:$1|dəyişikliyi|$1 dəyişikliyi}} göstər",
+       "rcfilters-days-title": "Son günlər",
+       "rcfilters-hours-title": "Son saatlar",
+       "rcfilters-quickfilters": "Yaddaşdakı filtrlər",
+       "rcfilters-quickfilters-placeholder-title": "Yaddaşa verilmiş keçid yoxdur",
+       "rcfilters-quickfilters-placeholder-description": "Filtr nizamlamalarını yaddaşda saxlamaq və sonradan təkrar istifadə etmək üçün aşağıdakı Aktiv Filtrlər bölməsindəki əlfəcin nişanını tıqlayın.",
+       "rcfilters-savedqueries-remove": "Sil",
        "rcfilters-savedqueries-new-name-label": "Ad",
        "rcfilters-savedqueries-cancel-label": "Ləğv et",
+       "rcfilters-restore-default-filters": "Standart filtrləri bərpa et",
+       "rcfilters-clear-all-filters": "Bütün filtrləri sil",
+       "rcfilters-show-new-changes": "Ən son dəyişiklikləri göstər",
+       "rcfilters-search-placeholder": "Son dəyişiklikləri filtrlə (siyahıdan seçin və ya yazın)",
+       "rcfilters-empty-filter": "Aktiv filtr yoxdur. Bütün redaktələr göstərilir.",
        "rcfilters-filterlist-title": "Filtrlər",
+       "rcfilters-highlightbutton-title": "Nəticələri vurğula",
+       "rcfilters-highlightmenu-title": "Rəng seçin",
+       "rcfilters-highlightmenu-help": "Bu xüsusiyyəti rəngləmək üçün rəng seçin",
+       "rcfilters-filtergroup-authorship": "Redaktələrin müəllifliyi",
+       "rcfilters-filtergroup-userExpLevel": "İstifadəçi qeydiyyatı və təcrübəsi",
+       "rcfilters-filtergroup-automated": "Avtomatik redaktələr",
        "rcfilters-filter-bots-label": "Bot",
+       "rcfilters-filtergroup-significance": "Əhəmiyyətlilik",
        "rcfilters-filter-minor-label": "Kiçik redaktələr",
+       "rcfilters-filtergroup-watchlist": "İzləmə siyahısındakı səhifələr",
+       "rcfilters-filtergroup-changetype": "Dəyişiklik növü",
+       "rcfilters-filter-logactions-label": "Qeydiyyatlı redaktələr",
+       "rcfilters-filtergroup-lastRevision": "Son versiyalar",
+       "rcfilters-exclude-button-off": "Seçilənləri istisna et",
+       "rcfilters-exclude-button-on": "Seçilmişlərin çıxarılması",
+       "rcfilters-view-tags": "Etiketlənmiş redaktələr",
+       "rcfilters-view-namespaces-tooltip": "Nəticələri adlar fəzasına görə filtrlə",
+       "rcfilters-view-tags-tooltip": "Nəticələri redaktə etiketləri əsasında filtrlə",
        "rcnotefrom": "Aşağıda <strong>$2</strong>-dən bu yana olan dəyişikliklər göstərilib (<strong>$1</strong>-dən çox olmayaraq).",
        "rclistfrom": "$3 $2 vaxtından başlayaraq yeni dəyişiklikləri göstər",
        "rcshowhideminor": "Kiçik redaktələri $1",
        "recentchangeslinked-summary": "Aşağıdakı siyahı, qeyd olunan səhifəyə (və ya qeyd olunan kateqoriyadakı səhifələrə) daxili keçid verən səhifələrdə edilmiş son dəyişikliklərin siyahısıdır.\n[[Special:Watchlist|İzləmə siyahınızdakı]] səhifələr '''qalın''' şriftlə göstərilmişdir.",
        "recentchangeslinked-page": "Səhifə adı:",
        "recentchangeslinked-to": "Qeyd olunan səhifədəki deyil, ona daxili keçid verən səhifələrdəki dəyişiklikləri göstər",
+       "recentchanges-page-added-to-category": "[[:$1]] kateqoriyaya əlavə edildi",
        "upload": "Fayl yüklə",
        "uploadbtn": "Sənəd yüklə",
        "reuploaddesc": "Return to the upload form.",
index e21d635..8b650ca 100644 (file)
        "search-interwiki-caption": "قارداش پروژه‌لر",
        "search-interwiki-default": "$1 دان سونوجلار:",
        "search-interwiki-more": "(داها)",
-       "search-interwiki-more-results": "داها چوْخ سوْنوج‌لار",
+       "search-interwiki-more-results": "داها چوْخ نتیجه‌لر",
        "search-relatedarticle": "ایلگیلی",
        "searchrelated": "ایلگیلی",
        "searchall": "بوتون",
        "prefs-help-prefershttps": "سیزین بو ترجیحینیزین اثری سیزین سونراکی گیریشینیز دن سونرا اولاجاق.",
        "prefswarning-warning": "ترجیحلرینیزه اولان دَییشیک لر هله آرتیریلمیب.\nایر بو صفحه نین \"$1\" اوستونه باسیلمامیشدان اونجه ترک ائتسز ترجیحلرینیز آرتیریلمییاجاق.",
        "prefs-tabs-navigation-hint": "ایپ اوجو : سیز ائلیه بیلرسیز ساغ و سول جهت نیما کیلید لریندن نیشانه نه نین دولانماسی نیشانه لر لیستینده ایستفاده ائده سیز.",
-       "userrights": "ایشلدیجی حاقلاری",
-       "userrights-lookup-user": "بیر ایشدیجی سئچ",
+       "userrights": "ایشلدن حاقلاری",
+       "userrights-lookup-user": "بیر ایشلدن سئچ",
        "userrights-user-editname": "ایستیفاده‌چی آدی‌نیزی یازین",
        "editusergroup": "ایستیفاده‌چی قروپونو دَییشدیر",
        "editinguser": "ایستیفاده‌چی '[[User:$1|$1]]' $2 اوچون ایستیفاده‌چی حقوق‌لاری دییشدیریلیر",
        "userrights-changeable-col": "ديَیشدیره بیلدیگینیز قروپلار",
        "userrights-unchangeable-col": "ديَیشدیره بیلمه‌دیگینیز قروپلار",
        "userrights-expiry-current": "$1-ده قۇرتولور",
-       "userrights-expiry-othertime": "باشÙ\82ا Ù\88اخت",
+       "userrights-expiry-othertime": "Ø¢Û\8cرÛ\8c Ú\86اغ",
        "userrights-conflict": "ایستیفاده‌چی حاقلاری توققوشماسی! لوطفاً گوزله ین و دَییشدیرمه‌لرینیزی یئنی‌دن ائدین.",
        "group": "گروه:",
        "group-user": "ایستفاده‌چیلر",
index ce6ae9e..39761c5 100644 (file)
        "parser-template-loop-warning": "Выяўлены цыкль у шаблёнах: [[$1]]",
        "template-loop-category": "Старонкі з цыклямі шаблёнаў",
        "template-loop-category-desc": "Старонка ўтрымлівае цыкль шаблёну, г. зн., шаблён уключае сам сябе рэкурсіўна.",
+       "template-loop-warning": "<strong>Папярэджаньне:</strong> гэтая старонка выклікае [[:$1]], які зьяўляецца прычынай цыклю шаблёнаў (бясконцы рэкурсіўны выклік).",
        "parser-template-recursion-depth-warning": "Перавышаны ліміт глыбіні рэкурсіі шаблёну ($1)",
        "language-converter-depth-warning": "Перавышанае абмежаваньне глыбіні канвэртару варыянтаў мовы ($1)",
        "node-count-exceeded-category": "Старонкі зь перавышанай колькасьцю вузлоў",
        "cannotlink-no-provider-title": "Няма рахункаў для далучэньня",
        "cannotlink-no-provider": "Няма рахункаў для далучэньня.",
        "linkaccounts": "Далучэньне рахункаў",
-       "linkaccounts-success-text": "Рахунак быў далучаны."
+       "linkaccounts-success-text": "Рахунак быў далучаны.",
+       "linkaccounts-submit": "Далучыць рахункі"
 }
index 6812863..77d0083 100644 (file)
@@ -71,6 +71,7 @@
        "tog-watchlisthideminor": "অনুল্লেখ্য সম্পাদনাগুলো নজরতালিকায় লুকিয়ে রাখা হোক",
        "tog-watchlisthideliu": "অ্যাকাউন্টে প্রবেশকৃত ব্যবহারকারীদের সম্পাদনাগুলি নজরতালিকায় লুকিয়ে রাখা হোক",
        "tog-watchlistreloadautomatically": "প্রতিবার একটি ছাঁকনি পরিবর্তন হওয়া মাত্রই স্বয়ংক্রিয়ভাবে নজরতালিকাটি পুনঃলোড করা হোক (জাভাস্ক্রিপ্ট প্রয়োজন)",
+       "tog-watchlistunwatchlinks": "নজরতালিকার ভুক্তিতে সরাসরি দেখা/না দেখার সংযোগ যুক্ত করুন (এই কার্যকারিতা জন্য জাভাস্ক্রিপ্ট প্রয়োজন)",
        "tog-watchlisthideanons": "বেনামী ব্যবহারকারীদের সম্পাদনাগুলি নজরতালিকায় আড়ালে রাখা হোক",
        "tog-watchlisthidepatrolled": "পরীক্ষিত সম্পাদনাগুলি নজরতালিকায় লুকিয়ে রাখা হোক",
        "tog-watchlisthidecategorization": "পাতার শ্রেণীবদ্ধকরণ লুকিয়ে রাখা হোক",
        "permissionserrorstext-withaction": "আপনার $2 অনুমতি নেই, যার {{PLURAL:$1|কারণটি|কারণগুলি}} হল:",
        "contentmodelediterror": "আপনি এই পুনর্বিবেচনা সম্পাদনা করতে পারবেন না কারণ এর বিষয়বস্তু মডেল <code>$1</code>, যা বর্তমান বিষয়বস্তু মডেল <code>$2</code>-এর থেকে ভিন্ন।",
        "recreate-moveddeleted-warn": "'''সতর্কীকরণ: আপনি এমন একটি পাতা পুনরায় তৈরি করছেন যা পূর্বে অপসারণ করা হয়েছিল।'''\n\nআপনি পাতাটি সম্পাদনা চালিয়ে যাওয়া ঠিক হবে কিনা, তা বিবেচনা করুন।\nআপনার সুবিধার্থে পাতাটির অপলুপ্তি লগ এখানে দেয়া হলো:",
-       "moveddeleted-notice": "এই পাতাটি অপসারণ করা হয়েছে।\nসূত্র হিসেবে নিচে এ পাতার অবলুপ্তি লগ দেওয়া হলো।",
+       "moveddeleted-notice": "এই পাতাটি অপসারণ করা হয়েছে।\nসূত্র হিসেবে নিচে এই পাতার অপসারণ, সুরক্ষা ও স্থানান্তর লগ দেওয়া হলো।",
        "moveddeleted-notice-recent": "দুঃখিত, এই পাতাটি সাম্প্রতি অপসারিত হয়েছে (সর্বশেষ ২৪ ঘণ্টায়)।\nসূত্র হিসেবে নিচে এই পাতা অপসারণ, সুরক্ষা ও স্থানান্তর লগ দেয়া হয়েছে।",
        "log-fulllog": "সম্পূর্ণ লগ দেখুন",
        "edit-hook-aborted": "হূক দ্বারা সম্পাদনা পরিত্যক্ত হয়েছে।\nএর কোন ব্যাখ্যা নাই।",
        "rcfilters-savedqueries-new-name-label": "নাম",
        "rcfilters-savedqueries-new-name-placeholder": "ছাঁকনির উদ্দেশ্য বর্ণনা করুন",
        "rcfilters-savedqueries-apply-label": "ছাঁকনি তৈরি করুন",
+       "rcfilters-savedqueries-apply-and-setdefault-label": "পূর্বনির্ধারিত ছাঁকনি তৈরি করুন",
        "rcfilters-savedqueries-cancel-label": "বাতিল",
        "rcfilters-savedqueries-add-new-title": "বর্তমান ছাঁকনির সেটিং সংরক্ষণ করুন",
        "rcfilters-restore-default-filters": "পূর্বনির্ধারিত ছাঁকনি পুনরুদ্ধার করুন",
        "rcfilters-filterlist-noresults": "কোনও ছাঁকনি পাওয়া যায়নি",
        "rcfilters-noresults-conflict": "কোনও ফলাফল পাওয়া যায়নি কারণ অনুসন্ধানের মাপকাঠিগুলির মধ্যে সংঘর্ষ আছে",
        "rcfilters-state-message-subset": "এই ছাঁকনিটির কোন প্রভাব নেই কারণ এর ফলাফলগুলি নিম্নোক্ত বৃহত্তর পরিধির {{PLURAL:$2|ছাঁকনিটির|ছাঁকনিগুলির}} মধ্যে অন্তর্ভুক্ত আছে (আলোকপাত করে এটিকে আলাদা করে দেখার চেষ্টা করুন): $1",
-       "rcfilters-state-message-fullcoverage": "à¦\95à§\8bন à¦¦à¦²à§\87র à¦¸à¦®à¦¸à§\8dত à¦\9bাà¦\81à¦\95নি à¦¨à¦¿à¦°à§\8dবাà¦\9aন à¦\95রা à¦\8fবà¦\82 à¦\95à§\8bন à¦\9bাà¦\81à¦\95নিà¦\87 à¦¨à¦¿à¦°à§\8dবাà¦\9aন না করা একই কথা, তাই এই ছাঁকনিটির কোন প্রভাব নেই। এই দলে অন্তর্ভুক্ত ছাঁকনিগুলি হল: $1",
+       "rcfilters-state-message-fullcoverage": "à¦\8fà¦\87 à¦¦à¦²à§\87র à¦¸à¦®à¦¸à§\8dত à¦\9bাà¦\81à¦\95নি à¦¨à¦¿à¦°à§\8dবাà¦\9aন à¦\95রা, না করা একই কথা, তাই এই ছাঁকনিটির কোন প্রভাব নেই। এই দলে অন্তর্ভুক্ত ছাঁকনিগুলি হল: $1",
        "rcfilters-filtergroup-authorship": "কার দ্বারা পরিবর্তিত",
        "rcfilters-filter-editsbyself-label": "আপনার দ্বারা পরিবর্তিত",
        "rcfilters-filter-editsbyself-description": "আপনার নিজস্ব অবদান।",
        "rcfilters-filter-watchlist-notwatched-label": "নজরতালিকাভুক্ত নয়",
        "rcfilters-filter-watchlist-notwatched-description": "আপনার নজরতালিকায় থাকা পাতাগুলি ব্যতীয় সবকিছু।",
        "rcfilters-filtergroup-watchlistactivity": "নজরতালিকার কার্যক্রম",
+       "rcfilters-filter-watchlistactivity-unseen-label": "অদেখা পরিবর্তন",
+       "rcfilters-filter-watchlistactivity-seen-label": "দেখা পরিবর্তন",
        "rcfilters-filtergroup-changetype": "পরিবর্তনের ধরন",
        "rcfilters-filter-pageedits-label": "পাতার সম্পাদনা",
        "rcfilters-filter-pageedits-description": "উইকি বিষয়বস্তু, আলোচনা, বিষয়শ্রেণীর বিবরণ... ইত্যাদিতে সম্পাদনা",
        "rcfilters-tag-prefix-namespace-inverted": "$1 <strong>:নয়</strong>",
        "rcfilters-view-advanced-filters-label": "উন্নত ছাঁকনি",
        "rcfilters-view-tags": "ট্যাগকৃত সম্পাদনা",
+       "rcfilters-view-namespaces-tooltip": "নামস্থান অনুযায়ী ফলাফল ছাঁকুন",
        "rcfilters-view-tags-tooltip": "সম্পাদনা ট্যাগ ব্যবহার করে ফলাফল ছাঁকুন",
        "rcfilters-view-return-to-default-tooltip": "মূল ছাঁকনির মেনুতে ফিরুন",
        "rcfilters-liveupdates-button": "সরাসরি হালনাগাদ",
        "rcfilters-liveupdates-button-title-on": "সরাসরি হালনাগাদ বন্ধ করুন",
+       "rcfilters-watchlist-markseen-button": "দেখা হিসাবে সব পরিবর্তন চিহ্নিত করুন",
        "rcnotefrom": "<strong>$2</strong>টা থেকে সংঘটিত পরিবর্তনগুলি (সর্বোচ্চ <strong>$1টি</strong> দেখানো হয়েছে)।",
        "rclistfromreset": "তারিখ নির্বাচন পুনঃস্থাপন করুন",
        "rclistfrom": "$2, $3 তারিখের পর সংঘটিত নতুন পরিবর্তনগুলো দেখাও",
        "unwatchthispage": "নজর সরিয়ে নিন",
        "notanarticle": "বিষয়বস্তু পাতা নয়",
        "notvisiblerev": "অপর একজন ব্যবহারকারী কর্তৃক প্রণীত সর্বশেষ সংস্করণটি অপসারিত হয়েছে",
-       "watchlist-details": "à¦\86পনার à¦¨à¦\9cরতালিà¦\95াতà§\87 {{PLURAL:$1|$1à¦\9fি à¦ªà¦¾à¦¤à¦¾}} à¦\86à¦\9bà§\87 (à¦\86লাপ à¦ªà¦¾à¦¤à¦¾à¦\97à§\81লি à¦\97ণনায় à¦¨à¦¾ à¦§à¦°à§\87)।",
+       "watchlist-details": "à¦\86পনার à¦¨à¦\9cরতালিà¦\95ায় {{PLURAL:$1|$1à¦\9fি à¦ªà¦¾à¦¤à¦¾}} à¦\86à¦\9bà§\87 (à¦\86লাপ à¦ªà¦¾à¦¤à¦¾à¦¸à¦¹)।",
        "wlheader-enotif": "ইমেল বিজ্ঞপ্তি সক্রিয় করা আছে।",
        "wlheader-showupdated": "আপনার শেষ আগমনের পর থেকে যেসব পাতায় পরিবর্তন হয়েছে সেগুলি '''গাঢ়''' করে দেখানো হয়েছে।",
        "wlnote": "নিচে $3, $4 তারিখ থেকে বিগত {{PLURAL:$2|১ ঘন্টায়|<strong>$2</strong> ঘন্টায়}} সংঘটিত {{PLURAL:$1|শেষ ১টি পরিবর্তন|শেষ <strong>$1টি</strong> পরিবর্তন}} দেখানো হল।",
        "compare-title-not-exists": "আপনার কাঙ্ক্ষিত শিরোনামটি নেই।",
        "compare-revision-not-exists": "আপনার কাঙ্ক্ষিত সংস্করণটি নেই।",
        "diff-form": "পার্থক্য",
+       "diff-form-submit": "পার্থক্য দেখান",
+       "permanentlink": "স্থায়ী সংযোগ",
+       "permanentlink-revid": "সংশোধন আইডি",
        "permanentlink-submit": "এই সংশোধনে যান",
        "dberr-problems": " দুঃখিত! এই সাইটটি বর্তমানে কারীগরী অসুবিধার মুখোমুখি হয়েছে।",
        "dberr-again": "কয়েক মিনিট পর পুনরায় পরিদর্শনের চেষ্টা করুন।",
        "undelete-cantedit": "আপনি এই পাতাটি ফিরিয়ে আনতে পারবেন না কারণ আপনার এই পাতাটি সম্পাদনা করার অনুমতি নেই।",
        "undelete-cantcreate": "আপনি এই পাতাটি ফিরিয়ে আনতে পারবেন না কারণ এই নামে কোন পাতা বিদ্যমান নেই ও আপনার এই পাতাটি তৈরি করার অনুমতি নেই।",
        "pagedata-title": "পাতার উপাত্ত",
+       "pagedata-not-acceptable": "কোন মিলে যাওয়া বিন্যাস পাওয়া যায় নি। সমর্থিত MIME ধরনগুলি হল: $1",
        "pagedata-bad-title": "অপ্রযোজ্য শিরোনাম: \"$1\""
 }
index d99bf55..b53395e 100644 (file)
@@ -56,7 +56,8 @@
                        "Jaumeortola",
                        "Kippelboy",
                        "Syum90",
-                       "Xð"
+                       "Xð",
+                       "Abella"
                ]
        },
        "tog-underline": "Subratlla els enllaços:",
        "hidden-category-category": "Categories ocultes",
        "category-subcat-count": "{{PLURAL:$2|Aquesta categoria només té la següent subcategoria.|Aquesta categoria conté {{PLURAL:$1|la següent subcategoria|les següents $1 subcategories}}, d'un total de $2.}}",
        "category-subcat-count-limited": "Aquesta categoria conté {{PLURAL:$1|la següent subcategoria|les següents $1 subcategories}}.",
-       "category-article-count": "{{PLURAL:$2|Aquesta categoria només té la pàgina següent.|{{PLURAL:$1|La pàgina següent és|Les $1 pàgines següents són}} dins d’aquesta categoria, d’un total de $2.}}",
+       "category-article-count": "{{PLURAL:$2|Aquesta categoria només conté la pàgina següent.|{{PLURAL:$1|La pàgina és|Les $1 pàgines són}} dins d'aquesta categoria, d'un total de $2.}}",
        "category-article-count-limited": "{{PLURAL:$1|La següent pàgina és|Les següents $1 pàgines són}} dins la categoria actual.",
-       "category-file-count": "{{PLURAL:$2|Aquesta categoria només té el fitxer següent.|{{PLURAL:$1|El fitxer següent és|Els $1 fitxers següents són}} dins d’aquesta categoria, d’un total de $2.}}",
+       "category-file-count": "{{PLURAL:$2|Aquesta categoria només conté el fitxer següent.|{{PLURAL:$1|El fitxer és|Els $1 fitxers són}} dins d'aquesta categoria, d'un total de $2.}}",
        "category-file-count-limited": "{{PLURAL:$1|El següent fitxer és|Els següents $1 fitxers són}} dins la categoria actual.",
        "listingcontinuesabbrev": " cont.",
        "index-category": "Pàgines indexades",
        "viewhelppage": "Visualitza la pàgina d'ajuda",
        "categorypage": "Visualitza la pàgina de la categoria",
        "viewtalkpage": "Visualitza la pàgina de discussió",
-       "otherlanguages": "En altres llengües",
+       "otherlanguages": "En altres idiomes",
        "redirectedfrom": "(S'ha redirigit des de: $1)",
        "redirectpagesub": "Pàgina de redirecció",
        "redirectto": "Redirigeix a:",
        "lastmodifiedat": "La pàgina va ser modificada per darrera vegada el $1 a les $2.",
        "viewcount": "S'ha visitat aquesta pàgina {{PLURAL:$1|una vegada|$1 vegades}}.",
        "protectedpage": "Pàgina protegida",
-       "jumpto": "Dreceres ràpides:",
+       "jumpto": "Salta a:",
        "jumptonavigation": "navegació",
        "jumptosearch": "cerca",
        "view-pool-error": "Disculpeu, els servidors es troben sobrecarregats.\nMassa usuaris estan tractant d'accedir a aquesta pàgina.\nPer favor, esperau una mica abans de tornar a accedir a aquesta pàgina.\n\n$1",
        "pool-servererror": "El servei de recompte de la reserva no és disponible ($1).",
        "poolcounter-usage-error": "Error d'ús: $1",
        "aboutsite": "Quant al projecte {{SITENAME}}",
-       "aboutpage": "Project:Quant a",
+       "aboutpage": "Project:Quant al",
        "copyright": "El contingut està disponible sota la llicència $1 si no s'indica el contrari.",
        "copyrightpage": "{{ns:project}}:Drets d'autor",
        "currentevents": "Actualitat",
        "currentevents-url": "Project:Actualitat",
-       "disclaimers": "Avís general",
-       "disclaimerpage": "Project:Avís general",
+       "disclaimers": "Renúncies",
+       "disclaimerpage": "Project:Descàrrec general",
        "edithelp": "Ajuda per a l'edició",
        "helppage-top-gethelp": "Ajuda",
        "mainpage": "Pàgina principal",
        "feed-invalid": "La subscripció no és vàlida pel tipus de sindicament.",
        "feed-unavailable": "Els canals de sindicació no estan disponibles",
        "site-rss-feed": "Canal RSS $1",
-       "site-atom-feed": "Canal Atom $1",
+       "site-atom-feed": "Font Atom $1",
        "page-rss-feed": "«$1» RSS Feed",
        "page-atom-feed": "Canal Atom «$1»",
        "feed-atom": "Atom",
        "recentchanges-page-removed-from-category": "[[:$1]] treta de la categoria",
        "recentchanges-page-removed-from-category-bundled": "[[:$1]] treta de la categoria, [[Special:WhatLinksHere/$1|aquesta pàgina està inclosa en d'altres]]",
        "autochange-username": "Canvi automàtic del MediaWiki",
-       "upload": "Carregueu un fitxer",
+       "upload": "Pujar un fitxer",
        "uploadbtn": "Carrega un fitxer",
        "reuploaddesc": "Torna al formulari per apujar.",
        "upload-tryagain": "Envia la descripció del fitxer modificat",
        "tooltip-pt-login": "Us animem a registrar-vos, però no és obligatori",
        "tooltip-pt-login-private": "Cal que inicieu una sessió per a utilitzar aquest wiki",
        "tooltip-pt-logout": "Finalitza la sessió d'usuari",
-       "tooltip-pt-createaccount": "Us animem a què creeu un compte i inicieu sessió, encara que no és obligatori",
+       "tooltip-pt-createaccount": "Us animem a què creeu un compte i inicieu una sessió, encara que no és obligatori",
        "tooltip-ca-talk": "Discussió sobre el contingut d'aquesta pàgina",
        "tooltip-ca-edit": "Modifica aquesta pàgina",
        "tooltip-ca-addsection": "Comença una secció nova",
        "tooltip-search-fulltext": "Cerca aquest text a les pàgines",
        "tooltip-p-logo": "Visiteu la pàgina principal",
        "tooltip-n-mainpage": "Visiteu la pàgina principal",
-       "tooltip-n-mainpage-description": "Vegeu la pàgina principal",
-       "tooltip-n-portal": "Sobre el projecte, què podeu fer, on podeu trobar coses",
+       "tooltip-n-mainpage-description": "Visiteu la pàgina principal",
+       "tooltip-n-portal": "Sobre el projecte, què podeu fer, on trobareu les coses",
        "tooltip-n-currentevents": "Per trobar informació general sobre l'actualitat",
-       "tooltip-n-recentchanges": "Llista de canvis recents al wiki",
+       "tooltip-n-recentchanges": "Una llista dels canvis recents al wiki",
        "tooltip-n-randompage": "Carrega una pàgina a l’atzar",
-       "tooltip-n-help": "El lloc per saber més coses",
-       "tooltip-t-whatlinkshere": "Llista de totes les pàgines wiki que enllacen aquí",
+       "tooltip-n-help": "El lloc per saber més coses",
+       "tooltip-t-whatlinkshere": "Una llista de totes les pàgines wiki que enllacen amb aquesta",
        "tooltip-t-recentchangeslinked": "Canvis recents a pàgines enllaçades des d'aquesta pàgina",
        "tooltip-feed-rss": "Canal RSS d'aquesta pàgina",
        "tooltip-feed-atom": "Canal Atom d'aquesta pàgina",
        "tooltip-t-contributions": "Llista de les contribucions d'{{GENDER:$1|aquest usuari|aquesta usuària}}",
        "tooltip-t-emailuser": "Envia un correu a {{GENDER:$1|aquest usuari|aquesta usuària}}",
        "tooltip-t-info": "Més informació sobre aquesta pàgina",
-       "tooltip-t-upload": "Carregueu fitxers",
-       "tooltip-t-specialpages": "Llista de totes les pàgines especials",
+       "tooltip-t-upload": "Pujar alguns fitxers",
+       "tooltip-t-specialpages": "Llista totes les pàgines especials",
        "tooltip-t-print": "Versió per a impressió d'aquesta pàgina",
        "tooltip-t-permalink": "Enllaç permanent a aquesta versió de la pàgina",
        "tooltip-ca-nstab-main": "Vegeu el contingut de la pàgina",
index c66fdf9..405e14f 100644 (file)
        "unwatch": "Òprzestôj ùzerac",
        "unwatchthispage": "Òprzestôj ùzerac ną starnã",
        "notanarticle": "To nie je artikel",
-       "watchlist-details": "Twòjô lësta ùzérónych starnów zamëkô w se {{PLURAL:$1|$1 pozycjã|$1 pozycje|$1 pozycjów}}, nie rechùjąc diskùsëjów.",
+       "watchlist-details": "{{PLURAL:$1|Starna je |$1 Starnë są}} na twòji lësce ùzérónych starnów (diskùsëji téż)",
        "wlheader-showupdated": "Artiklë jakczé òstałë zmienioné òd Twòji slédny wizytë są wëapratnioné <strong>pògrëbieniém</strong>",
        "wlnote": "Niżi môsz wëskrzënioné {{PLURAL:$1|slédną zmianã|<strong>$1</strong> slédnëch zmianów}} zrobioné òb {{PLURAL:$2|gòdzënã|<strong>$2</strong> gòdzënë/gòdzënów}}, rëchùjąc òd $3 dnia $4.",
        "wlshowlast": "Wëskrzëni zjinaczi z $1 gòdzënów $2 dni",
index e0a83eb..162c4c2 100644 (file)
        "parser-template-loop-warning": "Vorlagenschleife entdeckt: [[$1]]",
        "template-loop-category": "Seiten mit Vorlagenschleifen",
        "template-loop-category-desc": "Die Seite enthält eine Vorlagenschleife, z.&nbsp;B. eine Vorlage, die sich selbst rekursiv aufruft.",
+       "template-loop-warning": "<strong>Warnung:</strong> Diese Seite ruft [[:$1]] auf, die eine Vorlagenschleife verursacht (ein unendlicher rekursiver Aufruf).",
        "parser-template-recursion-depth-warning": "Vorlagenrekursionstiefengrenze überschritten ($1)",
        "language-converter-depth-warning": "Sprachkonvertertiefenlimit überschritten ($1)",
        "node-count-exceeded-category": "Seiten, die die Knotenanzahl überschritten haben",
        "rcfilters-watchlist-markseen-button": "Alle Änderungen als gesehen markieren",
        "rcfilters-watchlist-edit-watchlist-button": "Deine Liste der beobachteten Seiten bearbeiten",
        "rcfilters-watchlist-showupdated": "Änderungen an Seiten, die du seit ihrem Auftreten nicht besucht hast, sind <strong>fett</strong> markiert.",
+       "rcfilters-preference-label": "Die verbesserte Version der Letzten Änderungen ausblenden",
+       "rcfilters-preference-help": "Macht die Neugestaltung der Oberfläche aus dem Jahr 2017 und alle seitdem hinzugefügten Werkzeuge wieder rückgängig.",
        "rcnotefrom": "Angezeigt {{PLURAL:$5|wird die Änderung|werden die Änderungen}} seit <strong>$3, $4</strong> (max. <strong>$1</strong> Einträge).",
        "rclistfromreset": "Datumsauswahl zurücksetzen",
        "rclistfrom": "Nur Änderungen seit $3, $2 Uhr zeigen.",
index 4b01132..5dd8345 100644 (file)
        "parser-template-loop-warning": "Template loop detected: [[$1]]",
        "template-loop-category": "Pages with template loops",
        "template-loop-category-desc": "The page contains a template loop, ie. a template which calls itself recursively.",
+       "template-loop-warning": "<strong>Warning:</strong> This page calls [[:$1]] which causes a template loop (an infinite recursive call).",
        "parser-template-recursion-depth-warning": "Template recursion depth limit exceeded ($1)",
        "language-converter-depth-warning": "Language converter depth limit exceeded ($1)",
        "node-count-exceeded-category": "Pages where node count is exceeded",
        "rcfilters-watchlist-markseen-button": "Mark all changes as seen",
        "rcfilters-watchlist-edit-watchlist-button": "Edit your list of watched pages",
        "rcfilters-watchlist-showupdated": "Changes to pages you haven't visited since the changes occurred are in <strong>bold</strong>, with solid markers.",
+       "rcfilters-preference-label": "Hide the improved version of Recent Changes",
+       "rcfilters-preference-help": "Rolls back the 2017 interface redesign and all tools added then and since.",
        "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since <strong>$3, $4</strong> (up to <strong>$1</strong> shown).",
        "rclistfromreset": "Reset date selection",
        "rclistfrom": "Show new changes starting from $2, $3",
index f6242e3..9493dd4 100644 (file)
        "parser-template-loop-warning": "Modèle en boucle détecté : [[$1]]",
        "template-loop-category": "Pages avec des boucles de modèle",
        "template-loop-category-desc": "La page contient une boucle dans le modèle, c.à.d. un modèle qui s’appelle lui-même récursivement.",
+       "template-loop-warning": "<strong>Avertissement :</strong> Cette page appelle [[:$1]] ce qui provoque une boucle de modèles (un appel récursif infini).",
        "parser-template-recursion-depth-warning": "Limite de profondeur des appels récursifs de modèles dépassée ($1)",
        "language-converter-depth-warning": "Limite de profondeur du convertisseur de langue dépassée ($1)",
        "node-count-exceeded-category": "Pages dépassant le nombre de nœuds maximal",
        "rcfilters-watchlist-markseen-button": "Marquer toutes les modifications comme vues",
        "rcfilters-watchlist-edit-watchlist-button": "Modifier votre liste de pages suivies",
        "rcfilters-watchlist-showupdated": "Les modifications faites aux pages que vous n’avez pas visitées depuis qu’elles ont été modifiées sont en <strong>gras</strong>, avec des balises unies.",
+       "rcfilters-preference-label": "Masquer la version améliorée des modifications récentes",
+       "rcfilters-preference-help": "Restitue la version 2017 de l'interface ainsi que de tous les outils ajoutés alors et depuis.",
        "rcnotefrom": "Ci-dessous {{PLURAL:$5|la modification effectuée|les modifications effectuées}} depuis le <strong>$3, $4</strong> (affichées jusqu’à <strong>$1</strong>).",
        "rclistfromreset": "Réinitialiser la sélection de la date",
        "rclistfrom": "Afficher les nouvelles modifications depuis le $3 à $2",
        "tooltip-t-contributions": "Voir la liste des contributions de {{GENDER:$1|cet utilisateur|cette utilisatrice}}",
        "tooltip-t-emailuser": "Envoyer un courriel à {{GENDER:$1|cet utilisateur|cette utilisatrice}}",
        "tooltip-t-info": "Plus d’information sur cette page",
-       "tooltip-t-upload": "Importer des fichiers",
+       "tooltip-t-upload": "Téléverser des fichiers",
        "tooltip-t-specialpages": "Liste de toutes les pages spéciales",
        "tooltip-t-print": "Version imprimable de cette page",
        "tooltip-t-permalink": "Adresse permanente de cette version de la page",
        "exif-relatedsoundfile": "Fichier audio associé",
        "exif-datetimeoriginal": "Date de la prise originelle",
        "exif-datetimedigitized": "Date de la numérisation",
-       "exif-subsectime": "Date de modification",
+       "exif-subsectime": "Date en fraction de seconde",
        "exif-subsectimeoriginal": "Date de la prise originelle",
        "exif-subsectimedigitized": "Date de la numérisation",
        "exif-exposuretime": "Temps d'exposition",
index d521606..0cbdff4 100644 (file)
        "template-semiprotected": "(نيمه بپأسه)",
        "hiddencategories": "اي ولگ {{PLURAL:$1|ىکته جخۊته جرگه|$1 جخۊته جرگه}} مئن دره:",
        "moveddeleted-notice": "اي ولگ حذفأبؤکه.\nحذف ؤ اينتقالˇ سياهه اي ولگˇ ويسين اي بۊن نۊشؤن بدأکه.",
+       "content-model-wikitext": "ويکي-وؤت",
        "viewpagelogs": "اي ولگˇ سياهه'نه دئن",
        "currentrev-asof": "هسأىي نۊسخه تا $1",
        "revisionasof": "نۊسخه $1",
        "currentrevisionlink": "هسأىى نۊسخهٰ نۊشؤن دأن",
        "cur": "ألؤن",
        "last": "دأميشکي",
+       "history-feed-title": "دچينواچينؤنˇ تاريخچه",
        "rev-deleted-user": "(کارگيري نؤم حذفأبؤ)",
        "rev-delundel": "نۊشؤن دأن/جۊخۊسانئن",
        "revdelete-hide-user": "کارگيري نؤم/آى.پي",
        "revdelete-reason-dropdown": "*حذفˇ هرماله دليلؤن\n** چاکۊدنحقه نقض گۊدن\n** نظر ىا اطلاعاتي که مؤناسب نيه\n** کارگيري نؤمي که مؤناسب نيه\n** اطلاعاتي که اۊنˇ مئن تؤهمت دره",
+       "mergelog": "ادغامˇ سياهه",
        "history-title": "\"$1\"ˇ واگرداني تارئخ",
        "difference-title": "$1: نۊسخه'نˇ تؤفير",
        "lineno": "رچ $1:",
        "right-sendemail": "باخي کارگيرؤنه ايمىل بخسأن",
        "newuserlogpage": "کارگير چاگۊدنˇ سياهه",
        "newuserlogpagetext": "اي ىکته سياهه' کارگير چاگۊدنؤنˇ جي",
+       "rightslog": "کارگيرˇ اختياراتˇ سياهه",
        "action-edit": "اي ولگه دچينواچين بکۊن",
        "action-createaccount": "اي کارگيري حيسابه چاکۊن",
        "action-move-categorypages": "جرگه ولگؤنه جابجا گۊدن",
        "number_of_watching_users_pageview": "[$1 {{PLURAL:$1|کارگير}} پىگير]",
        "rc-change-size-new": "$1 {{PLURAL:$1|باىت}} تغييرˇ پسي",
        "recentchangeslinked": "مۊرتبطˇ تغىيرؤن",
+       "recentchangeslinked-feed": "مۊرتبطˇ تغييرؤن",
        "recentchangeslinked-toolbox": "مۊرتبطˇ تغىيرؤن",
        "recentchangeslinked-title": "\"$1\"ˇ مۊرتبط تغييرؤن",
        "recentchangeslinked-summary": "اي جير، ىکته ليسته تينين بىنين آخري تغييرؤن أجي اۊ ولگؤنˇ مئن کي اي ولگˇ جي خال ببؤن (ىا جرگهٔ مؤردˇ نظرˇ جي). اۊ ولگؤني که [[Special:Watchlist|شيمئه پىگيري ليست]]۱ميئن دبۊن پۊررنگ نۊشؤن بدأبۊنن.",
        "upload-file-error-text": "وختي حقسأى بؤدبۊ که سرورˇ مئن ىکته مؤوقتي فاىل چاگۊده بۊبۊن، سأب بۊبؤ.\n\nىکته [[Special:ListUsers/sysop|کيا]] أمرأ تماس بگيرين.",
        "upload-misc-error-text": "جيرأکشئنˇ زمت، ىکته سأب بۊبؤ که مألۊم نيه چيسه.\nلؤطف بکۊنين بىنين اينترنتي نۊشؤني مؤعتبر ؤ دسفأرس ايسه ؤ هندئه حقسأى بکۊنين.\n\nأگه هندئه دۊرۊسأنۊبؤ، ىکته [[Special:ListUsers/sysop|کيا'ن]] أمرأ تماس بگيرين.",
        "img-auth-accessdenied": "شيمئه دسفأرس نيه",
+       "license": "جواز نؤمه:",
        "license-header": "جواز",
        "license-nopreview": "(پيشادئن ئبه هيچي ننأ)",
        "listfiles-userdoesnotexist": "\"$1\" کارگيري حيساب ثبت نۊبؤ.",
        "suppress": "دۊخۊسانگري",
        "booksources": "کيتابˇ سربسؤن",
        "booksources-search": "وامج",
+       "specialloguserlabel": "مۊجري:",
        "log": "سياههٰ‌ن",
+       "all-logs-page": "همته عۊمۊمي سياهه'ن",
+       "allpages": "همته ولگؤن",
        "allarticles": "همته ولگؤن",
        "allpagessubmit": "بۊشۊ",
        "categories": "جرگه'ن",
        "emailuser-title-target": "اي {{GENDER:$1|کارگيره}} ايمىل بخسأن.",
        "usermaildisabled": "نشأنه کارگير ئبه ايمىل خسأنئن.",
        "usermaildisabledtext": "شمه اي ويکي مئن مننين باخي کارگيرؤنه ايمىل بخسأنين",
+       "usermessage-editor": "سيستمˇ پيغؤم-رسؤن",
+       "watchlist": "پىگيتنؤنˇ ليست",
        "mywatchlist": "پىگيتنؤنˇ ليست",
        "watch": "پىگيتن",
        "wlheader-enotif": "فأندرˇ ايمىل کار کؤنه.",
        "alreadyrolled": "نشأنه [[:$1]]ˇ آخري دچينواچينه که [[User:$2|$2]] ([[User talk:$2|talk]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); بؤده، پساوگردانئن؛ اينˇ پيشي، ىک نفر وانيويسه دچينواچين ىا پساوگردان بؤده.\n\nولگˇ آخري دچينواچينه [[User:$3|$3]] ([[User talk:$3|talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) بؤده.",
        "protectlogpage": "پأسنˇ سياهه",
        "protect-level-sysop": "فقط کيا'ن",
+       "restriction-edit": "دچينواچين",
+       "restriction-move": "جابجا گۊدن",
        "restriction-level-sysop": "قاىم بپأسه",
        "undeletehistorynoadmin": "اي ولگ حذفأبؤ.\nاي ولگˇ حذفأبؤنˇ دليل باني اۊ کارگيرؤنˇ نۊشؤني که حذفˇ پيشي اي ولگه دچينواچين بؤده بؤن، جيري فيچالˇ مئن بمأ.\nاي حذفأبؤ دچينواچينؤنˇ أصلˇ وؤت خالي کيا'نˇ دسفأرسه.",
        "namespace": "نؤمفضا:",
        "contributions": "{{GENDER:$1|کارگير}}ˇ مۊشارکتؤن",
        "mycontris": "مۊشارکتؤن",
        "anoncontribs": "مۊشارکتؤن",
+       "contribsub2": "{{GENDER:$3|$1}} ($2)ˇ ويسين",
+       "uctop": "(ألؤنˇ نۊسخه)",
        "month": "اي ماه مئن (ؤ دأميشک):",
        "year": "اي سالˇ مئن (ؤ دأميشک):",
+       "sp-contributions-blocklog": "دبۊستنˇ سياهه'ن",
        "sp-contributions-uploads": "جؤرأکشئنؤن",
+       "sp-contributions-logs": "سياههٰ‌ن",
        "sp-contributions-talk": "گب",
+       "sp-contributions-search": "مۊشارکتؤنˇ وامج",
+       "sp-contributions-username": "آى-پيˇ آدرس يا کارگيري نؤم:",
        "sp-contributions-submit": "وامج",
        "whatlinkshere": "هرچي خال ببؤ ائره",
        "whatlinkshere-title": "ولگؤني گه «$1»ˇ أمرأ خال دأنن",
        "contribslink": "ياوري‌ئن",
        "block-log-flags-nousertalk": "مننه خۊ گبˇ ولگه دچينواچين بکۊنه",
        "block-log-flags-hiddenname": "دۊخۊسانئه کارگيري نؤم",
+       "proxyblocker": "پراکسي دبۊستنچي",
        "movecategorypage-warning": "<strong>اخظار:</strong> شمه جرگه ولگه جابجا کأدرين. شيمه حواس بمؤنه کي فقط ولگ جابجا بنه ؤ ولگؤن قديمي جرگه مئن مؤنن ؤ تازه جرگه مئن <em>نشنن</em>.",
        "cant-move-category-page": "شمه اجازه ندأنين جرگهٰ‌نˇ ولگه جابجا بکۊنين.",
        "cant-move-to-category-page": "شمه ايجازه ندأنين ىکته ولگه ببرين ىکته جرگه ولگˇ مئن.",
        "tooltip-summary": "فيچالسه وارد بکۊنين",
        "pageinfo-header-edits": "تاريخچهٰ دچينواچين گۊدن",
        "pageinfo-header-restrictions": "ولگه پأسن",
+       "pageinfo-header-properties": "ولگˇ ويژگيئن",
+       "pageinfo-display-title": "تيتره نۊشؤن دأن",
+       "pageinfo-article-id": "ولگˇ شناسه",
        "pageinfo-robot-index": "مؤجاز",
        "pageinfo-firstuser": "ولگˇ چاکۊنکس",
+       "pageinfo-firsttime": "ولگˇ چاگۊدنˇ زمت",
+       "pageinfo-lastuser": "آخري دچينواچين گۊدنکس",
+       "pageinfo-lasttime": "آخري دچينواچينˇ تاريخ",
+       "pageinfo-edits": "همته دچينواچينؤنˇ تعداد",
+       "pageinfo-recent-edits": "آخري دچينواچينؤنˇ تعداد ($1 ˇ أخيرˇ ميئن)",
+       "pageinfo-recent-authors": "آخري تنها نويشتنکسؤنˇ تعداد",
        "pageinfo-hidden-categories": "جخۊته {{PLURAL:$1| جرگه|جرگه}} ( $1 )",
        "pageinfo-toolboxlink": "ولگˇ اطلاعات",
+       "pageinfo-contentpage-yes": "أهأ",
        "pageinfo-category-info": "جرگه اطلاعات",
+       "patrol-log-page": "گشتˇ سياهه",
        "previousdiff": "→ قديمي‌ترˇ دچينواچين",
        "nextdiff": "تازه‌ترˇ دچينواچين ←",
        "file-info-size": "<span dir=\"ltr\">$1 × $2</span> پیکسل، فاىلˇ واويراز: $3، نوع MIME فاىل: $4",
        "monthsall": "همه",
        "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|گب]])",
        "redirect-submit": "بۊشۊ",
+       "redirect-lookup": "وامج:",
+       "redirect-value": "مقدار:",
+       "redirect-user": "کارگيرˇ شناسه",
+       "redirect-page": "ولگˇ شناسه",
+       "redirect-revision": "ولگˇ نۊسخه",
        "redirect-file": "فايلˇ نؤم",
        "specialpages": "خاصˇ ولگؤن",
        "specialpages-group-login": "ديرين/ثبتˇ نؤم",
        "logentry-newusers-create": "کارگيري حساب $1 {{GENDER:$2|چاگۊده-بۊبؤ}}",
        "logentry-upload-upload": "$1 $3 {{GENDER:$2|جؤرأکشئه}}",
        "searchsuggest-search": "{{SITENAME}} مئن وامج",
+       "duration-days": "$1 رۊز",
        "expand_templates_preview": "پيشادئن",
        "default-skin-not-found": "اؤخ! پيشفرضˇ قالبي که شيمه ويکي ئبه <code dir=\"ltr\"<$wgDefaultSkin</code> مئن تعريف ببؤ به عنوانˇ <code>$1</code>، دسفرس نيه.\n\nبه نظر می‌آید نصب شما شامل پوسته‌های زیر می‌شود. [https://www.mediawiki.org/wiki/Manual:Skin_configuration راهنما: تنظیمات پوسته] را برای کسب اطلاعات در باره چگونگی فعال‌ساختن آن‌ها و انتخاب پیش‌فرض ببینید.\n\n$2\n\n; اگر اخیراً مدیاویکی را نصب کرده‌اید:\n: احتمالاً از گیت، یا به طور مستقیم از کد مبدأ که از چند متد دیگر استفاده می‌کند نصب کردید. انتظار می‌رود. چند {{PLURAL:$4|پوسته|پوسته}} از [https://www.mediawiki.org/wiki/Category:All_skins فهرست پوسته mediawiki.org] نصب کنید، که همراه چندین پوسته و افزونه هستند. شما می‌توانید شاخه <code>skins/</code> را از آن نسخه‌برداری کرده و بچسبانید.\n\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins استفاده از گیت برای دریافت پوسته‌ها].\n: انجام این کار با مخزن گیت‌تان تداخل نمی‌کند اگر توسعه‌دهنده مدیاویکی هستید.\n\n; اگر اخیراً مدیاویکی را ارتقاء دادید:\n: مدیاویکی ۱٫۲۴ و تازه‌تر دیگر به طور خودکار پوسته‌های نصب‌شده را فعال نمی‌کند ([https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery راهنما: کشف خودکار پوسته] را ببینید). شما می‌توانید خطوط زیر را به داخل <code>LocalSettings.php</code> بچسبانید تا {{PLURAL:$5|همه|همه}} پوسته‌های نصب‌شده را فعال کنید:\n\n<pre dir=\"ltr\">$3</pre>\n\n; اگر اخیراً <code>LocalSettings.php</code> را تغییر دادید:\n: نام پوسته‌ها را برای غلط املایی دوباره بررسی کنید."
 }
index 6a15951..a03e55e 100644 (file)
        "filerenameerror": "\"$1\" નું નામ બદલીને \"$2\" કરવામાં નિષ્ફળ.",
        "filedeleteerror": "\"$1\" ફાઇલ હટાવી ન શકાઇ.",
        "directorycreateerror": "ડિરેક્ટરી \"$1\" ન બનાવી શકાઇ.",
+       "directoryreadonlyerror": "ડિરેક્ટરી \"$1\" ફક્ત વાંચવા માટે છે.",
+       "directorynotreadableerror": "ડિરેક્ટરી \"$1\" વાંચી શકાય તેવું નથી.",
        "filenotfound": "ફાઇલ \"$1\" ન મળી.",
        "unexpected": "અણધારી કિંમત: \"$1\"=\"$2\".",
        "formerror": "ત્રુટિ: પત્રક રજૂ થયું નહીં",
        "cannotdelete": "ફાઇલ કે પાનું \"$1\" હટાવી શકાયું નથી.\nશક્ય છે કે અન્ય કોઈએ પહેલેથી હટાવી દીધું હોય.",
        "cannotdelete-title": "\"$1\" પાનું કાઢી શકતા નથી",
        "delete-hook-aborted": "દૂર કરવાનું હૂક વડે રોકી રાખવામાં આવ્યું.\nતે કોઇ કારણ આપતું નથી.",
+       "no-null-revision": "પૃષ્ઠ \"$1\" માટે નવો નલ પુનરાવર્તન બનાવી શક્યું નથી",
        "badtitle": "ખરાબ શિર્ષક",
        "badtitletext": "આપનું ઈચ્છિત શીર્ષક અમાન્ય છે, ખાલી છે, અથવાતો અયોગ્ય રીતે આંતર-ભાષિય કે આંતર-વિકિ સાથે જોડાયેલું શીર્ષક છે.\nશક્ય છે કે તેમાં એક કે વધુ એવા અક્ષર કે ચિહ્નો છે કે જે પાનાનાં શીર્ષક માટે અવૈધ છે.",
+       "title-invalid-empty": "વિનંતી કરેલું પાનું શીર્ષક ખાલી છે અથવા તેમાં ફક્ત નામસ્થળનું નામ છે.",
+       "title-invalid-utf8": "વિનંતી કરાયેલ પૃષ્ઠ શીર્ષકમાં અમાન્ય UTF-8 ક્રમ છે.",
+       "title-invalid-interwiki": "માગણી કરેલ પૃષ્ઠ શીર્ષકમાં એક આંતરવિકિ કડી છે જેનો ઉપયોગ શીર્ષકમાં કરી શકાતો નથી.",
+       "title-invalid-talk-namespace": "વિનંતી કરાયેલ પાનું શીર્ષક એવા ચર્ચા પૃષ્ઠનો ઉલ્લેખ કરે છે જે અસ્તિત્વમાં નથી.",
+       "title-invalid-characters": "માગણી કરેલ પૃષ્ઠ શીર્ષકમાં અમાન્ય અક્ષરો છે: \"$1\".",
        "perfcached": "નીચે દર્શાવેલી માહિતી જૂના સંગ્રહમાંથી લીધેલી છે અને શક્ય છે કે તે હાલની પરિસ્થિતિમાં સચોટ ના હોય. વધુમાં વધુ {{PLURAL:$1|એક પરિણામ|$1 પરિણામો}} આ સંગ્રહમાં ઉપલબ્ધ છે.",
        "perfcachedts": "નીચેની વિગતો જૂના સંગ્રહમાથી છે અને તે છેલ્લે $1એ તાજી કરવામાં આવી હતી. વધુમાં વધુ {{PLURAL:$4|એક પરિણામ|$4 પરિણામો}} આ સંગ્રહમાં ઉપલબ્ધ છે.",
        "querypage-no-updates": "આ પાનાની નવી આવૃત્તિઓ હાલમાં અક્રિય છે.\nઅહીંની વિગતો હાલમાં રિફ્રેશ કરવામાં નહી આવે.",
index 0e3a579..a8bd06e 100644 (file)
        "parser-template-loop-warning": "נמצאה תבנית הקוראת לעצמה: [[$1]]",
        "template-loop-category": "דפים עם לולאות בתבנית",
        "template-loop-category-desc": "הדף הזה מכיל לולאה בתבנית, כלומר תבנית שקוראת לעצמה באופן רקורסיבי.",
+       "template-loop-warning": "<strong>אזהרה:</strong> הדף הזה קורא ל[[:$1]], וזה גורם ללולאה בתבנית (קריאה רקורסיבית אינסופית).",
        "parser-template-recursion-depth-warning": "עומק התבניות המוכללות זו בזו עבר את המגבלה ($1)",
        "language-converter-depth-warning": "עומק ממיר השפה עבר את המגבלה ($1)",
        "node-count-exceeded-category": "דפים שבהם מספר הצמתים גדול מדי",
index c7cd4e2..cd048b9 100644 (file)
        "special-characters-group-sinhala": "싱할라 문자",
        "special-characters-group-gujarati": "구자라트 문자",
        "special-characters-group-devanagari": "데바나가리어",
-       "special-characters-group-thai": "í\83\80ì\9d´어",
+       "special-characters-group-thai": "í\83\9cêµ­어",
        "special-characters-group-lao": "라오어",
        "special-characters-group-khmer": "크메르어",
        "special-characters-group-canadianaboriginal": "캐나다 원주민 언어",
index 7a1c129..b596b8d 100644 (file)
@@ -65,6 +65,8 @@
        "underline-never": "Qet",
        "underline-default": "Tercîhên lêgerokê",
        "editfont-default": "Tercîhên lêgerokê",
+       "editfont-sansserif": "Fonta Sans-serif'ê",
+       "editfont-serif": "Fonta Serif'ê",
        "sunday": "yekşem",
        "monday": "duşem",
        "tuesday": "sêşem",
        "feb": "reş",
        "mar": "adr",
        "apr": "avr",
-       "may": "gulan",
+       "may": "gln",
        "jun": "pûş",
        "jul": "tîr",
-       "aug": "teb",
+       "aug": "Glw",
        "sep": "rez",
        "oct": "kew",
        "nov": "ser",
        "currentevents": "Bûyerên rojane",
        "currentevents-url": "Project:Bûyerên rojane",
        "disclaimers": "Ferexetname",
-       "disclaimerpage": "Project:Ferexetname",
+       "disclaimerpage": "Project:Ferexetnameya giştî",
        "edithelp": "Alîkariya guherandinê",
        "helppage-top-gethelp": "Alîkarî",
        "mainpage": "Destpêk",
        "portal": "Portala komê",
        "portal-url": "Project:Portala komê",
        "privacy": "Siyaseta veşarîtiyê",
-       "privacypage": "Project:Parastina daneyan",
+       "privacypage": "Project:Siyaseta veşarîtiyê",
        "badaccess": "Çewtiya destûrê",
        "badaccess-group0": "Tu nikarî vî tiştî bikî.",
        "badaccess-groups": "Ev tişta tu dixwazî bikî tenê ji bikarhênerên {{PLURAL:$2|van koman|vê komê}} re {{PLURAL:$2|ne|ye}}: $1.",
        "nstab-media": "Medya",
        "nstab-special": "Rûpela taybet",
        "nstab-project": "Rûpela projeyê",
-       "nstab-image": "Wêne",
+       "nstab-image": "Dosye",
        "nstab-mediawiki": "Peyam",
        "nstab-template": "Şablon",
        "nstab-help": "Alîkarî",
        "templatesused": "{{PLURAL:$1|Şablona|Şablonên}} ku li ser vê rûpelê {{PLURAL:$1|tê|tên}} bikaranîn:",
        "templatesusedpreview": "{{PLURAL:$1|Şablona|Şablonên}} di vê pêşdîtinê de {{PLURAL:$1|tê|tên}} bikaranîn:",
        "templatesusedsection": "{{PLURAL:$1|Şablona ku di vê beşê de tê bikaranîn|Şablonên ku di vê beşê de tên bikaranîn}}:",
-       "template-protected": "(tê parastin)",
+       "template-protected": "()",
        "template-semiprotected": "(nîv-parastî)",
        "hiddencategories": "Ev rûpel endamê {{PLURAL:$1|1 kategoriya veşartî|$1 kategoriyên veşartî}} ye:",
        "nocreate-loggedin": "Destûra te tune ye ku tu rûpelên nu biafirînî.",
        "searchprofile-everything": "Her tişt",
        "searchprofile-advanced": "Pêşketî",
        "searchprofile-articles-tooltip": "Di $1 da lêbigere",
-       "searchprofile-images-tooltip": "Li pelan bigere",
+       "searchprofile-images-tooltip": "Li nav dosyeyan bigere",
        "searchprofile-everything-tooltip": "Di hemû naverokada bigere (tevî gotûbêja)",
        "search-result-size": "$1 ({{PLURAL:$2|peyvek|$2 peyv}})",
        "search-redirect": "(beralîkirina ji $1)",
        "recentchanges-legend": "Vebijarkên guherandinên dawî",
        "recentchanges-summary": "Guhertinên herî dawî yên wîkiyê li ser vê rûpelê bişopîne.",
        "recentchanges-label-newpage": "Rûpeleke nû hate çêkirin",
-       "recentchanges-label-minor": "Ev guherîneke biçûk e",
+       "recentchanges-label-minor": "Ev guhertineke Biçûk e",
        "recentchanges-label-bot": "Ev guherîn ji aliyê botekê ve hate çêkirin",
        "recentchanges-label-unpatrolled": "Ev gotar hêjî nehatiye sererastkirin",
        "recentchanges-label-plusminus": "Qebareya vê rûpelê bi ev qas biteyan hate guherandin",
        "filetype-banned": "Dosyeyên bi vê cureye hatîye qedexekirin.",
        "verification-error": "Ev dosye, rastandina dosyeye derbas nekir.",
        "unknown-error": "Çewtiyeke nenas pêk hat.",
-       "large-file": "Mezinbûna pelê bila ji $1 ne mezintir be; ev pel $2 e.",
+       "large-file": "Mezinbûna dosyeyê divê ji $1 ne mezintir be; ev dosye $2 e.",
        "emptyfile": "Data'ya barkirî vala ye. Sedemê valabûnê belkî şaşnivîsek di navê data'yê da ye. Xêra xwe seke, ku tu rast dixazê vê data'yê barbikê.",
        "fileexists": "Datayek bi vê navê berê heye.\nEger tu niha li „Tomarbike“ xê, ew wêneyê kevin ê here û wêneyê te ê were barkirin di bin wê navê.\nDi bin <strong>[[:$1]]</strong> du dikarî sekê, ku di dixwazê wê wêneyê biguherînê.\nEger tu naxazê, xêra xwe li „Betal“ xe.\n[[$1|thumb]]",
        "fileexists-extension": "Datayek wek vê navê berê heye: [[$2|thumb]]\n* Navî datayê yê tê barkirin: <strong>[[:$1]]</strong>\n* Navî datayê yê berê heyê: <strong>[[:$2]]</strong>\nXêra xwe navekî din bibîne.",
        "filehist-user": "Bikarhêner",
        "filehist-dimensions": "Mezinahî",
        "filehist-filesize": "Mezinahiya pelê",
-       "filehist-comment": "Şîrove",
+       "filehist-comment": "Şirove",
        "imagelinks": "Bikaranîna pelê",
        "linkstoimage": "Di van rûpelan de {{PLURAL:$1|page links|$1  lînkek}} ji vî dosyeye re heye:",
        "nolinkstoimage": "Rûpelekî ku ji vî wêneyî re girêdankê çêdike nîne.",
        "linkstoimage-redirect": "$1 (beralîkirina pelê) $2",
-       "sharedupload-desc-here": "Ev pel ji $1 û dibe ku ji aliyê projeyên din ve jî hatibe bikaranîn.\nAgahdariya li ser [$2 rûpela danasîna pelê] li jêr tê nîşandan.",
+       "sharedupload-desc-here": "Ev dosye ji $1 û dibe ku ji aliyê projeyên din ve jî hatibe bikaranîn.\nAgahdariya li ser [$2 rûpela danasîna dosyeyê] li jêr tê nîşandan.",
        "filepage-nofile-link": "Dosyeyek bi vî navî tune ye, lê tu dikarî wê [$1 bar bikî].",
        "uploadnewversion-linktext": "Versiyoneke nû ya vê daneyê barbike",
        "shared-repo-from": "ji $1",
index 8df8bb1..49c7e06 100644 (file)
@@ -46,6 +46,7 @@
        "tog-watchlisthideminor": "Asconde editas minor de la lista de pajes oservada",
        "tog-watchlisthideliu": "Asconde editas par usores identifiada de la lista de pajes oservada",
        "tog-watchlistreloadautomatically": "Recarga automata la lista de pajes oservada cuando un filtre es cambiada (JavaScript nesesada)",
+       "tog-watchlistunwatchlinks": "Ajunta lias direta per monitori/desmonitori a pajes monitorida (JavaScript es usada per alterna entre la du)",
        "tog-watchlisthideanons": "Asconde editas par usores anonim de la lista de pajes oservada",
        "tog-watchlisthidepatrolled": "Asconde editas patruliada de la lista de pajes oservada",
        "tog-watchlisthidecategorization": "Asconde la categori de pajes",
        "jumptosearch": "xerca",
        "view-pool-error": "Pardona, la servadores es tro cargada a esta ora.\nTro multe usores es atenta vide esta paje.\nPer favore espeta ante cuanto tu atenta vide esta paje denova.\n\n$1",
        "generic-pool-error": "Pardona, la servadores es tro cargada a esta ora.\nTro multe usores es atentante vide esta recurso.\nPer favore espeta ante cuando tu atenta vide esta recurso denova.",
+       "pool-timeout": "Semafor nonotenable: atenta abandonada",
+       "pool-queuefull": "Filo de servadores es plen",
        "pool-errorunknown": "Era nonconoseda",
+       "pool-servererror": "La manejador de servadores no es disponable ($1)",
+       "poolcounter-usage-error": "Era de usa: $1",
        "aboutsite": "Sur {{SITENAME}}",
        "aboutpage": "Project:Sur",
        "copyright": "La contenida es disponeda su $1, estra diferes notada.",
        "portal-url": "Project:Porton de comunia",
        "privacy": "Promete de privatia",
        "privacypage": "Project:Promete de privatia",
+       "badaccess": "Era de permete",
+       "badaccess-group0": "Tu no es permeteda a fa la ata cual tu ia solisita.",
+       "badaccess-groups": "La ata cual tu ia solisita es limitada a usores en {{PLURAL:$2|la grupo|un de la grupos}}: $1.",
+       "versionrequired": "Revisa $1 de MediaWiki es nesesada",
+       "versionrequiredtext": "Revisa $1 de MediaWiki es nesesada per usa esta paje.\nVide la [[Special:Version|paje de varias]].",
        "ok": "Oce",
        "retrievedfrom": "Retraeda de \"$1\"",
        "youhavenewmessages": "{{PLURAL:$3|Tu ave}} $1 ($2).",
        "youhavenewmessagesfromusers": "{{PLURAL:$4|Tu ave}} $1 de {{PLURAL:$3|un otra usor|$3 usores}} ($2).",
+       "youhavenewmessagesmanyusers": "Tu ave $1 de multe usores ($2).",
        "newmessageslinkplural": "{{PLURAL:$1|un mesaje nova|999=mesajes nova}}",
        "newmessagesdifflinkplural": "{{PLURAL:$1|cambia|cambias}} resente",
        "youhavenewmessagesmulti": "Tu ave mesajes nova en $1",
        "confirmable-confirm": "Esce {{GENDER:$1|tu}} es serta?",
        "confirmable-yes": "Si",
        "confirmable-no": "No",
+       "thisisdeleted": "Vide o restora $1?",
        "viewdeleted": "Vide $1?",
+       "restorelink": "{{PLURAL:$1|un edita sutraeda|$1 editas sutraeda}}",
        "feedlinks": "Flue:",
+       "feed-invalid": "Tipo de flue no es valida.",
+       "feed-unavailable": "Flues no es disponable",
        "site-rss-feed": "$1 RSS Flue",
        "site-atom-feed": "$1 Flue Atom",
        "page-rss-feed": "\"$1\" RSS Flue",
        "page-atom-feed": "\"$1\" Flue Atom",
        "red-link-title": "$1 (paje no esiste)",
+       "sort-descending": "Ordina desendente",
+       "sort-ascending": "Ordina asendente",
        "nstab-main": "Paje",
        "nstab-user": "Paje de usor",
        "nstab-media": "Paje de medio",
        "nstab-help": "Paje de aida",
        "nstab-category": "Categoria",
        "mainpage-nstab": "Paje xef",
+       "nosuchactiontext": "La ata spesifada par la URL es nonvalida.\nCisa tu ia maltape la URL o ia segue un lia noncoreta.\nO cisa esta indica un defeto en la program usada par {{SITENAME}}.",
        "nosuchspecialpage": "Paje spesial nonesistente",
        "nospecialpagetext": "<strong>Tu ia solisita un paje spesial nonvalida.</strong>\n\nUn lista de pajes spesial valida es disponable en [[Special:SpecialPages|{{int:specialpages}}]].",
        "error": "Era",
        "databaseerror": "Era de base de datos",
+       "databaseerror-text": "Un era ia aveni en interoga la banco de datos.\nCisa esta indica un defeto en la program.",
+       "databaseerror-textcl": "Un era ia aveni en interoga la banco de datos.",
+       "databaseerror-query": "Interoga: $1",
+       "databaseerror-function": "Funsiona: $1",
+       "databaseerror-error": "Era: $1",
        "missingarticle-diff": "(Difere: $1, $2)",
        "internalerror": "Era interna",
        "internalerror_info": "Era interna: $1",
+       "internalerror-fatal-exception": "Era nonreparable de tipo \"$1\"",
+       "filecopyerror": "Fix \"$1\" no ia pote es copiada a \"$2\".",
+       "filerenameerror": "Fix \"$1\" no ia pote es renomida a \"$2\".",
+       "filedeleteerror": "Fix \"$1\" no ia pote es sutraeda.",
+       "directorycreateerror": "Arcivo \"$1\" no ia pote es creada.",
+       "directoryreadonlyerror": "Arcivo \"$1\" es nonscrivable.",
+       "directorynotreadableerror": "Arcivo \"$1\" es nonlejable.",
+       "filenotfound": "Fix \"$1\" no ia pote es trovada.",
        "badtitle": "Mal titulo",
        "badtitletext": "La titulo de la paje spesifada es nonlegal, vacua, o un titulo interlingual o intervici de lia noncoreta. Cisa lo conteni un o plu sinias cual on no pote usa en titulos.",
        "viewsource": "Mostra la fonte",
        "myprivateinfoprotected": "Tu no ave permete per edita tua informa privata.",
        "mypreferencesprotected": "Tu no ave permete per edita tua preferes.",
        "ns-specialprotected": "La pajes spesial no pote es editada.",
+       "virus-badscanner": "Malajustada: scanador antivirusal nonconoseda: <em>$1</em>",
+       "virus-scanfailed": "fali de scane (codigo $1)",
+       "virus-unknownscanner": "scanador antivirusal nonconoseda:",
        "logouttext": "<strong>Tu es aora desautenticida.</strong>\n\nNota ce cisa alga pajes va continua es mostrada como si tu ta es ancora autenticida asta cuando tu vacui la memoria de tua surfador.",
        "cannotlogoutnow-title": "Tu no pote desautentici a presente",
        "cannotlogoutnow-text": "Desautentici no es posible cuando tu usa $1.",
        "createacct-benefit-body1": "{{PLURAL:$1|edita|editas}}",
        "createacct-benefit-body2": "{{PLURAL:$1|paje|pajes}}",
        "createacct-benefit-body3": "{{PLURAL:$1|contribuor|contribuores}} resente",
+       "badretype": "La claves cual tu ia tape no es egal.",
+       "usernameinprogress": "Un crea de conta per esta nom de usor aveni ja.\nEspeta, per favore.",
+       "userexists": "La nom spesifada de usor es ja usada.\nEleje un otra nom, per favore.",
        "loginerror": "Era de entra",
+       "createacct-error": "Era de crea de conta",
+       "createaccounterror": "La conta no ia pote es creada: $1",
+       "nocookiesnew": "La conta de usor es aora creada, ma tu no ia autentici.\n{{SITENAME}} usa cucis per autentici usores.\nTu ia descomuta cucis.\nPer favore, comuta los e autentici con tua nom de usor nova e tua clave.",
+       "nocookieslogin": "{{SITENAME}} usa cucis per autentici usores.\nTu ia descomuta cucis.\nPer favore, comuta los e atenta denova.",
+       "nocookiesfornew": "La conta de usor no ia es creada, car nos no ia pote confirma sua fonte.\nSerti ce tu ia comuta cucis, recarga esta paje, e atenta denova.",
+       "createacct-loginerror": "La crea de la conta ia susede, ma tu no ia pote es automata autenticida. Per favore, vade a la paje de [[Special:UserLogin|autentici nonautomata]].",
+       "noname": "Tu no ia spesifa un nom de usor valida.",
        "loginsuccesstitle": "Tu ia entra",
        "loginsuccess": "'''Tu ia entrada aora a {{SITENAME}} como \"$1\".'''",
        "nosuchuser": "On no ave un usor con la nom \"$1\".\nOn distingui entre leteras major e minor per nomes de usores.\nEsamina la spele, o [[Special:CreateAccount|crea un conta nova]].",
        "passwordremindertitle": "Sinia secreta temporer nova per {{SITENAME}}",
        "passwordremindertext": "Algun (tu, probable, de adirije IP $1)\nia demanda un sinia secreta nova per {{SITENAME}} ($4).\nLa sinia secreta tempora per usor \"$2\" es aora \"$3\". Si esta ia es tua intende, tu debe identifia tu denova per entra e eleje tua sinia nova aora.\nTua sinia tempora va desvalidi en {{PLURAL:$5|un dia|$5 dias}}.\n\nSi algun otra ca tu ia envia esta demanda a nos, o si tu ia recorda tua sinia secreta e no vole cambia lo aora, tu pote iniora esta mesaje e continua usa tua sinia secreta vea.",
        "noemail": "No es un adirije de eposta per usor \"$1\".",
+       "noemailcreate": "Tu debe furni un adirije de eposta valida.",
        "passwordsent": "Un sinia secreta ia es enviada a la adirije de eposta per \"$1\".\nPer favore, sinia per entra ancora pos tu ia reseta el.",
        "eauthentsent": "Un eposta de serti ia es enviada a la adirije de eposta spesifada.\nAnte cualce otra epostas es enviada a tua conta, tu va nesesa segue la instruis en la eposta, per serti ce la conta es vera la tua.",
+       "throttled-mailpassword": "Un eposta de reinisia la clave ia es ja enviada, en la {{PLURAL:$1|ora|$1 oras}} la plu resente.\nPer preveni malusa, sola un tal eposta va es enviada per {{PLURAL:$1|ora|$1 oras}}.",
        "mailerror": "Era en envia eposta: $1",
        "acct_creation_throttle_hit": "Visitores a esta vici, usante tua adirije IP, ia crea {{PLURAL:$1|1 conta|$1 contas}} en la $2 la plu resente, cual es la masima permeteda en esta periodo.\nComo resulta, visitores con esta adirije IP no pote crea plu contas a esta tempo.",
+       "emailauthenticated": "Tua adirije de eposta ia es confirmada a $2 a $3.",
        "emailconfirmlink": "Aproba tu adirije de eposta",
+       "cannotchangeemail": "On no pote cambia adirijes de eposta per contas en esta vici.",
+       "emaildisabled": "Esta vici no pote envia epostas.",
        "accountcreated": "Conta es creada",
+       "accountcreatedtext": "La conta de usor per [[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|discute]]) ia es creada.",
+       "createaccount-title": "Crea de conta per {{SITENAME}}",
+       "createaccount-text": "Algun ia crea un conta per tua adirije de eposta a {{SITENAME}} ($4) nomida \"$2\", con clave \"$3\".\nTu debe autentici e cambia tua clave aora.\n\nTu pote iniora esta mesaje, si esta conta ia es creada par era.",
+       "login-throttled": "Tu ia fa resente tro multe atentas de autentici.\nPer favore, pausa per $1 ante atenta denova.",
+       "login-abort-generic": "Tua autentici ia fali - Abortada",
+       "login-migrated-generic": "Tua conta ia es migrada, e tua nom de usor no esiste plu en esta vici.",
        "loginlanguagelabel": "Lingua: $1",
+       "suspicious-userlogout": "Tua solisita de desautentici ia es refusada car lo pare es enviada par un surfador o proxi malfunsionante.",
+       "createacct-another-realname-tip": "La nom vera es nonobligante.\nSi tu eleje furni lo, lo va es usada per atribui la laboras fada par la usor.",
        "pt-login": "Identifia se",
        "pt-login-button": "Identifia",
        "pt-login-continue-button": "Continua autentici",
        "pt-createaccount": "Crea un conta",
        "pt-userlogout": "Desidentifia",
+       "php-mail-error-unknown": "Era nonconoseda en la funsiona mail() de PHP.",
+       "user-mail-no-addy": "On ia atenta envia un eposta sin adirije de eposta.",
+       "user-mail-no-body": "On ia atenta envia un eposta con corpo vacua o nonormal corta.",
+       "changepassword": "Cambia clave",
+       "resetpass_announce": "Per fini autentici, tu debe furni un clave nova.",
+       "resetpass_header": "Cambia clave de conta",
        "oldpassword": "Sinia secreta vea:",
        "newpassword": "Sinia secreta nova:",
        "retypenew": "Re-entra tu sinia secreta nova:",
        "changepassword-throttled": "Tu ia fa resente tro multe atentas de autentici.\nPer favore, pausa per $1 ante atenta denova.",
        "botpasswords": "Claves de bot",
        "botpasswords-summary": "<em>Claves de bot</em> permete ce on asede un conta de usor par API sin usa la identia xef de la conta. La diretos de usor disponable pos autentici par clave de bot es cisa restrinjeda.\n\nSi tu no sabe perce on ta vole fa esta, probable tu debe no fa lo. Nunca un otra person debe demanda ce tu jenera un de estas e dona lo a el.",
+       "botpasswords-disabled": "Claves de bot es descomutada.",
        "botpasswords-no-central-id": "Per usa claves de bot, tu debe es autenticida con conta sentral.",
        "botpasswords-existing": "Claves esistente de bot",
        "botpasswords-createnew": "Crea un clave nova de bot",
        "botpasswords-created-body": "La clave de bot \"$1\" de usor \"$2\" ia es creada.",
        "botpasswords-updated-title": "Clave de bot cambiada",
        "botpasswords-updated-body": "La clave de bot \"$1\" de usor \"$2\" ia es cambiada.",
+       "botpasswords-deleted-title": "Clave de bot sutraeda",
+       "botpasswords-deleted-body": "La clave de bot \"$1\" de usor \"$2\" ia es sutraeda.",
+       "botpasswords-newpassword": "La clave nova per autentici con <strong>$1</strong> es <strong>$2</strong>. <em>Per favore, nota esta per refere futur.</em> <br> (Per botes vea de cual sua nom de autentici debe es la mesma como la nom de usor ultima, tu pote usa ance <strong>$3</strong> como nom de usor e <strong>$4</strong> como clave.)",
+       "botpasswords-no-provider": "BotPasswordsSessionProvider no es disponable.",
+       "botpasswords-restriction-failed": "Restrinjes de clave de bot preveni esta autentici.",
+       "botpasswords-invalid-name": "La nom de usor spesifada no conteni la sinia separante de claves de bot (\"$1\").",
+       "botpasswords-not-exist": "Usor \"$1\" no ave un clave de bot nomida \"$2\".",
        "resetpass_forbidden": "Claves no pote es cambiada",
        "resetpass_forbidden-reason": "Claves no pote es cambiada: $1",
        "resetpass-no-info": "Tu debe es autenticida per asede direta esta paje.",
        "nocreatetext": "{{SITENAME}} ave un restringe a la capas per crea pajes nova.\nTu pote vade a retro e edita un paje esistente, o  [[Special:UserLogin|sinia per entra o crea un conta]].",
        "nocreate-loggedin": "Tu no es permeteda a crea pajes nova.",
        "sectioneditnotsupported-title": "La edita de partes no es suportada",
+       "sectioneditnotsupported-text": "La edita de partes no es suportada en esta paje.",
        "permissionserrors": "Era de permete",
        "permissionserrorstext-withaction": "Tu no pote $2, per la {{PLURAL:$1|razona|razonas}} seguente:",
        "recreate-moveddeleted-warn": "<strong>Avisa: Tu recrea un paje cual on ia sutrae a ante.</strong>\n\nConsidera esce lo conveni ce tu continua edita esta paje. La arcivos de sutrae e move per la paje es presentada asi per aida:",
        "rev-showdeleted": "mostra",
        "revdelete-nooldid-title": "Revisa destinal nonvalida",
        "revdelete-show-file-submit": "Si",
+       "revdelete-hide-comment": "Resoma de edita",
        "revdelete-radio-set": "Ascondeda",
        "revdelete-radio-unset": "Vidable",
        "revdelete-log": "Razona:",
index 13a9fd1..d6974ee 100644 (file)
        "parser-template-loop-warning": "Пронајдена е јамка во шаблонот: [[$1]]",
        "template-loop-category": "Страници со шаблонски јамки",
        "template-loop-category-desc": "Страницава содржи шаблонска јамка, т.е. шаблон кој повторливо се самоповикува",
+       "template-loop-warning": "<strong>Предупредување:</strong> Страницава го повикува [[:$1]], што предизвикува јамка во шаблонот (бесконечно повторлив повик).",
        "parser-template-recursion-depth-warning": "Пречекорена е границата на длабочината на рекурзијата во шаблонот ($1)",
        "language-converter-depth-warning": "Пречекорена е границата на длабочината на јазичниот претворач ($1)",
        "node-count-exceeded-category": "Страници каде е надминат бројот на јазли",
index 5e835fa..e151d5d 100644 (file)
@@ -35,9 +35,9 @@
                ]
        },
        "tog-underline": "കണ്ണികൾക്ക് അടിവരയിടുക:",
-       "tog-hideminor": "à´ªàµ\81തിയ à´®à´¾à´±àµ\8dà´±à´\99àµ\8dà´\99à´³àµ\81à´\9fàµ\86 à´ªà´\9fàµ\8dà´\9fà´¿à´\95യിൽ à´\9aàµ\86റിയ à´¤à´¿à´°àµ\81à´¤àµ\8dà´¤àµ\81à´\95ൾ à´ªàµ\8dരദർശിപàµ\8dപിà´\95àµ\8dà´\95ാതിരിക്കുക",
-       "tog-hidepatrolled": "à´±àµ\8bà´¨àµ\8dà´¤àµ\81à´\9aàµ\81à´±àµ\8dറിയ à´¤à´¿à´°àµ\81à´¤àµ\8dà´¤àµ\81à´\95ൾ à´ªàµ\81തിയമാറàµ\8dà´±à´\99àµ\8dà´\99ളിൽ à´ªàµ\8dരദർശിപàµ\8dപിà´\95àµ\8dà´\95ാതിരിക്കുക",
-       "tog-newpageshidepatrolled": "à´±àµ\8bà´¨àµ\8dà´¤àµ\81à´\9aàµ\81à´±àµ\8dറപàµ\8dà´ªàµ\86à´\9fàµ\8dà´\9f à´¤à´¾à´³àµ\81à´\95ൾ à´ªàµ\81തിയതാളàµ\81à´\95à´³àµ\81à´\9fàµ\86 à´ªà´\9fàµ\8dà´\9fà´¿à´\95യിൽ à´ªàµ\8dരദർശിപàµ\8dപിà´\95àµ\8dà´\95ാതിരിക്കുക",
+       "tog-hideminor": "à´ªàµ\81തിയ à´®à´¾à´±àµ\8dà´±à´\99àµ\8dà´\99à´³àµ\81à´\9fàµ\86 à´ªà´\9fàµ\8dà´\9fà´¿à´\95യിൽ à´\9aàµ\86റിയ à´¤à´¿à´°àµ\81à´¤àµ\8dà´¤àµ\81à´\95ൾ à´®à´±à´¯àµ\8dക്കുക",
+       "tog-hidepatrolled": "à´±àµ\8bà´¨àµ\8dà´¤àµ\81à´\9aàµ\81à´±àµ\8dറിയ à´¤à´¿à´°àµ\81à´¤àµ\8dà´¤àµ\81à´\95ൾ à´ªàµ\81തിയമാറàµ\8dà´±à´\99àµ\8dà´\99ളിൽ à´®à´±à´¯àµ\8dക്കുക",
+       "tog-newpageshidepatrolled": "à´±àµ\8bà´¨àµ\8dà´¤àµ\81à´\9aàµ\81à´±àµ\8dറപàµ\8dà´ªàµ\86à´\9fàµ\8dà´\9f à´¤à´¾à´³àµ\81à´\95ൾ à´ªàµ\81തിയതാളàµ\81à´\95à´³àµ\81à´\9fàµ\86 à´ªà´\9fàµ\8dà´\9fà´¿à´\95യിൽ à´®à´±à´¯àµ\8dക്കുക",
        "tog-hidecategorization": "താളുകളുടെ വർഗ്ഗീകരണം മറയ്ക്കുക",
        "tog-extendwatchlist": "ഏറ്റവും പുതിയവ മാത്രമല്ല, എല്ലാ മാറ്റങ്ങളും ദൃശ്യമാകുന്ന വിധത്തിൽ ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടിക വികസിപ്പിക്കുക.",
        "tog-usenewrc": "സമീപകാല മാറ്റങ്ങൾ, ശ്രദ്ധിക്കുന്നവയുടെ പട്ടിക എന്നീ താളുകളിൽ മാറ്റങ്ങൾ ഗണംതിരിക്കുക",
index 377611c..041be72 100644 (file)
        "navigation": "Nabegaçon",
        "and": "&#32;i",
        "faq": "FAQ",
+       "namespaces": "Domínios",
+       "variants": "Bariadades",
+       "navigation-heading": "Menu de nabegaçon",
        "errorpagetitle": "Erro",
        "returnto": "Retornar pa $1.",
        "tagline": "De {{SITENAME}}",
        "printableversion": "Berson pa ampremir",
        "permalink": "Lhigaçon pa siempre",
        "print": "Ampremir",
+       "view": "Ber",
        "edit": "Eiditar",
        "create": "Criar",
        "create-local": "Poner çcriçon lhocal",
        "protect_change": "demudar",
        "unprotect": "Altarar la proteçon",
        "newpage": "Páigina nuoba",
-       "talkpagelinktext": "Cumbersar",
+       "talkpagelinktext": "cumbersa",
        "specialpage": "Páigina special",
        "personaltools": "Ferramientas pessonales",
        "talk": "Cumbersa",
        "emailauthenticated": "L sou andereço de correio eiletrónico fui cunfirmado la $2, a las $3.",
        "emailconfirmlink": "Cunfirma la tue morada de correio eiletrónico",
        "loginlanguagelabel": "Lhéngua: $1",
+       "pt-login": "Antrar",
+       "pt-createaccount": "Criar ua cuonta",
        "pt-userlogout": "Salir",
        "changepassword": "Demudar palabra-chabe",
        "resetpass_header": "Demudar palabra-chabe de la cuonta",
        "nocreatetext": "{{SITENAME}} restringe la possibilidade de criar nuobas páiginas.\nPuode buoltar atrás i eiditar ua páigina yá eisistente, ó [[Special:UserLogin|outenticar-se ó criar ua cuonta]].",
        "permissionserrorstext-withaction": "Tu nun tenes premisson pa $2, {{PLURAL:$1|pula seguinte rezon|pulas seguintes rezones}}:",
        "recreate-moveddeleted-warn": "<strong>Abiso: Tu stás a criar ua páigina que yá fui d'atrás botada fuora.</strong>\n\nBei bien se ye própio cuntinar a eiditar esta páigina.\nL registro de la eileminaçon i de l arrastrar ye amostrado eiqui por cumbeniéncia:",
-       "moveddeleted-notice": "Esta páigina fui apagada.\nL registro de la eileminaçon, proteçon i arrastrar desta páigina stá ambaixo pa refréncia.",
+       "moveddeleted-notice": "Esta páigina fui botada fuora.\nL registro de la eileminaçon, porteçon i arrastramiento desta páigina stá ambaixo pa refréncia.",
        "viewpagelogs": "Ber registros pa esta páigina",
        "currentrev": "Rebison atual",
        "currentrev-asof": "Eidiçon atual cumo $1",
        "history-feed-item-nocomment": "$1 a $2",
        "rev-delundel": "amostrar/scunder",
        "revdel-restore": "Demudar besiblidade",
+       "revdelete-edit-reasonlist": "Eiditar rezones de botar fuora",
        "mergehistory-submit": "Misturar eidiçones",
        "revertmerge": "Çfazer ounion",
        "history-title": "Stórico de eidiçones de \"$1\"",
        "notextmatches": "Nun fui possible achar, ne l cuntenido de las páiginas, la palabra percurada",
        "prevn": "{{PLURAL:$1|anterior|$1 anteriores}}",
        "nextn": "{{PLURAL:$1|próssimo|próssimos $1}}",
+       "shown-title": "Amostrar $1 {{PLURAL:$1|resultado|resultados}} por páigina",
        "viewprevnext": "Ber ($1 {{int:pipe-separator}} $2) ($3)",
        "searchmenu-new": "<strong>Criar la páigina \"[[:$1]]\" nesta berson!</strong> {{PLURAL:$2|0=|Beija tamien la páigina ancontrada na percura.|Beija tamien ls resultados de la percura.}}",
        "searchprofile-articles": "Páiginas de cuntenido",
        "searchprofile-images": "Multimédia",
        "searchprofile-everything": "Todo",
        "searchprofile-advanced": "Abançado",
+       "searchprofile-articles-tooltip": "Percurar an $1",
        "searchprofile-images-tooltip": "Percurar fexeiros",
+       "searchprofile-everything-tooltip": "Percurar an todo l cuntenido (ancluindo páiginas de cumbersa)",
        "searchprofile-advanced-tooltip": "Personalizar ls domínios adonde percurar",
        "search-result-size": "$1 ({{PLURAL:$2|1 palabra|$2 palabras}})",
        "search-redirect": "(ancaminamiento pa $1)",
        "right-edit": "Eiditar páiginas",
        "right-move": "Arrastrar páiginas",
        "right-movefile": "Arrastrar fexeiros",
+       "right-writeapi": "Outelizar la API de scrita",
        "grant-editmycssjs": "Eiditar l sou CSS/JavaScript personalizado",
        "newuserlogpage": "Registro de criaçon de outelizadores",
        "rightslog": "Registro de dreitos de l outelizador",
        "recentchanges": "Redadeiras altaraçones",
        "recentchanges-legend": "Oupçones de las redadeiras altaraçones",
        "recentchanges-feed-description": "Acumpanha las redadeiras altaraçones de l biqui por esta semiente.",
+       "recentchanges-label-newpage": "Esta eidiçon criou ua nuoba páigina",
+       "recentchanges-label-minor": "Esta ye ua eidiçon pequerrixa",
+       "recentchanges-label-bot": "Esta eidiçon fui feita por un robó",
+       "recentchanges-label-plusminus": "Altaraçon ne l tamanho de la páigina, an bytes",
+       "recentchanges-legend-heading": "<strong>Lhegenda:</strong>",
        "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (ber tamien la [[Special:NewPages|lhista de páiginas nuobas]])",
+       "recentchanges-submit": "Amostrar",
        "rcfilters-filtergroup-watchlist": "Páiginas begiadas",
        "rcnotefrom": "Ambaixo {{PLURAL:$5|stá la altaraçon feita|stan las alteraçones feitas}} zde <strong>$2</strong> (amostradas até <strong>$1</strong>).",
        "rclistfrom": "Amostrar las noubas altaraçones a partir de $2 de $3",
        "rcshowhideminor": "$1 eidiçones pequerrixas",
+       "rcshowhideminor-show": "Amostrar",
        "rcshowhidebots": "$1 robós",
+       "rcshowhidebots-show": "Amostrar",
        "rcshowhideliu": "$1 outelizadores registrados",
+       "rcshowhideliu-show": "Amostrar",
        "rcshowhideanons": "$1 outelizadores anónimos",
+       "rcshowhideanons-show": "Amostrar",
        "rcshowhidepatr": "$1 eidiçones patrulhadas",
+       "rcshowhidepatr-show": "Amostrar",
        "rcshowhidemine": "$1 mies eidiçones",
+       "rcshowhidemine-show": "Amostrar",
+       "rcshowhidecategorization-show": "Amostrar",
        "rclinks": "Amostrar las redadeiras $1 altaraçones ne ls redadeiros $2 dies",
        "diff": "defr",
        "hist": "stór",
        "newpageletter": "N",
        "boteditletter": "b",
        "rc_categories_any": "Qualquiera de ls scolhidos",
+       "rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} açpuis las altaraçones",
        "newsectionsummary": "/* $1 */ nuobo cacho",
        "rc-enhanced-expand": "Amostrar detailhes",
        "rc-enhanced-hide": "Scunder detailhes",
        "filehist-datetime": "Data i hora",
        "filehist-thumb": "Amostra",
        "filehist-thumbtext": "Amostra de la berson de las $1",
+       "filehist-nothumb": "Meniatura andisponible",
        "filehist-user": "Outelizador",
        "filehist-dimensions": "Tamanho",
        "filehist-filesize": "Tamanho de l fexeiro",
        "linkstoimage": "{{PLURAL:$1|Esta páigina lhiga|Estas $1 páiginas lhigan}} este fexeiro:",
        "nolinkstoimage": "Nanhua páigina apunta pa este fexeiro.",
        "sharedupload": "Este fexeiro ye de $1 i puode ser outelizado por outros porjetos.",
+       "sharedupload-desc-here": "Este fexeiro ye de $1 i puode ser outelizado por outros porjetos.\nLa çcriçon na [$2 páigina oureginal] ye amostrada ambaixo.",
        "uploadnewversion-linktext": "Cargar ua nuoba berson deste fexeiro",
        "shared-repo-from": "de $1",
        "filerevert-comment": "Motibo:",
        "filedelete-submit": "Apagar",
        "filedelete-nofile": "'''$1''' nun eisiste.",
        "filedelete-reason-otherlist": "Outra rezon",
+       "filedelete-edit-reasonlist": "Eiditar rezones de botar fuora",
        "mimesearch": "Percura MIME",
        "listredirects": "Amostrar ancaminamientos",
        "unusedtemplates": "Modelos nun outelizados",
        "mostimages": "Eimaiges cun mais refréncias",
        "mostrevisions": "Páiginas de cuntenido cun mais rebisones",
        "prefixindex": "Todas las páiginas cun perfixo",
+       "prefixindex-submit": "Amostrar",
        "shortpages": "Páiginas pequeinhas",
        "longpages": "Páiginas cumpridas",
        "deadendpages": "Páiginas sin salida",
        "protectedtitles": "Títalos portegidos",
        "listusers": "Lhista de outelizadores",
        "newpages": "Páiginas nuobas",
+       "newpages-submit": "Amostrar",
        "ancientpages": "Páiginas mais antigas",
        "move": "Arrastrar",
        "movethispage": "Arrastrar esta páigina",
        "specialloguserlabel": "Outelizador(a):",
        "speciallogtitlelabel": "Albo (títalo ó páigina ó {{ns:user}}:nome d'outelizador):",
        "log": "Registros",
+       "logeventslist-submit": "Amostrar",
        "all-logs-page": "Todos ls registros públicos",
        "logempty": "Nun eisiste nanhue antrada correspondente ne l registro.",
        "allpages": "Todas las páiginas",
        "allpagessubmit": "Bota",
        "allpagesprefix": "Amostrar páiginas cul perfixo:",
        "categories": "Catadories",
+       "categories-submit": "Amostrar",
        "linksearch": "Percura de lhigaçones sternas",
        "linksearch-ok": "Percurar",
        "listusers-submit": "Amostrar",
        "watch": "Begiar",
        "watchthispage": "Begiar esta páigina",
        "unwatch": "Zantressar-se",
-       "watchlist-details": "{{PLURAL:$1|Eisiste $1 páigina|Eisisten $1 páiginas}} na sue lhista de páiginas begiadas, scluindo las páiginas de cumbersa.",
+       "watchlist-details": "{{PLURAL:$1|Eisiste $1 páigina|Eisisten $1 páiginas}} na sue lhista de páiginas begiadas (mais las páiginas de cumbersa).",
        "wlheader-enotif": "La notificaçon por correio eiletrónico stá atiba.",
        "wlheader-showupdated": "Las páiginas altaradas zde la redadeira beç que las besitou aparecen çtacadas an <strong>negrito</strong>.",
        "wlshowlast": "Ber redadeiras $1 horas $2 dies",
+       "watchlist-submit": "Amostrar",
        "watchlist-options": "Oupçones de la lhista de páiginas begiadas",
        "watching": "A begiar...",
        "unwatching": "A deixar de begiar...",
        "enotif_reset": "Marcar todas las páiginas cumo bejitadas",
        "created": "criada",
        "changed": "demudada",
-       "deletepage": "Botar fuora páigina",
+       "deletepage": "Botar fuora la páigina",
+       "excontentauthor": "l cuntenido era: \"$1\", i {{GENDER:$2|l único eiditor|la única eiditora|l(a) único(a) eiditor(a)}} era [[Special:Contributions/$2|$2]] ([[User talk:$2|cumbersa]])",
        "delete-confirm": "Botar fuora \"$1\"",
        "delete-legend": "Botar fuora",
        "historywarning": "<strong>Abiso:</strong> La páigina que stás quaije a botar fuora ten un stórico cun aprossimadamente $1 {{PLURAL:$1|rebison|rebisones}}:",
+       "historyaction-submit": "Amostrar",
        "confirmdeletetext": "Stás quaije a botar fuora para siempre ua páigina ó ua eimaige i todos ls sous stóricos.\nPor fabor, bei se ye esso que quieres fazer, que antendes las cunsequéncias i se esso stá d'acordo culas [[{{MediaWiki:Policy-url}}|políticas]].",
        "actioncomplete": "Acion acabada",
-       "deletedtext": "\"$1\" fue elhiminada.\nConsulte $2 para um registo de eliminações recentes.",
+       "deletedtext": "\"$1\" fue botada fuora.\nCunsulte $2 pa un registro reciente de las páiginas botadas fuora.",
        "dellogpage": "Registro de botado fuora",
        "deletecomment": "Rezon:",
        "deleteotherreason": "Rezon adicional:",
        "deletereasonotherlist": "Outra rezon",
        "deletereason-dropdown": "* Motibos d'eliminaçon quemuns\n** Spam\n** Bandalismo\n** Biolaçon de dreitos d'outor\n** Pedido de l'outor\n** Ancaminamiento ambálido",
+       "delete-edit-reasonlist": "Eiditar rezones de botar fuora",
        "rollbacklink": "retornar",
+       "rollbacklinkcount": "çfazer $1 {{PLURAL:$1|eidiçon|eidiçones}}",
+       "revertpage": "Fúrun çfeitas las eidiçones de [[Special:Contributions/$2|$2]] ([[User talk:$2|cumbersa]]) pa la redadeira rebison de [[User:$1|$1]]",
        "protectlogpage": "Registro de porteçon",
        "protectedarticle": "porteger \"[[$1]]\"",
        "modifiedarticleprotection": "demudeste l nible de porteçon pa \"[[$1]]\"",
        "undeletelink": "ber/restourar",
        "namespace": "Spácio de nomes:",
        "invert": "Amberter scuolha",
+       "tooltip-invert": "Marque esta caixa pa scunder las altaraçones la páiginas ne l domínio selecionado (i ne l domínio associado, se scolheu la oupçon)",
+       "namespace_association": "Domínio associado",
+       "tooltip-namespace_association": "Marque esta caixa pa ancluir tamien l domínio de cuntenido ó de cumbersa associado a la sue seleçon",
        "blanknamespace": "(Percipal)",
        "contributions": "Cuntribuiçones {{GENDER:$1|de l outelizador|de la outelizadora|de l(a) outelizador(a)}}",
        "contributions-title": "Upas {{GENDER:$1|de l outelizador|de la outelizadora}} $1",
        "move-watch": "Begiar esta páigina",
        "movepagebtn": "Arrastrar páigina",
        "pagemovedsub": "Páigina arrastrada cumo debe de ser",
-       "movepage-moved": "'''\"$1\" fui arrastrado pa \"$2\"'''",
+       "movepage-moved": "<strong>\"$1\" fui arrastrada pa \"$2\"</strong>",
+       "movepage-moved-redirect": "Fui criado un ancaminamiento.",
+       "movepage-moved-noredirect": "La criaçon dun ancaminamiento fui suprimida.",
        "articleexists": "Yá eisiste ua páigina cun este títalo, ou l títalo que scolhiste ye ambálido.\nPor fabor, scuolhe outro nome.",
        "movetalk": "Arrastrar tamien la páigina de cumbersa associada",
        "move-subpages": "Arrastrar subpáiginas (anté $1)",
        "revertmove": "poner al robés",
        "move-leave-redirect": "Criar un ancaminamiento",
        "export": "Sportar páiginas",
+       "export-submit": "Sportar",
        "export-download": "Grabar cumo fexeiro",
        "allmessages": "Todas las mensaiges de l sistema",
        "allmessagesname": "Nome",
        "tooltip-pt-mycontris": "{{GENDER:|Mies}} upas",
        "tooltip-pt-login": "Tu sós animado pa que te outentiques, inda que esso nun seia oubrigatório.",
        "tooltip-pt-logout": "Salir",
+       "tooltip-pt-createaccount": "Ye ancorajado a criar ua cuonta i ampeçar sesson; inda assi, nun ye oubrigatório",
        "tooltip-ca-talk": "Cumbersa subre l cuntenido de la páigina",
        "tooltip-ca-edit": "Eiditar esta páigina",
        "tooltip-ca-addsection": "Ampeçar un cacho nuobo",
        "tooltip-rollback": "\"{{int:rollbacklink}}\" çfazer, cun un solo clique, las eidiçones de l redadeiro eiditor desta páigina.",
        "tooltip-undo": "\"Çfazer\" çfaç esta eidiçoni abre ls campos de eidiçon ne l modo \"ber cumo queda\".\nPremite ajuntar la rezon de la eidiçon ne l sumário.",
        "lastmodifiedatby": "Esta páigina fui eiditada pula redadeira beç a la(s) $2 de $1 por $3.",
+       "pageinfo-robot-noindex": "Nun premitida",
+       "pageinfo-subpages-name": "Subpáiginas desta páigina",
+       "pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|ancaminamiento|ancaminamientos}}; $3 {{PLURAL:$3|nun ancaminamiento|nun ancaminamientos}})",
+       "pageinfo-magic-words": "{{PLURAL:$1|Palabra mágica|Palabras mágicas}} ($1)",
        "pageinfo-toolboxlink": "Anformaçones de la páigina",
        "previousdiff": "← Eidiçon d'atrás",
        "nextdiff": "Redadeira eidiçon →",
        "file-nohires": "Sin resoluçon maior çponible.",
        "svg-long-desc": "fexeiro SVG, de $1 × $2 píxeles, tamanho: $3",
        "show-big-image": "Fexeiro oureginal",
+       "show-big-image-preview": "Tamanho desta antebison: $1.",
+       "show-big-image-other": "{{PLURAL:$2|Outra resoluçon|Outras resoluçones}}: $1.",
+       "show-big-image-size": "$1 × $2 píxeles",
        "newimages": "Galerie de nuobos fexeiros",
        "noimages": "Nun hai nada pa ber.",
        "ilsubmit": "Percurar",
        "specialpages-group-pagetools": "Ferramienta de páiginas",
        "specialpages-group-wiki": "Dados i ferramientas",
        "specialpages-group-redirects": "Páiginas speciales de ancaminamientos",
+       "tag-filter": "Filtrar las [[Special:Tags|etiquetas]]:",
+       "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Etiqueta|Etiquetas}}]]: $2)",
        "tags-title": "Eitiquetas",
        "tags-edit": "eiditar",
        "tags-activate": "atibar",
        "logentry-move-move": "$1 {{GENDER:$2|arrastrou}} $3 pa $4",
        "logentry-move-move-noredirect": "$1 {{GENDER:$2|arrastrou}} $3 pa $4 sin deixar un ancaminamiento",
        "logentry-move-move_redir": "$1 {{GENDER:$2|arrastrou}} $3 pa l sou ancaminamiento $4",
+       "logentry-move-move_redir-noredirect": "$1 {{GENDER:$2|arrastrou}} $3 pa l sou ancaminamiento $4, suprimindo l purmeiro",
+       "logentry-newusers-create": "La cuonta de {{GENDER:$2|outelizador|outelizadora}} $1 fui criada",
        "rightsnone": "(nanhun)",
        "searchsuggest-search": "Percurar an {{SITENAME}}",
        "mediastatistics-header-multimedia": "Média anriquecida",
index 8c67a7c..13f49bc 100644 (file)
        "createaccount-title": "{{SITENAME}} အတွက် အကောင့်ပြုလုပ်ခြင်း",
        "login-throttled": "သင်သည် login ဝင်ရန် အကြိမ်မြောက်မြားစွာ အားထုတ်ခဲ့ပြီးဖြစ်သည်။\nကျေးဇူးပြု၍ ထပ်မဝင်ခင် $1 စောင့်ပေးပါ။",
        "login-abort-generic": "လော့ဂ်အင်ဝင်ခြင်း မအောင်မြင်ပါ - ဖျက်သိမ်းပြီး",
-       "loginlanguagelabel": "ဘာသာ: $1",
+       "loginlanguagelabel": "ဘာသာစကား: $1",
        "pt-login": "အကောင့်ဝင်ရန်",
        "pt-login-button": "အကောင့်ဝင်ရန်",
        "pt-login-continue-button": "ဆက်လက် ဝင်ရောက်ပါ",
        "prefs-memberingroups": "{{PLURAL:$1|အုပ်စု|အုပ်စုများ}}၏ {{GENDER:$2|အဖွဲ့ဝင်}}",
        "prefs-registration": "မှတ်ပုံတင်သည့် အချိန် -",
        "yourrealname": "နာမည်ရင်း -",
-       "yourlanguage": "ဘာသာစကား -",
+       "yourlanguage": "ဘာသာစကား:",
        "yournick": "လက်မှတ်အသစ် -",
        "badsig": "တရားမဝင်သည့် လက်မှတ်အကြမ်း။\nHTML tags ကို စစ်ဆေးပါ။",
        "badsiglength": "သင့်လက်မှတ်သည် ရှည်လွန်းနေပါသည်။\nယင်းသည် စာလုံး {{PLURAL:$1|လုံး|လုံး}}ထက် မရှည်ရပါ။",
        "allmessages-filter-unmodified": "မပြုပြင်ထားသော",
        "allmessages-filter-all": "အားလုံး",
        "allmessages-filter-modified": "ပြုပြင်ထားသော",
-       "allmessages-language": "ဘာသာ -",
+       "allmessages-language": "ဘာသာစကား:",
        "allmessages-filter-submit": "သွား",
        "thumbnail-more": "ပုံကြီးချဲ့ရန်",
        "filemissing": "ဖိုင်ပျောက်နေသည်",
index 7c60994..ed2acac 100644 (file)
        "rcfilters-empty-filter": "Ingen aktive filtre. Alle bidrag vises.",
        "rcfilters-filterlist-title": "Filtre",
        "rcfilters-filterlist-whatsthis": "Hvordan virker dette?",
-       "rcfilters-filterlist-feedbacklink": "Gi tilbakemelding på de nye (beta)filtrene",
+       "rcfilters-filterlist-feedbacklink": "Gi tilbakemelding på disse (nye) filterverktøyene",
        "rcfilters-highlightbutton-title": "Marker resultater",
        "rcfilters-highlightmenu-title": "Velg en farge",
        "rcfilters-highlightmenu-help": "Velg en farge for å merke denne egenskapen",
        "rcfilters-liveupdates-button-title-on": "Slå av live-oppdateringer",
        "rcfilters-liveupdates-button-title-off": "Vis nye endringer når de skjer",
        "rcfilters-watchlist-markseen-button": "Merk alle endringer som sett.",
+       "rcfilters-watchlist-edit-watchlist-button": "Rediger listen over sider du overvåker",
+       "rcfilters-watchlist-showupdated": "Endringer til sider du ikke har besøkt siden endringene ble gjort vises med <strong>fet</strong> skrift.",
        "rcnotefrom": "Nedenfor er vist {{PLURAL:$5|endringen|endringene}} som er gjort siden <strong>$3, $4</strong> (frem til <strong>$1</strong>).",
        "rclistfromreset": "Nullstill datovalg",
        "rclistfrom": "Vis nye endringer fra og med $3 $2",
        "sp-contributions-newonly": "Bare vis bidrag som er sideopprettinger",
        "sp-contributions-hideminor": "Skjul mindre endringer",
        "sp-contributions-submit": "Søk",
+       "sp-contributions-outofrange": "Kan ikke vise resultater. Det gitte IP-intervallet er større enn CIDR-grensen på /$1.",
        "whatlinkshere": "Det som lenker hit",
        "whatlinkshere-title": "Sider som lenker til «$1»",
        "whatlinkshere-page": "Side:",
index c33f954..7641cca 100644 (file)
        "last": "førre",
        "page_first": "fyrste",
        "page_last": "siste",
-       "histlegend": "Merk av for dei versjonane du vil samanlikne og trykk [Enter] eller klikk på knappen nedst på sida.<br />Forklaring: (no) = skilnad frå den noverande versjonen, (førre) = skilnad frå den førre versjonen, <b>s</b> = småplukk",
+       "histlegend": "Merk av for dei versjonane du vil samanlikne og trykk [Enter] eller klikk på knappen nedst på sida.<br />\nForklaring: <strong>({{int:cur}})</strong> = skilnad frå den noverande versjonen, <strong>({{int:last}})</strong> = skilnad frå den førre versjonen, <strong>{{int:minoreditletter}}</strong> = småplukk",
        "history-fieldset-title": "Søk etter versjonar",
        "history-show-deleted": "Berre sletta versjonar",
        "histfirst": "eldste",
index 8fcd2b7..f18a32f 100644 (file)
@@ -89,7 +89,8 @@
                        "Kirsan",
                        "Krottyianock",
                        "Mazab IZW",
-                       "InternerowyGołąb"
+                       "InternerowyGołąb",
+                       "Wojtas"
                ]
        },
        "tog-underline": "Podkreślenie linków:",
        "rcfilters-liveupdates-button-title-off": "Wyświetlaj nowe zmiany zaraz po tym jak nastąpią",
        "rcfilters-watchlist-markseen-button": "Oznacz wszystkie zmiany jako obejrzane",
        "rcfilters-watchlist-edit-watchlist-button": "Edytuj swoją listę obserwowanych stron",
+       "rcfilters-preference-label": "Wyłącz ulepszenia strony Ostatnie zmiany",
        "rcnotefrom": "Poniżej {{PLURAL:$5|pokazano zmianę|pokazano zmiany}} {{PLURAL:$5|wykonaną|wykonane}} po <strong>$3, $4</strong> (nie więcej niż '''$1''' pozycji).",
        "rclistfromreset": "Zresetuj wybór daty",
        "rclistfrom": "Pokaż nowe zmiany od $3 $2",
        "htmlform-int-toolow": "Podana wartość jest poniżej dopuszczalnego minimum $1",
        "htmlform-int-toohigh": "Podana wartość jest powyżej dopuszczalnego maximum $1",
        "htmlform-required": "Podanie tej wartości jest wymagane",
-       "htmlform-submit": "Wyślij",
+       "htmlform-submit": "Prześlij",
        "htmlform-reset": "Cofnij zmiany",
        "htmlform-selectorother-other": "Inne",
        "htmlform-no": "Nie",
index e6f323e..6749e35 100644 (file)
        "parser-template-loop-warning": "Ciclo de predefinições detetado: [[$1]]",
        "template-loop-category": "Páginas com ciclos infinitos de predefinições",
        "template-loop-category-desc": "Esta página contém um ciclo infinito de predefinições, isto é, uma predefinição que se chama a si própria recursivamente.",
+       "template-loop-warning": "<strong>Aviso:</strong> Esta página chama [[:$1]] o que causa um ciclo infinito de predefinições (uma chamada recursiva sem término).",
        "parser-template-recursion-depth-warning": "Foi excedido o limite da profundidade de recursividade nas predefinições ($1)",
        "language-converter-depth-warning": "O limite de profundidade do conversor de idiomas excedeu a ($1)",
        "node-count-exceeded-category": "Páginas em que o total de nós é excedido",
        "rcfilters-watchlist-markseen-button": "Marcar todas as modificações como já vistas",
        "rcfilters-watchlist-edit-watchlist-button": "Editar a sua lista de páginas vigiadas",
        "rcfilters-watchlist-showupdated": "As mudanças das páginas que ainda não visitou após terem sido alteradas aparecem a <strong>negrito</strong>, com marcadores sólidos.",
+       "rcfilters-preference-label": "Ocultar a versão melhorada das mudanças recentes",
+       "rcfilters-preference-help": "Reverte o redesenho da interface de 2017 e todas as ferramentas adicionadas na altura e desde então.",
        "rcnotefrom": "Abaixo {{PLURAL:$5|está a mudança|estão as mudanças}} desde <strong>$2</strong> (mostradas até <strong>$1</strong>).",
        "rclistfromreset": "Reiniciar a seleção da data",
        "rclistfrom": "Mostrar as novas mudanças a partir das $2 de $3",
index a92504a..9d2e77d 100644 (file)
        "parser-template-loop-warning": "Parameters:\n* $1 - page title",
        "template-loop-category": "This message is used as a category name for a [[mw:Special:MyLanguage/Help:Tracking categories|tracking category]] where pages with template loops will be listed.",
        "template-loop-category-desc": "Pages with template loops category description. Shown on [[Special:TrackingCategories]].\n\nSee also:\n* {{msg-mw|Template-loop-category}}",
+       "template-loop-warning": "This message is displayed in edit preview when a template loop is detected on the previewed page.\n\nParameters:\n* $1 - the full title of template which causes the template loop.",
        "parser-template-recursion-depth-warning": "Parameters:\n* $1 - limit value of recursion depth",
        "language-converter-depth-warning": "Error message shown when a page uses too deeply nested language conversion syntax. Parameters:\n* $1 - the value of the depth limit",
        "node-count-exceeded-category": "This message is used as a category name for a [[mw:Help:Tracking categories|tracking category]] where pages are placed automatically if the node-count of the preprocessor exceeds the limit.\n\nSee also:\n* {{msg-mw|Node-count-exceeded-warning}}",
        "rcfilters-watchlist-markseen-button": "Label for the button to mark all changes as seen on [[Special:Watchlist]] when using the structured filters interface.",
        "rcfilters-watchlist-edit-watchlist-button": "Label for the button to edit the watched pages on [[Special:Watchlist]] when using the structured filters interface.\n\nCf. {{msg-mw|watchlisttools-edit}}.",
        "rcfilters-watchlist-showupdated": "Message at the top of [[Special:Watchlist]] when the Structured filters are enabled that describes what unseen changes look like.\n\nCf. {{msg-mw|wlheader-showupdated}}",
+       "rcfilters-preference-label": "Option in RecentChanges tab of [[Special:Preferences]].",
+       "rcfilters-preference-help": "Explanation for the option in the RecentChanges tab of [[Special:Preferences]].",
        "rcnotefrom": "This message is displayed at [[Special:RecentChanges]] when viewing recentchanges from some specific time.\n\nThe corresponding message is {{msg-mw|Rclistfrom}}.\n\nParameters:\n* $1 - the maximum number of changes that are displayed\n* $2 - (Optional) a date and time\n* $3 - a date\n* $4 - a time\n* $5 - Number of changes are displayed, for use with PLURAL",
        "rclistfromreset": "Used on [[Special:RecentChanges]] to reset a selection of a certain date range.",
        "rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 - (Currently not use) date and time. The date and the time adds to the rclistfrom description.\n* $2 - time. The time adds to the rclistfrom link description (with split of date and time).\n* $3 - date. The date adds to the rclistfrom link description (with split of date and time).\n\nThe corresponding message is {{msg-mw|Rcnotefrom}}.",
index 5ace4bf..d8de413 100644 (file)
                        "MustangDSG",
                        "Valeri'swiki",
                        "Marat-avgust",
-                       "Ernác"
+                       "Ernác",
+                       "Wertuose"
                ]
        },
        "tog-underline": "Подчёркивание ссылок:",
        "parser-template-loop-warning": "Обнаружена петля в шаблонах: [[$1]]",
        "template-loop-category": "Страницы с петлями в шаблонах",
        "template-loop-category-desc": "Эта страница содержит петлю в шаблоне, т.е. шаблон, который рекурсивно вызывает сам себя.",
+       "template-loop-warning": "<strong>Предупреждение:</ strong> Эта страница вызывает [[:$1]], который приводит к возникновению цикла в шаблоне (бесконечный рекурсивный вызов).",
        "parser-template-recursion-depth-warning": "Превышен предел глубины рекурсии шаблона ($1)",
        "language-converter-depth-warning": "Превышен предел глубины преобразователя языков ($1)",
        "node-count-exceeded-category": "Страницы, на которых превышено число узлов",
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Показать",
        "rcfilters-tag-remove": "Удалить '$1'",
-       "rcfilters-legend-heading": "<strong>Ð\9aÑ\8aÑ\8bÑ\81Ñ\85аÑ\80Ñ\82Ñ\8bÑ\83ланÑ\8b Ñ\82измеÑ\81и:</strong>",
+       "rcfilters-legend-heading": "<strong>СпиÑ\81ок Ñ\81окÑ\80аÑ\89ений:</strong>",
        "rcfilters-other-review-tools": "<strong>Другие инструменты проверки</strong>",
        "rcfilters-group-results-by-page": "Группировать результаты по странице",
        "rcfilters-grouping-title": "Группировка",
        "rcfilters-view-advanced-filters-label": "Расширенные фильтры",
        "rcfilters-view-tags": "Тегированные правки",
        "rcfilters-view-namespaces-tooltip": "Результаты фильтра по пространствам имён",
-       "rcfilters-view-tags-tooltip": "РезÑ\83лÑ\8cÑ\82аÑ\82Ñ\8b Ñ\84илÑ\8cÑ\82Ñ\80а, Ð¸Ñ\81полÑ\8cзÑ\83Ñ\8eÑ\89его метки правок",
+       "rcfilters-view-tags-tooltip": "ФилÑ\8cÑ\82Ñ\80оваÑ\82Ñ\8c Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82Ñ\8b, Ð¸Ñ\81полÑ\8cзÑ\83Ñ\8f метки правок",
        "rcfilters-view-return-to-default-tooltip": "Вернуться в главное меню фильтров",
        "rcfilters-liveupdates-button": "Обновлять автоматически",
        "rcfilters-liveupdates-button-title-on": "Отключить автоматические обновления",
        "rcfilters-watchlist-markseen-button": "Отметить все изменения как просмотренные",
        "rcfilters-watchlist-edit-watchlist-button": "Редактировать ваш список просмотренных страниц",
        "rcfilters-watchlist-showupdated": "Изменения страниц, которые вы не посещали с того момента, как они изменились, выделены <strong>жирным</strong> и отмечены полным маркером.",
+       "rcfilters-preference-label": "Скрыть улучшенную версию Последних изменений",
+       "rcfilters-preference-help": "Откатывает редизайн интерфейса 2017 года и все инструменты, добавленные с тех пор.",
        "rcnotefrom": "Ниже {{PLURAL:$5|указано изменение|перечислены изменения}} с <strong>$3, $4</strong> (показано не более <strong>$1</strong>).",
        "rclistfromreset": "Сбросить выбор даты",
        "rclistfrom": "Показать изменения с $3 $2.",
index 99a793b..bc9b0ce 100644 (file)
        "parser-template-loop-warning": "V predlogi je bila odkrita zanka: [[$1]]",
        "template-loop-category": "Strani z zankami predlog",
        "template-loop-category-desc": "Stran vsebuje zanko predloge, tj. predlogo, ki rekurzivno kliče sama sebe.",
+       "template-loop-warning": "<strong>Opozorilo:</strong> Ta stran kliče [[:$1]], kar povzroči zanko predloge (neskončni rekurzivni klic).",
        "parser-template-recursion-depth-warning": "Prekoračena globina rekurzije predlog ($1)",
        "language-converter-depth-warning": "Prekoračena globina pretvorbe jezikov ($1)",
        "node-count-exceeded-category": "Strani s prekoračenim številom vozlišč",
        "rcfilters-watchlist-markseen-button": "Označi vse spremembe kot pregledane",
        "rcfilters-watchlist-edit-watchlist-button": "Uredite svoj seznam nadzorovanih strani",
        "rcfilters-watchlist-showupdated": "Spremembe strani, ki jih niste obiskali od zadnje spremembe, so prikazane <strong>krepko</strong>, z močnimi oznakami.",
+       "rcfilters-preference-label": "Skrij izboljšano različico Zadnjih sprememb",
+       "rcfilters-preference-help": "Povrne preoblikovanje vmesnika leta 2017 in vsa takrat in od takrat dodana orodja.",
        "rcnotefrom": "{{PLURAL:$5|Navedena je sprememba|Navedeni sta spremembi|Navedene so spremembe}} od <strong>$3 $4</strong> dalje (prikazujem jih do <strong>$1</strong>).",
        "rclistfromreset": "Ponastavi izbiro datuma",
        "rclistfrom": "Prikaži spremembe od $3 $2 naprej",
index 69e3252..c933046 100644 (file)
        "permissionserrorstext": "Немате овлашћење за ову радњу из {{PLURAL:$1|1=следећег|следећих}} разлога:",
        "permissionserrorstext-withaction": "Немате дозволу за $2 из {{PLURAL:$1|следећег|следећих}} разлога:",
        "recreate-moveddeleted-warn": "<strong>Упозорење: поново правите страницу која је претходно обрисана.</strong>\n\nРазмотрите да ли је прикладно да наставите с уређивањем ове странице.\nОвде је наведена историја брисања и премештања с образложењем:",
-       "moveddeleted-notice": "Ова страница је обрисана.\nИсторија њеног брисања и премештања налази се испод:",
+       "moveddeleted-notice": "Ова страница је обрисана.\nИсторија њеног брисања, заштите и премештања налази се испод:",
        "moveddeleted-notice-recent": "Жао нам је, ова страница је недавно обрисана (у последњих 24 сата).\nОвде је наведена историја брисања и премештања с образложењем.",
        "log-fulllog": "Погледај целу историју",
        "edit-hook-aborted": "Измену је прекинула кука.\nНије дато никакво образложење.",
        "mw-widgets-mediasearch-noresults": "Нема резултата.",
        "mw-widgets-titleinput-description-new-page": "страница још увек не постоји",
        "mw-widgets-titleinput-description-redirect": "преусмерава на $1",
+       "mw-widgets-usersmultiselect-placeholder": "Додај још...",
        "date-range-from": "Од датума:",
        "date-range-to": "До датума:",
        "randomrootpage": "Случајна коренска страница",
index 231f0ce..3139e66 100644 (file)
        "internalerror": "Kasalahan internal",
        "internalerror_info": "Kasalahan internal: $1",
        "internalerror-fatal-exception": "Mahiwal dina ketikan \"$1\"",
-       "filecopyerror": "Teu bisa nyalin koropak \"$1\" ka \"$2\".",
-       "filerenameerror": "Teu bisa ngaganti ngaran koropak \"$1\" jadi \"$2\".",
-       "filedeleteerror": "Teu bisa ngahapus koropak \"$1\".",
+       "filecopyerror": "Teu bisa néplak berkas \"$1\" ka \"$2\".",
+       "filerenameerror": "Teu bisa ngarobah ngaran berkas \"$1\" jadi \"$2\".",
+       "filedeleteerror": "Teu bisa mupus berkas \"$1\".",
        "directorycreateerror": "Henteu bisa nyieun diréktori \"$1\".",
        "directoryreadonlyerror": "Diréktori \"$1\" ukur-baca.",
        "directorynotreadableerror": "Diréktori \"$1\" henteu bisa dibaca.",
-       "filenotfound": "Teu bisa manggihan koropak \"$1\".",
+       "filenotfound": "Teu bisa manggihan berkas \"$1\".",
        "unexpected": "Peunteun di luar hontalan: \"$1\"=\"$2\".",
        "formerror": "Kasalahan: teu bisa ngirim formulir",
        "badarticleerror": "Peta ieu teu bisa dipigawé na kaca ieu.",
        "timezoneregion-europe": "Éropah",
        "timezoneregion-indian": "Samudra Indonésia",
        "timezoneregion-pacific": "Samudra Pasifik",
-       "allowemail": "Buka koropak pikeun nampa surélék ti nu séjén",
+       "allowemail": "Buka berkas pikeun nampa surélék ti nu séjén",
        "prefs-searchoptions": "Paluruh",
        "prefs-namespaces": "Ngaranspasi",
        "default": "ti dituna",
-       "prefs-files": "Koropak",
+       "prefs-files": "Berkas",
        "prefs-custom-css": "CSS sakahayang",
        "prefs-custom-js": "JavaScript sakahayang",
        "prefs-common-css-js": "CSS/JavaScript dipaké pikeun sakabéh kulit:",
        "userrights-expiry": "Kadaluwarsa:",
        "userrights-expiry-existing": "Waktu kadaluwarsa kiwari: $3, $2",
        "userrights-expiry-othertime": "Séjén waktu:",
+       "userrights-invalid-expiry": "Waktu kadaluwarsa pikeun gorombolan \"$1\" teu sah.",
+       "userrights-expiry-in-past": "Waktu kadaluwarsa pikeun gorombolan \"$1\" geus kaliwat berlalu.",
        "group": "Gorombolan:",
        "group-user": "Pamaké",
        "group-autoconfirmed": "Pamaké anu otomatis dikonfirmasi",
        "right-movefile": "Mindahkeun berkas",
        "right-suppressredirect": "Henteu nyieun hiji alihan ti ngaran lila sabot mindahkeun kaca",
        "right-upload": "Unjal berkas",
-       "right-reupload": "Nimpah koropak nu geus aya",
+       "right-reupload": "Ngalandih berkas nu geus aya",
        "right-reupload-own": "Nimpah koropak nu geus aya nu dimuat ku sorangan",
        "right-reupload-shared": "Nampik gambar-gambar dina média lokal babarengan",
        "right-upload_by_url": "Unjal berkas tina alamat URL",
        "right-unblockself": "buka peungpeuk sorangan",
        "right-protect": "Ngarobah hambalan protéksi jeung édit kaca anu dikonci",
        "right-editprotected": "Edit kaca anu dikonci salaku \"{{int:protect-level-sysop}}\"",
+       "right-editsemiprotected": "Édit kaca nu ditantayungan minangka \"{{int:protect-level-autoconfirmed}}\"",
        "right-editcontentmodel": "Édit modél kontén kaca",
        "right-editinterface": "Édit antarbenget pamaké",
        "right-editusercss": "Édit berkas CSS pamaké séjén",
        "right-editmyusercss": "Édit berkas CSS pamaké anjeun",
        "right-editmyuserjs": "Édit berkas JavaScript pamaké anjeun",
        "right-viewmywatchlist": "Tempo awaskeuneun anjeun",
+       "right-editmywatchlist": "Édit daptar awaskeuneun anjeung. Masih aya cara nambahkeun kaca tanpa kudu mibanda ieu hak.",
        "right-viewmyprivateinfo": "Tempo data pribadi anjeun (alamat surélék, ngaran asli)",
        "right-editmyprivateinfo": "Robah data pribadi anjeun (alamat surélék, ngaran asli)",
        "right-editmyoptions": "Robah préferénsi anjeun",
+       "right-rollback": "Geuwat malikkeun éditan-éditan pamaké panungtung nu ngédit kaca tinangtu",
        "right-markbotedits": "Nandaan pamalikan révisi minangka éditan bot",
        "right-noratelimit": "Teu dipangaruhan ku wawatesan jumlah éditan",
        "right-import": "Ngimpor kaca ti wiki séjén",
        "action-move-categorypages": "pindahkeun kaca kategori",
        "action-movefile": "mindahkeun ieu berkas",
        "action-upload": "ngamuat ieu berkas",
-       "action-reupload": "nimpah berkas nu geus aya ieu",
+       "action-reupload": "ngalandih berkas nu geus aya",
        "action-reupload-shared": "nimpah ier berkas dina gudang sadaya",
        "action-upload_by_url": "ngamuat ieu berkas ti URL",
        "action-writeapi": "maké API",
        "upload-preferred": "Tipeu koropak nu dianjurkeun: $1.",
        "upload-prohibited": "{{PLURAL:$2|Jinis}} berkas nu dilarang: $1.",
        "uploadlogpage": "Log unggahan",
-       "uploadlogpagetext": "Di handap mangrupa daptar muatan koropak nu panganyarna. Titimangsa nu katémbong dumasar titimangsa server.",
-       "filename": "Ngaran koropak",
+       "uploadlogpagetext": "Di handap téh daptar unjalan berkas panganyarna. \nTémbong [[Special:NewFiles|galéri berkas anyar]] pikeun pidangan visual.",
+       "filename": "Ngaran berkas",
        "filedesc": "Ringkesna",
        "fileuploadsummary": "Ringkesan:",
        "filereuploadsummary": "Parobahan berkas:",
        "filesource": "Sumber:",
        "ignorewarning": "Ulah diwaro, simpen baé koropakna.",
        "ignorewarnings": "Tong diwaro panginget naon baé",
-       "minlength1": "Ngaran koropak sahanteuna kudu diwangun ku hiji aksara.",
-       "illegalfilename": "Ngaran koropak \"$1\" ngandung aksara nu teu diwenangkeun pikeun judul kaca. Mangga gentos ngaranna tur cobi muatkeun deui.",
+       "minlength1": "Ngaran koropak sahenteuna ngandung sahurup.",
+       "illegalfilename": "Ngaran berkas \"$1\" ngandung aksara nu teu diwenangkeun pikeun judul kaca. Mangga ganti ngaranna tur coba unjal deui.",
        "filename-toolong": "Ngaran berkas teu meunang leuwih ti 240 bit.",
        "badfilename": "Ngaran gambar geus dirobah jadi \"$1\".",
        "filetype-mime-mismatch": "Éksténsi berkas \".$1\" teu luyu jeung tipeu MIME anu kadetéksi ti berkas ($2).",
        "unknown-error": "Aya kasalahan anu teu dikanyahoankeun.",
        "tmp-create-error": "Teu bisa nyieun berkas sementara.",
        "tmp-write-error": "Éror nulis berkas sementara.",
-       "large-file": "Hadéna mah koropak nu dimuat téh teu leuwih ti $1 bit; ieu koropak gedéna $2 bit.",
-       "largefileserver": "Ieu koropak badag teuing, ngaleuwihan wates nu diwenangkeun ku server.",
-       "emptyfile": "Koropak nu dimuatkeun ku anjeun jigana kosong. Hal ieu bisa jadi alatan sarupaning ''typo'' na ngaran koropakna. Mangga parios deui yén anjeun leres-leres hoyong ngamuat koropak éta.",
+       "large-file": "Alusna mah ukuran berkas téh teu leuwih ti $1;\nari ieu berkas $2.",
+       "largefileserver": "Ieu berkas leuwih badag tina nu diwenangkeun ku sérver.",
+       "emptyfile": "Berkas nu diunjal ku anjeun jigana mah kosong. Ieu perkara meureun alatan salah ketik dina ngaran berkasna. Pék pastikeun yén anjeun téh bener-bener hayang ngunjal éta berkas.",
        "windows-nonascii-filename": "Ieu wiki teu ngarojong ngaran berkas anu maké aksara husus.",
        "fileexists": "Berkas nu ngaranna kieu geus aya, mangga parios <strong>[[:$1]]</strong> mun {{GENDER:|anjeun}} teu yakin rék ngaganti.\n[[$1|thumb]]",
        "fileexists-extension": "Geus aya berkas anu ngaranna sarupa: [[$2|thumb]]\n* Ngaran berkas nu dimuat: <strong>[[:$1]]</strong>\n* Ngaran berkas nu geus aya: <strong>[[:$2]]</strong>\nPilih ngaran séjén.",
        "file-deleted-duplicate": "Berkas anu sarua jeung [[:$1]] geus kungsi dihapus.\nPariksa heula jujutan hapusanana saméméh neruskeun ngamuat deui éta berkas.",
        "uploadwarning": "Pépéling ngamuat",
        "uploadwarning-text": "Ropéa pedaran berkas di handap terus cobaan deui.",
-       "savefile": "Simpen koropak",
+       "savefile": "Simpen berkas",
        "uploaddisabled": "Punten, ngamuat ayeuna ditumpurkeun.",
        "copyuploaddisabled": "Unggahan dumasar URL ditumpurkeun.",
-       "uploaddisabledtext": "Fungsi ngamuat koropak ditumpurkeun.",
-       "uploadscripted": "Koropak ieu ngandung kode HTML atawa skrip nu bisa dibaca ngaco ku panyungsi ramat (''web browser'').",
+       "uploaddisabledtext": "Fungsi ngunjal berkas ditumpurkeun.",
+       "uploadscripted": "Ieu berkas ngandung kodeu HTML atawa skrip nu bisa dibaca ngaco ku panyungsi ramat.",
        "uploaded-setting-href-svg": "Maké tag \"sét\" pikeun nambahkeun atribut \"href\" kana élemén utama dipeungpeuk.",
        "uploadinvalidxml": "XML na berkas nu diunjal teu bisa didadarkeun.",
        "uploadvirus": "Koropakna ngandung virus! Katrangan: $1",
-       "upload-source": "Koropak sumber",
-       "sourcefilename": "Ngaran koropak sumber:",
+       "upload-source": "Berkas sumber",
+       "sourcefilename": "Ngaran berkas sumber:",
        "sourceurl": "URL sumber:",
-       "destfilename": "Ngaran koropak tujuan:",
-       "upload-maxfilesize": "Ukuran koropak panggedéna: $1",
-       "upload-description": "Pedaran koropak",
+       "destfilename": "Ngaran berkas tujuan:",
+       "upload-maxfilesize": "Ukuran maksimum berkas: $1",
+       "upload-description": "Pedaran berkas",
        "upload-options": "Pilihan muat",
        "watchthisupload": "Awaskeun ieu kaca",
-       "filewasdeleted": "Ngaran koropak ieu geus di hapus. Anjeun kudu ningali ka $1 sa acan muatkeun koropak deui",
+       "filewasdeleted": "Berkas nu ngaranna kieu pernah diunjal sarta tuluy dipupus. Pék riksa heula $1 saméméh ngunjal éta berkas téh.",
        "upload-proto-error": "Salah protokol",
        "upload-file-error": "Kasalahan internal",
        "upload-misc-error": "Kasalahan muat anu teu kanyahoan",
        "upload-http-error": "Aya galat HTTP: $1",
        "upload-copy-upload-invalid-domain": "Unjalan téplakan teu sayaga ti ieu domain.",
        "upload-foreign-cant-upload": "Ieu wiki teu diatur pikeun ngunjal berkas ka gudang panyindangan asing.",
+       "upload-dialog-disabled": "Unjal berkas maké ieu dialog dipareuman di ieu wiki.",
        "upload-dialog-title": "Unjal berkas",
        "upload-dialog-button-cancel": "Bolay",
        "upload-dialog-button-back": "Balik deui",
        "upload-dialog-button-upload": "Unjal",
        "upload-form-label-infoform-title": "Wincikan",
        "upload-form-label-infoform-name": "Ngaran",
+       "upload-form-label-infoform-name-tooltip": "Judul déskriptif anu unik pikeun berkas, anu bakal miboga fungsi minangka ngaran berkas. Anjeun bisa maké basa basajan kalawan spasi. Ulah ngawuwuhkeun éksténsi berkas",
        "upload-form-label-infoform-description": "Pedaran",
        "upload-form-label-usage-title": "Pamakéan",
        "upload-form-label-usage-filename": "Ngaran berkas",
        "upload-form-label-own-work": "Ieu mah karya kuring sorangan",
        "upload-form-label-infoform-categories": "Kategori",
        "upload-form-label-infoform-date": "Ping",
+       "upload-form-label-not-own-work-local-generic-local": "Sugan anjeun hayang nyoba [[Special:Upload|kaca unjalan baku]].",
        "backend-fail-stream": "Teu bisa malidkeun berkas \"$1\"",
        "backend-fail-backup": "Teu bisa nyadangkeun berkas \"$1\".",
        "backend-fail-notexists": "Berkas $1 euweuh.",
        "uploadstash-errclear": "Mersihan berkas nu garagal.",
        "uploadstash-refresh": "Nyegerken deui daptar berkas",
        "uploadstash-thumbnail": "tempo miniatur",
+       "invalid-chunk-offset": "Opsét potongan teu valid",
        "img-auth-accessdenied": "Aksés ditolak",
        "img-auth-nofile": "Berkas \"$1\" henteu aya.",
        "img-auth-streaming": "Palidan \"$1\".",
        "img-auth-noread": "Pamaké teu boga kawenangan maca \"$1\".",
        "http-invalid-url": "URL teu bener: $1",
        "http-invalid-scheme": "URL kalawan skéma \"$1\" teu dirojong.",
+       "http-request-error": "Pundutan HTTP gagal alatan kasalahan nu teu dipikanyaho.",
        "http-read-error": "Kasalahan maca HTTP.",
        "http-timed-out": "Pamundutan HTTP béakeun waktu.",
        "http-curl-error": "Kasalahan keur nyokot URL: $1",
        "filehist-nothumb": "Taya miniatur",
        "filehist-user": "Kontributor",
        "filehist-dimensions": "Ukuran",
-       "filehist-filesize": "Ukuran koropak",
+       "filehist-filesize": "Ukuran berkas",
        "filehist-comment": "Kamandang",
        "imagelinks": "Pamakéan berkas",
        "linkstoimage": "Kaca ieu  {{PLURAL:$1|numbu|$1 numbu}} ka gambar ieu :",
        "nolinkstoimage": "Teu aya kaca anu nutumbu ka ieu berkas.",
        "linkstoimage-redirect": "$1 (pangalihan berkas) $2",
-       "sharedupload": "Ieu koropak téh ti $1 nu bisa jadi dipaké ku proyék-proyék lianna.",
+       "sharedupload": "Ieu berkas téh ti $1 jeung meureun dipaké ku proyék-proyék séjén.",
        "sharedupload-desc-here": "Ieu berkas asalna ti $1 anu bisa jadi dipaké ku proyék séjén. \nPedaran ti [$2 kaca pedaranana] dipidangkeun di handap.",
        "filepage-nofile": "Taya berkas nu ngaranna kieu.",
        "filepage-nofile-link": "Taya berkan nu ngaranna kieu, tapi anjeun bisa [$1 ngunjalkeunna].",
        "protectedarticle": "ngonci $1",
        "modifiedarticleprotection": "hambalan koncian \"[[$1]]\" geus dirobah",
        "unprotectedarticle": "muka konci tina \"[[$1]]\"",
+       "movedarticleprotection": "ngalihkeun pangaturan protéksi ti \"[[$2]]\" ka \"[[$1]]\"",
        "protectedarticle-comment": "{{GENDER:$2|Nangtayungan}} \"[[$1]]\"",
+       "modifiedarticleprotection-comment": "{{GENDER:$2|Ngarobah tingkat panangtayungan}} pikeun \"[[$1]]\"",
        "protect-title": "Ngonci \"$1\"",
        "protect-title-notallowed": "Tempo undak panangtayungan ti \"$1\"",
        "prot_1movedto2": "mindahkeun [[$1]] ka [[$2]]",
        "protect-badnamespace-title": "Ngaranspasi nu teu bisa ditangtayungan",
+       "protect-badnamespace-text": "Kaca dina ieu ngaranspasi teu bisa diprotéksi.",
        "protect-norestrictiontypes-title": "Kaca nu teu karaksa",
        "protect-legend": "Konfirmasi ngonci",
        "protectcomment": "Alesan:",
        "year": "Ti taun (jeung saméméhna):",
        "sp-contributions-newbies": "Témbongkeun kontribusi ti akun anyar wungkul",
        "sp-contributions-newbies-sub": "Pikeun akun anyar",
+       "sp-contributions-newbies-title": "Kontribusi pamaké pikeun akun anyar",
        "sp-contributions-blocklog": "log peungpeuk",
        "sp-contributions-suppresslog": "kontribusi {{GENDER:$1|pamaké}} nu disamunikeun",
        "sp-contributions-deleted": "kontribusi {{GENDER:$1|pamaké}} nu dipupus",
        "ipboptions": "2 jam:2 hours,sapoé:1 day,3 poé:3 days,saminggu:1 week,2 minggu:2 weeks,sabulan:1 month,3 bulan:3 months,6 bulan:6 months,sataun:1 year,tanpa wates:infinite",
        "ipbhidename": "Sumputkeun ngaran pamaké tina éditan jeung daptar pamaké",
        "ipbwatchuser": "Awaskeun kaca pamaké jeung kaca obrolan pamaké ieu",
+       "ipb-change-block": "Peungpeuk deui pamaké kalawan sét konfigurasi ieu",
        "ipb-confirm": "Konfirmasi peungpeuk",
        "badipaddress": "Alamat IP teu sah",
        "blockipsuccesssub": "Meungpeuk geus hasil",
-       "blockipsuccesstext": "\"$1\" dipeungpeuk.\n<br />Tempo [[Special:BlockList|daptar peungpeuk IP]] pikeun nempoan deui peungpeuk.",
+       "blockipsuccesstext": "[[Special:Contributions/$1|$1]] geus dipeungpeuk.<br />\nTempo [[Special:BlockList|daptar peungpeukan]] pikeun niténan deui pameungpeukan.",
        "ipb-edit-dropdown": "Édit alesan meungpeuk",
        "ipb-unblock-addr": "Buka peungpeuk $1",
        "ipb-unblock": "Nyabut peungpeuk pamaké atawa alamat IP",
        "imported-log-entries": "Geus diimpor $1 {{PLURAL:$1|saéntri log|éntri log}}.",
        "importfailed": "Ngimpor gagal: $1",
        "importunknownsource": "Tipeu sumber impor teu dipikawanoh",
-       "importcantopen": "Teu bisa muka koropak impor",
+       "importcantopen": "Teu bisa muka berkas impor",
        "importbadinterwiki": "Tutumbu antarwiki awon",
        "importsuccess": "Ngimpor geus hasil!",
        "importnosources": "Taya wiki ti nu diimpor nu geus dijieun sarta pamuatan jujuta sacara langsung geus di non-aktifkeun.",
-       "importnofile": "Euweuh koropak impor nu dimuat.",
-       "importuploaderrorsize": "Koropak impor gagal dimuat. Ukuranana ngaleuwihan wates nu diwenangkeun.",
-       "importuploaderrorpartial": "Koropak impor gagal dimuat sagemblengna.",
-       "importuploaderrortemp": "Koropak impor gagal dimuat. Folder samentarana leungit.",
+       "importnofile": "Euweuh berkas impor nu diunjal.",
+       "importuploaderrorsize": "Unjalan berkas impor gagal. Ukuranna ngaleuwihan wates nu diwenangkeun.",
+       "importuploaderrorpartial": "Unjalan berkas impor gagal.\nNgan sawaréh berkas nu ngahasil diunjal.",
+       "importuploaderrortemp": "Unjalan berkas impor gagal. Folder témporérna leungit.",
        "import-parse-failure": "Prosés impor XML teu hasil",
        "import-noarticle": "Euweuh kaca imporeun!",
        "import-nonewrevisions": "Euweuh révisi nu diimpor (sakum révisi geus aya atawa diliwatan lantaran kasalahan).",
        "import-logentry-interwiki-detail": "$1 {{PLURAL:$1|sarévisi|révisi}} diimpor ti $2",
        "javascripttest": "Nguji JavaScript",
        "javascripttest-pagetext-unknownaction": "Tarékah \"$1\" teu dipikanyaho.",
+       "javascripttest-qunit-intro": "Tempo [$1 dokuméntasi pangujian] di mediawiki.org.",
        "tooltip-pt-userpage": "Kaca {{GENDER:|pamaké anjeun}}",
        "tooltip-pt-anonuserpage": "Kaca pamaké pikeun IP nu ku anjeun keur diédit",
        "tooltip-pt-mytalk": "Kaca obrolan {{GENDER:|anjeun}}",
        "pageinfo-redirectsto-info": "info",
        "pageinfo-contentpage": "Diitung minangka kaca eusi",
        "pageinfo-contentpage-yes": "Enya",
+       "pageinfo-protect-cascading": "Panangtayungan ngaruntuy ti dieu",
        "pageinfo-protect-cascading-yes": "Enya",
+       "pageinfo-protect-cascading-from": "Panangtayungan mapay ti",
        "pageinfo-category-info": "Info kategori",
        "pageinfo-category-total": "Jumlah anggahota",
        "pageinfo-category-pages": "Jumlah kaca",
        "pageinfo-user-id": "ID pamaké",
        "markaspatrolleddiff": "Tandaan salaku geus diriksa",
        "markaspatrolledtext": "Tandaan artikel ieu salaku geus diriksa",
+       "markaspatrolledtext-file": "Tandaan vérsi berkas minangka kaawas",
        "markedaspatrolled": "Tandaan salaku geus diriksa",
        "markedaspatrolledtext": "Révisi [[:$1]] nu dipilih geus ditandaan salaku geus diroris.",
        "rcpatroldisabled": "Ronda Nu Anyar Robah ditumpurkeun",
        "markedaspatrollederror": "Teu bisa nandaan geus dipatroli",
        "markedaspatrollederrortext": "Anjeun kudu milih révisi anu rék ditandaan geus diroris.",
        "markedaspatrollederror-noautopatrol": "Anjeung teu diwenangkeun nandaan pangriksa ka éditan sorangan.",
+       "markedaspatrollednotify": "Ieu parobahan pikeun $1 geus ditandaan kaawas.",
+       "markedaspatrollederrornotify": "Nandaan minangka kaawas gagal.",
        "patrol-log-page": "Log patroli",
        "patrol-log-header": "Ieu minangka log pikeun révisi nu geus diroris.",
        "log-show-hide-patrol": "$1 log rorisan",
        "yesterday-at": "Kamari jam $1",
        "bad_image_list": "Formatna kieu:\n\nNgan daptar butiran (baris anu dimimitian ku tanda *) anu diitung. \nTutumbu kahiji dina hiji baris dianggap numbu ka berkas anu goréng. \nTutumbu sanggeusna dina baris anu sarua dianggap bener, nyaéta artikel anu midangkeun éta berkas.",
        "metadata": "Métadata",
-       "metadata-help": "Ieu koropak ngandung émbaran tambahan, nu sigana asalna tina kaméra digital atawa paminday nu dipaké pikeun ngadigitalkeunana. Mun ieu koropak geus dirobah tina bentuk aslina, datana bisa jadi teu bener.",
+       "metadata-help": "Ieu berkas ngandung informasi panambah, mumkin ditambahkeun tina kaméra digital atawa pamindéy nu dipaké pikeun nyieun atawa ngadigitalkeun ieu berkas.\nMun ieu berkas geus diropéa tina wangun aslina, sawatara wincikan meureun baé teu sagemblengna ngarépléksikeun informasi ti ieu berkas nu diropéa téh.",
        "metadata-expand": "Témbongkeun wincikan panambah",
        "metadata-collapse": "Sumputkeun wincikan panambah",
        "metadata-fields": "Widang métadata gambar nu dibéréndélkeun di handap bakal dipidangkeun dina kaca gambar mun tabél métadata disumputkeun.\nNu séjénna bakal disumputkeun sakumaha asalna.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
        "redirect-logid": "ID log",
        "redirect-not-exists": "Ajén teu kapanggih",
        "fileduplicatesearch": "Paluruh gambar duplikat",
-       "fileduplicatesearch-filename": "Ngaran koropak:",
+       "fileduplicatesearch-filename": "Ngaran berkas:",
        "fileduplicatesearch-submit": "Paluruh",
        "fileduplicatesearch-info": "$1 × $2 piksel<br />Ukuran koropak: $3<br />Tipeu MIME: $4",
        "fileduplicatesearch-result-1": "Koropak \"$1\" teu boga duplikat idéntik.",
index 77474e8..af62897 100644 (file)
        "parser-template-loop-warning": "检查到模板循环:[[$1]]",
        "template-loop-category": "有模板循环的页面",
        "template-loop-category-desc": "页面存在模板循环,就是递归进行自我调用的模板。",
+       "template-loop-warning": "<strong>警告:</strong>此页面调用[[:$1]],这导致了模板循环(无限递归调用)。",
        "parser-template-recursion-depth-warning": "模板递归深度越限($1)",
        "language-converter-depth-warning": "字词转换器深度越限($1)",
        "node-count-exceeded-category": "页面的节点数超出限制",
        "rcfilters-watchlist-markseen-button": "标记所有更改为已查看",
        "rcfilters-watchlist-edit-watchlist-button": "编辑您的监视页面的列表",
        "rcfilters-watchlist-showupdated": "自更改发生以来,对您尚未访问的页面做出的更改以<strong>粗体</strong>显示,并带有立体标记。",
+       "rcfilters-preference-label": "隐藏改进的最近更改版本",
+       "rcfilters-preference-help": "返回到2017年界面重新设计版,并重新添加这以后新增的工具。",
        "rcnotefrom": "下面{{PLURAL:$5|是}}<strong>$3 $4</strong>之后的更改(最多显示<strong>$1</strong>个)。",
        "rclistfromreset": "重置时间选择",
        "rclistfrom": "显示$3 $2之后的新更改",
index 89e8089..ecbbb85 100644 (file)
@@ -1244,8 +1244,8 @@ abstract class Maintenance {
         * This function has the same parameters as wfGetDB()
         *
         * @param int $db DB index (DB_REPLICA/DB_MASTER)
-        * @param array $groups; default: empty array
-        * @param string|bool $wiki; default: current wiki
+        * @param array $groups default: empty array
+        * @param string|bool $wiki default: current wiki
         * @return IMaintainableDatabase
         */
        protected function getDB( $db, $groups = [], $wiki = false ) {
index 1ebc4f6..04158ae 100644 (file)
@@ -35,6 +35,7 @@ class AddSite extends Maintenance {
        /**
         * Imports the site described by the parameters (see self::__construct()) passed to this
         * maintenance sccript into the sites table of MediaWiki.
+        * @return bool
         */
        public function execute() {
                $siteStore = MediaWikiServices::getInstance()->getSiteStore();
index 94b7fb4..6128d23 100644 (file)
@@ -69,6 +69,8 @@ class DeprecatedInterfaceFinder extends FileAwareNodeVisitor {
        /**
         * Check whether a function or method includes a call to wfDeprecated(),
         * indicating that it is a hard-deprecated interface.
+        * @param PhpParser\Node $node
+        * @return bool
         */
        public function isHardDeprecated( PhpParser\Node $node ) {
                if ( !$node->stmts ) {
index d273a6a..26a9c39 100644 (file)
@@ -410,7 +410,7 @@ class GenerateSitemap extends Maintenance {
        /**
         * gzwrite() / fwrite() wrapper
         *
-        * @param resource $handle
+        * @param resource &$handle
         * @param string $str
         */
        function write( &$handle, $str ) {
@@ -427,7 +427,7 @@ class GenerateSitemap extends Maintenance {
        /**
         * gzclose() / fclose() wrapper
         *
-        * @param resource $handle
+        * @param resource &$handle
         */
        function close( &$handle ) {
                if ( $this->compress ) {
index 6975e25..a63149e 100644 (file)
 行動電話   移动电话
 流動電話   移动电话
 數據機      调制解调器
+網域名稱   域名
 葉門 也门
 貝里斯      伯利兹
 維德角      佛得角
 馬爾地夫   马尔代夫
 馬爾他      马耳他
 馬利共和國        马里共和国
+汕埠 圣佩德罗苏拉
 笨豬跳      蹦极跳
 绑紧跳      蹦极跳
 狗隻 犬只
 賓拉登      本拉登
 賓·拉登    本·拉登
 歐巴馬      奥巴马
+唐納·川普 唐纳德·特朗普
+當勞·特朗普      唐纳德·特朗普
+當奴·特朗普      唐纳德·特朗普
 北韓 北朝鲜
 台北韓      台北韩
 寮人民民主共和國       老挝人民民主共和国
 百慕達      百慕大
 三藩市      旧金山
 荷里活      好莱坞
+荷里活道   荷里活道
+荷里活廣場        荷里活广场
 麻薩諸塞   马萨诸塞
 伊利諾      伊利诺伊
 伊利諾伊   伊利诺伊
 韌體 固件
 唯讀 只读
 作業系統   操作系统
+行動作業系統     移动操作系统
+流動作業系統     移动操作系统
 外掛程式   插件
 電晶體      晶体管
 顯示卡      显卡
@@ -2576,7 +2585,6 @@ A型肝炎        甲型肝炎
 芮氏規模   里氏震级
 芮氏地震規模     里氏地震规模
 黎克特制   里氏
-機率 概率
 行政總裁   首席执行官
 執行長,   首席执行官,
 執行長、   首席执行官、
@@ -2624,6 +2632,7 @@ A型肝炎        甲型肝炎
 數位技術   数字技术
 數位訊號   数字信号
 數碼訊號   数字信号
+數位音樂   数字音乐
 數位化      数字化
 行動網路   移动网络
 流動網絡   移动网络
@@ -2672,3 +2681,4 @@ A型肝炎        甲型肝炎
 行人路权   行人路权
 塑膠袋      塑料袋
 烏龍麵      乌冬面
+披索 比索
index 7a07259..b71764a 100644 (file)
@@ -14,7 +14,6 @@
 妆台 妝枱
 弹珠台      彈珠枱
 折台 摺枱
-台布 枱布
 台历 枱曆
 台灯 枱燈
 写字台      寫字枱
 機器人      機械人
 移动电话   流動電話
 行動電話   流動電話
+操作系统   作業系統
+移动操作系统     流動作業系統
+行動作業系統     流動作業系統
 數據機      調制解調器
 短信 短訊
 簡訊 短訊
 賓拉登      本拉登
 賓·拉登    本·拉登
 歐巴馬      奧巴馬
+唐納·川普 當勞·特朗普
+唐纳德·特朗普   當勞·特朗普
 戈登·布朗 白高敦
 狂牛症      瘋牛症
 A肝   甲肝
@@ -3007,6 +3011,8 @@ IP地址  IP位址
 數位技術   數碼技術
 数字信号   數碼訊號
 數碼訊號   數碼訊號
+数字音乐   數碼音樂
+數位音樂   數碼音樂
 数字化      數碼化
 數位化      數碼化
 行動網路   流動網絡
index 6f3304f..56400c3 100644 (file)
 崑腔 昆腔
 崑蘇 昆苏
 崑調 昆调
+崑島 昆岛
 諠譁 喧哗
 慫慂 怂恿
 陈元扞      陈元扞
index d983932..16e2751 100644 (file)
 馬利蘭      馬里蘭
 里士满      里奇蒙
 荷里活      好萊塢
-荷李活道   荷李活道
+荷里活道   荷里活道
+荷里活廣場        荷里活廣場
 维尔京群岛        維京群島
 維爾京群島        維京群島
 纽黑文      紐哈芬
 蒙特利爾   蒙特婁
 斯堪的纳维亚     斯堪地那維亞
 斯堪的納維亞     斯堪地那維亞
+圣佩德罗苏拉     汕埠
 麦克尔      麥可
 迈克尔      麥可
 魯賓斯·巴里切羅        魯本·巴瑞切羅
 肯尼迪      甘迺迪
 奥巴马      歐巴馬
 奧巴馬      歐巴馬
+特朗普      川普
+唐纳德·特朗普   唐納·川普
+當勞·特朗普      唐納·川普
+當奴·特朗普      唐納·川普
 概率 機率
 疯牛症      狂牛症
 甲肝 A肝
 智能卡      智慧卡
 數據庫      資料庫
 操作系统   作業系統
+移动操作系统     行動作業系統
+流動作業系統     行動作業系統
 人机交互   人機互動
 交互设计   互動設計
 互联网络   網際網路
index e5b05ff..1912bcf 100644 (file)
@@ -135,6 +135,7 @@ U+056D9囙|U+056E0因|
 U+05705圅|U+051FD函|
 U+0577F坿|U+09644附|
 U+0579C垜|U+0579B垛|
+U+057BB垻|U+0575D坝|
 U+0585A塚|U+051A2冢|
 U+0585F塟|U+0846C葬|
 U+05872塲|U+0573A场|
index 9b2e081..c5d5fd7 100644 (file)
 雪窗螢几
 燕几
 隱几
+几筵
 饑饉
 乾薑
 毛薑
 上簽發
 上簽約
 上簽了
+上簽證
 中簽名
 中簽字
 中簽收
 中簽發
 中簽約
 中簽了
+中簽證
 下簽名
 下簽字
 下簽收
 下簽發
 下簽約
 下簽了
+下簽證
 犖确
 磽确
 确瘠
 山谷 #分詞用
 溝谷
 曼谷
+星露谷物語
 于美人
 緊緻
 曰云
 可自制
 台子女
 台子孫
-台布景
 台州
 台風穩健
 穩健的台風
 尸鳩
 尸佼
 尸子
+尸羅
 尸羅精舍
 毗婆尸佛
 尸棄佛
 蛋白發
 發狀態
 發狀況
+染發生
 古人有云
 昔人有云
 云敞
 性別扭曲
 箇舊市
 雲南箇舊
+關系列
+關系統
+關系所
+關系科
index 4313806..9d4e261 100644 (file)
@@ -222,7 +222,7 @@ class MigrateComments extends LoggedUpdateMaintenance {
         * comment ID field.
         * Blanks the old fields while migrating.
         *
-        * @param string $oldTable Table to migrate
+        * @param string $table Table to migrate
         * @param string $primaryKey Primary key of the table.
         * @param string $oldField Old comment field name
         * @param string $newPrimaryKey Primary key of the new table.
index eb60f80..e086c5e 100644 (file)
@@ -67,12 +67,12 @@ TEXT
                $this->output( "Copying IP revisions to ip_changes, from rev_id $start to rev_id $end\n" );
 
                while ( $blockStart <= $end ) {
-                       $cond = "rev_id >= $blockStart AND rev_user = 0 ORDER BY rev_id ASC LIMIT " . $this->mBatchSize;
                        $rows = $dbw->select(
                                'revision',
                                [ 'rev_id', 'rev_timestamp', 'rev_user_text' ],
-                               $cond,
-                               __METHOD__
+                               [ "rev_id >= $blockStart", 'rev_user' => 0 ],
+                               __METHOD__,
+                               [ 'ORDER BY' => 'rev_id ASC', 'LIMIT' => $this->mBatchSize ]
                        );
 
                        if ( !$rows || $rows->numRows() === 0 ) {
index 01cf3c3..8ac7f91 100644 (file)
@@ -106,6 +106,7 @@ class UserOptions {
 
        /**
         * Dumb stuff to run a mode.
+        * @return bool
         */
        public function run() {
                if ( !$this->mReady ) {
index 4c5266e..bd9890b 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -20,6 +20,9 @@
                <exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
                <exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage" />
                <exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals" />
+               <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase" />
+               <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+               <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>
diff --git a/resources/src/mediawiki.action/images/close.png b/resources/src/mediawiki.action/images/close.png
new file mode 100644 (file)
index 0000000..80dde95
Binary files /dev/null and b/resources/src/mediawiki.action/images/close.png differ
diff --git a/resources/src/mediawiki.action/images/close.svg b/resources/src/mediawiki.action/images/close.svg
new file mode 100644 (file)
index 0000000..7f75511
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+       <path d="M3.636 2.222l14.142 14.142-1.414 1.414L2.222 3.636z"/>
+       <path d="M17.778 3.636L3.636 17.778l-1.414-1.414L16.364 2.222z"/>
+</svg>
index e1fa925..d19f098 100644 (file)
@@ -7,7 +7,7 @@
        height: 0;
        left: 50%;
        z-index: 1000;
-       font-size: 13px;
+       font-size: 14px;
        cursor: pointer;
 }
 
        opacity: 1;
        .transition( opacity 250ms );
 
+       &:after {
+               content: '';
+               background: no-repeat center center;
+               .background-image-svg( 'images/close.svg', 'images/close.png' );
+               background-size: 12px 12px;
+               position: absolute;
+               right: 0.4em;
+               top: 0;
+               bottom: 0;
+               min-width: 32px;
+               min-height: 32px;
+               opacity: 0.87;
+
+               &:hover {
+                       opacity: 1;
+               }
+       }
+
        &.mw-notification {
                padding-right: 3em;
        }
 }
 
 .postedit-icon {
-       padding-left: 41px; /* 25 + 8 + 8 */
+       padding-left: 25px;
        /* like min-height, but old IE compatible and keeps text vertically aligned, too */
        line-height: 25px;
        background-repeat: no-repeat;
-       background-position: 8px 50%;
 }
 
 .postedit-icon-checkmark {
        /* @embed */
        background-image: url( images/green-checkmark.png );
-       background-position: left;
-}
-
-.postedit:after {
-       content: '×';
-       position: absolute;
-       padding: 0 0.8em;
-       right: 0;
-       top: 0;
-       font-size: 1.25em;
-       font-weight: bold;
-       line-height: 2.3em;
-       text-shadow: 0 0.0625em 0 #fff;
-       opacity: 0.2;
-}
-
-.postedit:hover:after {
-       opacity: 0.4;
 }
index 3726a68..6a52434 100644 (file)
 
                setSpecialCharacters: function ( data ) {
                        this.specialCharacters = data;
+               },
+
+               /**
+                * Formats language tags according the BCP47 standard.
+                * See wfBCP47 for the PHP implementation.
+                *
+                * @param {string} languageTag Well-formed language tag
+                * @return {string}
+                */
+               bcp47: function ( languageTag ) {
+                       var formatted,
+                               isFirstSegment = true,
+                               isPrivate = false,
+                               segments = languageTag.split( '-' );
+
+                       formatted = segments.map( function ( segment ) {
+                               var newSegment;
+
+                               // when previous segment is x, it is a private segment and should be lc
+                               if ( isPrivate ) {
+                                       newSegment = segment.toLowerCase();
+                               // ISO 3166 country code
+                               } else if ( segment.length === 2 && !isFirstSegment ) {
+                                       newSegment = segment.toUpperCase();
+                               // ISO 15924 script code
+                               } else if ( segment.length === 4 && !isFirstSegment ) {
+                                       newSegment = segment.charAt( 0 ).toUpperCase() + segment.substring( 1 ).toLowerCase();
+                               // Use lowercase for other cases
+                               } else {
+                                       newSegment = segment.toLowerCase();
+                               }
+
+                               isPrivate = segment.toLowerCase() === 'x';
+                               isFirstSegment = false;
+
+                               return newSegment;
+                       } );
+
+                       return formatted.join( '-' );
                }
        } );
 
index c6ad655..9930525 100644 (file)
@@ -278,7 +278,7 @@ p.mw-delete-editreasons {
 
 /* The auto-generated edit comments */
 .autocomment {
-       color: #808080;
+       color: #72777d;
 }
 
 /** Generic minor/bot/newpage styling (recent changes) */
@@ -361,11 +361,11 @@ a.mw-selflink:visited {
  * keep in sync with commonPrint.css
  */
 table.wikitable {
-       margin: 1em 0;
        background-color: #f8f9fa;
+       color: #222;
+       margin: 1em 0;
        border: 1px solid #a2a9b1;
        border-collapse: collapse;
-       color: #000;
 }
 
 table.wikitable > tr > th,
index 8d0aa05..f37229f 100644 (file)
                        'liveUpdate',
                        {
                                limit: 1,
-                               peek: 1, // bypasses all UI
+                               // temporarily disabled ( T173613#3591657 )
+                               // peek: 1, // bypasses all UI
                                from: this.changesListModel.getNextFrom()
                        }
                );
index cc9c65a..74dc0b7 100644 (file)
@@ -29,7 +29,7 @@
        width: 100%;
        border: 1px solid @colorFieldBorder;
        border-radius: @borderRadius;
-       padding: 0.625em 0.546875em 0.546875em;
+       padding: 0.625em 0.625em 0.546875em;
        // necessary for smooth transition
        box-shadow: inset 0 0 0 0.1em #fff;
        font-family: inherit;
index 6a93fdd..c4363ed 100644 (file)
 
 .mw-feedbackDialog-welcome-message,
 .mw-feedbackDialog-feedback-terms {
-       line-height: 1.2em;
+       line-height: 1.4;
 }
 
-.mw-feedbackDialog-feedback-form {
-       margin-top: 1em;
+.mw-feedbackDialog-welcome-message {
+       margin-bottom: 1em;
+}
+
+/* Overwriting OOUI is no fun */
+.mw-feedbackDialog-feedback-form .oo-ui-fieldLayout.oo-ui-labelElement.oo-ui-fieldLayout-align-left > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header {
+       min-width: 4.2em;
+       width: 10%;
+}
+.mw-feedbackDialog-feedback-form .oo-ui-fieldLayout.oo-ui-labelElement.oo-ui-fieldLayout-align-left > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
+       width: 80%;
 }
 
 .mw-feedbackDialog-feedback-termsofuse {
-       margin-left: 2.5em;
+       margin-left: 2em;
 }
index 34f7eba..fb34a89 100644 (file)
                 * @return {string} Encoded string
                 */
                escapeIdForLink: function ( str ) {
-                       var mode = mw.config.get( 'wgFragmentMode' )[ 0 ],
-                               id = escapeIdInternal( str, mode );
-
-                       if ( mode === 'html5' ) {
-                               id = encodeURIComponent( id ).replace( /%3A/g, ':' );
-                       }
+                       var mode = mw.config.get( 'wgFragmentMode' )[ 0 ];
 
-                       return id;
+                       return escapeIdInternal( str, mode );
                },
 
                /**
index 5457696..81473df 100644 (file)
@@ -234,7 +234,7 @@ class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
 
        /**
         * Asserts that the cookie jar does not have the given cookie.
-        * @param string $expectedName Cookie name
+        * @param string $name Cookie name
         * @param CookieJar $cookieJar
         */
        protected function assertNotHasCookie( $name, CookieJar $cookieJar ) {
index 784c29c..33aee7d 100644 (file)
@@ -29,6 +29,8 @@ class DbTestPreviewer extends TestRecorder {
 
        /**
         * This should be called before the table prefix is changed
+        * @param IDatabase $db
+        * @param bool|string $filter
         */
        function __construct( $db, $filter = false ) {
                $this->db = $db;
index ac9f150..94d226c 100644 (file)
@@ -280,6 +280,7 @@ class ParserTestPrinter extends TestRecorder {
 
        /**
         * Show a warning to the user
+        * @param string $message
         */
        public function warning( $message ) {
                echo "$message\n";
@@ -287,6 +288,8 @@ class ParserTestPrinter extends TestRecorder {
 
        /**
         * Mark a test skipped
+        * @param string $test
+        * @param string $subtest
         */
        public function skipped( $test, $subtest ) {
                if ( $this->showProgress ) {
index 37ed85f..61aa0d7 100644 (file)
@@ -78,6 +78,7 @@ class ParserTestResultNormalizer {
 
        /**
         * Serialize the XML DOM for comparison purposes. This does not generate HTML.
+        * @return string
         */
        protected function serialize() {
                return strtr( $this->doc->saveXML( $this->body ),
index 46c551b..5fe2177 100644 (file)
@@ -518,6 +518,8 @@ class ParserTestRunner {
        /**
         * Ensure a given setup stage has been done, throw an exception if it has
         * not.
+        * @param string $funcName
+        * @param string|null $funcName2
         */
        protected function checkSetupDone( $funcName, $funcName2 = null ) {
                if ( !$this->setupDone[$funcName]
@@ -700,6 +702,8 @@ class ParserTestRunner {
        /**
         * Determine whether the current parser has the hooks registered in it
         * that are required by a file read by TestFileReader.
+        * @param array $requirements
+        * @return bool
         */
        public function meetsRequirements( $requirements ) {
                foreach ( $requirements as $requirement ) {
@@ -1600,12 +1604,15 @@ class ParserTestRunner {
                // get a reference to the mock object.
                MessageCache::singleton()->getParser();
                $restore = $this->executeSetupSnippets( [ 'wgParser' => new ParserTestMockParser ] );
-               $status = $page->doEditContent(
-                       ContentHandler::makeContent( $text, $title ),
-                       '',
-                       EDIT_NEW | EDIT_INTERNAL
-               );
-               $restore();
+               try {
+                       $status = $page->doEditContent(
+                               ContentHandler::makeContent( $text, $title ),
+                               '',
+                               EDIT_NEW | EDIT_INTERNAL
+                       );
+               } finally {
+                       $restore();
+               }
 
                if ( !$status->isOK() ) {
                        throw new MWException( $status->getWikiText( false, false, 'en' ) );
index 238d018..2f82ca7 100644 (file)
@@ -9,6 +9,8 @@ class PhpunitTestRecorder extends TestRecorder {
 
        /**
         * Mark a test skipped
+        * @param string $test
+        * @param string $reason
         */
        public function skipped( $test, $reason ) {
                $this->testCase->markTestSkipped( "SKIPPED: $reason" );
index 39c9ca5..6aed02f 100644 (file)
@@ -29,6 +29,7 @@ class TidySupport {
 
        /**
         * Determine if there is a usable tidy.
+        * @param bool $useConfiguration
         */
        public function __construct( $useConfiguration = false ) {
                global $IP, $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig,
index 3f93793..ff777e7 100644 (file)
@@ -307,7 +307,7 @@ CircularRef
 <references />
 !! html/parsoid
 <p><span about="#mwt1" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Transclusion  mw:Extension/ref" data-parsoid='{"pi":[[]]}' data-mw='{"parts":[{"template":{"target":{"wt":"CircularRef","href":"./Template:CircularRef"},"params":{},"i":0}}]}'><a href="./Main_Page#cite_note-1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a></span></p>
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">Error: Expansion loop detected at <a data-parsoid='{"a":{"href":null},"sa":{"href":"Template:CircularRef"}}'>Template:CircularRef</a></span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">Error: Expansion loop detected at <a data-parsoid='{"a":{"href":null},"sa":{"href":"Template:CircularRef"}}'>Template:CircularRef</a></span></li></ol>
 !! end
 
 !! test
@@ -2449,7 +2449,7 @@ Block tag pre
 foo
 </pre>
 !! html/parsoid
-<p data-parsoid='{"stx":"html","autoInsertedEnd":true}'></p><pre typeof="mw:Extension/pre" about="#mwt2" data-parsoid='{"stx":"html"}' data-mw='{"name":"pre","attrs":{},"body":{"extsrc":"foo"}}'>foo</pre><p data-parsoid='{"autoInsertedStart":true,"stx":"html"}'></p>
+<p class='mw-empty-elt' data-parsoid='{"stx":"html","autoInsertedEnd":true}'></p><pre typeof="mw:Extension/pre" about="#mwt2" data-parsoid='{"stx":"html"}' data-mw='{"name":"pre","attrs":{},"body":{"extsrc":"foo"}}'>foo</pre><p class='mw-empty-elt' data-parsoid='{"autoInsertedStart":true,"stx":"html"}'></p>
 !! end
 
 !!test
@@ -4332,6 +4332,21 @@ Definition Lists: Mixed Lists: Test 10
 
 !! end
 
+# This is a regression test for T175099
+# html/php+tidy is insufficient since Tidy covers up the bug.
+# But once Tidy is replaced with RemexHTML, html/php+tidy is good enough
+!! test
+Definition Lists: Mixed Lists: Test 11
+!! wikitext
+;a
+:*b
+!! html
+<dl><dt>a</dt>
+<dd>
+<ul><li>b</li></ul></dd></dl>
+
+!! end
+
 # The Parsoid team disagrees with the PHP parser's seemingly-random
 # rules regarding dd/dt on the next two tests.  Parsoid is more
 # consistent, and recognizes the shared nesting and keeps the
@@ -4339,7 +4354,7 @@ Definition Lists: Mixed Lists: Test 10
 # (And tidy again converts <dt> to <dd> before 'bar'.)
 
 !! test
-Definition Lists: Mixed Lists: Test 11
+Definition Lists: Mixed Lists: Test 12
 !! wikitext
 *#*#;*;;foo :bar
 *#*#;boo :baz
@@ -6672,7 +6687,7 @@ Don't break on | in extension attribute in template
 !! html/parsoid
 <p><span about="#mwt2" class="mw-ref" id="cite_ref-hi.7Cho_1-0" rel="dc:references" typeof="mw:Transclusion  mw:Extension/ref" data-parsoid='{"pi":[[{"k":"1"}]]}' data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;ref name=\"hi|ho\">ha&lt;/ref>"}},"i":0}}]}'><a href="./Main_Page#cite_note-hi.7Cho-1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a></span></p>
 
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-hi.7Cho-1" id="cite_note-hi.7Cho-1"><a href="./Main_Page#cite_ref-hi.7Cho_1-0" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-hi.7Cho-1" class="mw-reference-text">ha</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-hi.7Cho-1" id="cite_note-hi.7Cho-1"><a href="./Main_Page#cite_ref-hi.7Cho_1-0" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-hi.7Cho-1" class="mw-reference-text">ha</span></li></ol>
 !! end
 
 ## We don't support roundtripping of these attributes in Parsoid.
@@ -6847,7 +6862,7 @@ T107652: <ref>s in templates that also generate table cell attributes should be
 <table>
 <tbody><tr><td style="background:#f9f9f9;" typeof="mw:Transclusion" about="#mwt1" data-mw='{"parts":["|",{"template":{"target":{"wt":"table_attribs_7","href":"./Template:Table_attribs_7"},"params":{},"i":0}}]}'>Foo<span class="mw-ref" id="cite_ref-1" rel="dc:references" data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a href="./Main_Page#cite_note-1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a></span></td></tr>
 </tbody></table>
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
 !! end
 
 !! test
@@ -7307,8 +7322,8 @@ parsoid=wt2html
 !! html
 <table>
 <tbody>
-<tr></tr>
-<tr></tr>
+<tr class='mw-empty-elt'></tr>
+<tr class='mw-empty-elt'></tr>
 </tbody></table>
 !! end
 
@@ -9691,7 +9706,7 @@ parsoid
 !! wikitext
 *<references />
 !! html/parsoid
-<ul><li data-parsoid='{}'><ol class="mw-references" typeof="mw:Extension/references" about="#mwt2" data-parsoid='{}' data-mw='{"name":"references","attrs":{}}'></ol></li></ul>
+<ul><li data-parsoid='{}'><ol class="mw-references references" typeof="mw:Extension/references" about="#mwt2" data-parsoid='{}' data-mw='{"name":"references","attrs":{}}'></ol></li></ul>
 !! end
 
 !! test
@@ -9861,6 +9876,17 @@ parsoid=wt2html,wt2wt
 <ul>
 <li>not a li-hack</li>
 </ul>
+!! html/parsoid
+<ul><li> foo</li>
+<li data-parsoid='{"stx":"html","autoInsertedEnd":true,"liHackSrc":"* "}'>li-hack</li>
+<li about="#mwt1" typeof="mw:Transclusion" data-parsoid='{"stx":"html","autoInsertedEnd":true,,"pi":[[{"k":"1"}]]}' data-mw='{"parts":["* ",{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;li>templated li-hack"}},"i":0}}]}'>templated li-hack</li>
+<li data-parsoid='{"autoInsertedEnd":true}'> <!--foo--> </li><li data-parsoid='{"stx":"html","autoInsertedEnd":true}'> unsupported li-hack with preceding comments</li></ul>
+
+<ul data-parsoid='{"stx":"html"}'>
+<li class="mw-empty-elt" data-parsoid='{"stx":"html","autoInsertedEnd":true}'></li><li data-parsoid='{"stx":"html"}'>not a li-hack
+</li>
+</ul>
+
 !!end
 
 !! test
@@ -9896,9 +9922,9 @@ Parsoid: Test of whitespace serialization with Templated bullets
 parsoid
 !! wikitext
 * {{bullet}}
-!! html
+!! html/parsoid
 <ul>
-<li> </li><li about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"bullet","href":"./Template:Bullet"},"params":{},"i":0}}]}'> Bar</li>
+<li class="mw-empty-elt"> </li><li about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"bullet","href":"./Template:Bullet"},"params":{},"i":0}}]}'> Bar</li>
 </ul>
 !! end
 
@@ -13206,7 +13232,7 @@ Templates: Wiki Tables: 7. Fosterable <ref>s should get fostered
 <tbody>
 </tbody></table>
 
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text">foo</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text">foo</span></li></ol>
 !!end
 
 !! test
@@ -14245,6 +14271,20 @@ Image with caption, T55312 #3
 <figure class="mw-default-size mw-halign-right" typeof="mw:Image"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941"/></a><figcaption>Caption page=stuff</figcaption></figure>
 !! end
 
+!! test
+Image caption with pipe entity
+!! wikitext
+[[File:Foobar.jpg|thumb|one &#x7C; two]]
+[[File:Foobar.jpg|thumb|one ''two'' &#x7C; three]]
+!! html/php
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>one &#x7c; two</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>one <i>two</i> &#x7c; three</div></div></div>
+
+!! html/parsoid
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption>one <span typeof="mw:Entity">|</span> two</figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption>one <i>two</i> <span typeof="mw:Entity">|</span> three</figcaption></figure>
+!! end
+
 !! test
 Allow empty links in image captions (T62753)
 !! options
@@ -15565,7 +15605,7 @@ T93580: 1. Templated <ref> inside block images
 !! html/parsoid
 <figure class="mw-default-size" typeof="mw:Image/Thumb" data-parsoid='{"optList":[{"ck":"thumbnail","ak":"thumb"},{"ck":"caption","ak":"Caption with templated ref: {{echo|&lt;ref>foo&lt;/ref>}}"}]}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"25","width":"220"},"sa":{"resource":"File:Foobar.jpg"}}'/></a><figcaption>Caption with templated ref: <span about="#mwt5" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Transclusion  mw:Extension/ref" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;ref>foo&lt;/ref>"}},"i":0}}]}'><a href="./Main_Page#cite_note-1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a></span></figcaption></figure>
 
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
 !! end
 
 !! test
@@ -15577,7 +15617,7 @@ T93580: 2. <ref> inside inline images
 !! html/parsoid
 <p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: &lt;ref>foo&lt;/ref>"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: &lt;span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Extension/ref\" data-parsoid=&#39;{\"dsr\":[64,78,5,6]}&#39; data-mw=&#39;{\"name\":\"ref\",\"body\":{\"id\":\"mw-reference-text-cite_note-1\"},\"attrs\":{}}&#39;>&lt;a href=\"./Main_Page#cite_note-1\" style=\"counter-reset: mw-Ref 1;\" data-parsoid=\"{}\">&lt;span class=\"mw-reflink-text\" data-parsoid=\"{}\">[1]&lt;/span>&lt;/a>&lt;/span>&lt;meta typeof=\"mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=&#39;{\"group\":\"\",\"name\":\"\",\"content\":\"foo\",\"hasRefInRef\":false,\"dsr\":[64,78,5,6]}&#39;/>"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
 
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
 !! end
 
 !! test
@@ -15589,7 +15629,7 @@ T93580: 3. Templated <ref> inside inline images
 !! html/parsoid
 <p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: {{echo|&lt;ref>{{echo|foo}}&lt;/ref>}}"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: &lt;span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Transclusion  mw:Extension/ref\" data-parsoid=&#39;{\"dsr\":[64,96,null,null],\"pi\":[[{\"k\":\"1\"}]]}&#39; data-mw=&#39;{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"&amp;lt;ref>{{echo|foo}}&amp;lt;/ref>\"}},\"i\":0}}]}&#39;>&lt;a href=\"./Main_Page#cite_note-1\" style=\"counter-reset: mw-Ref 1;\" data-parsoid=\"{}\">&lt;span class=\"mw-reflink-text\" data-parsoid=\"{}\">[1]&lt;/span>&lt;/a>&lt;/span>&lt;meta typeof=\"mw:Transclusion mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=&#39;{\"group\":\"\",\"name\":\"\",\"content\":\"foo\",\"hasRefInRef\":false,\"dsr\":[64,96,null,null],\"pi\":[[{\"k\":\"1\"}]]}&#39; data-mw=&#39;{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"&amp;lt;ref>{{echo|foo}}&amp;lt;/ref>\"}},\"i\":0}}]}&#39;/>"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
 
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
 !! end
 
 ###
@@ -18124,7 +18164,7 @@ Parser hook: static parser hook inside a comment
 </p>
 !! html/parsoid
 <!-- <statictag&#x3E;hello, world</statictag&#x3E; -->
-<p typeof="mw:Extension/statictag" data-mw='{"name":"statictag","attrs":{"action":"flush"},"body":null}' data-parsoid='{}' about="#mwt2"></p>
+<p typeof='mw:Extension/statictag' data-mw='{"name":"statictag","attrs":{"action":"flush"},"body":null}' data-parsoid='{}' about='#mwt2'></p>
 !! end
 
 # Nested template calls; this case was broken by Parser.php rev 1.506,
@@ -20910,7 +20950,7 @@ HTML with raw HTML ($wgRawHtml==true)
 wgRawHtml=1
 !! wikitext
 <html><script>alert(1);</script></html>
-!! html
+!! html/php
 <p><script>alert(1);</script>
 </p>
 !! end
@@ -24409,12 +24449,12 @@ Empty LI and TR nodes should not be stripped from top-level content
 !! html/parsoid
 <ul>
 <li> a</li>
-<li></li>
+<li class='mw-empty-elt'></li>
 <li> b</li>
 </ul>
 <table>
 <tbody>
-<tr></tr>
+<tr class='mw-empty-elt'></tr>
 <tr>
 <td>foo</td>
 </tr>
@@ -24428,9 +24468,9 @@ Empty TR nodes should not be stripped if they have any attributes set
 {{EmptyTRWithHTMLAttrTest}}
 !! html/parsoid
 <table about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRWithHTMLAttrTest","href":"./Template:EmptyTRWithHTMLAttrTest"},"params":{},"i":0}}]}'>
-<tr align="center"></tr>
+<tr align='center'></tr>
 <tr><td>foo</td></tr>
-<tr align="center"></tr>
+<tr align='center'></tr>
 <tr><td>bar</td></tr>
 </table>
 !! end
@@ -25716,7 +25756,7 @@ parsoid=html2wt
 '<i>foo</i> <span class="mw-ref" id="cite_ref-1-0" rel="dc:references" typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a href="./Main_Page#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span>
 '<i>foo</i> <div title="name">test</div>
 '<i>foo</i> and <br data-parsoid='{"stx":"html","noClose":true}'/> bar
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'>
 <li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a href="./Main_Page#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">test</span></li>
 </ol>
 !! wikitext
 parsoid=html2wt
 !! html/parsoid
 <p>foo <span about="#mwt2" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a href="./Main_Page#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span></p>
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'>
+<ol class="mw-references references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'>
 <li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text"><i>a</i>
  b</span></li>
 </ol>
@@ -26274,7 +26314,7 @@ RT-ed inter-element separators should be valid separators
 
 !! html/parsoid
 <table>
-<tbody><tr data-parsoid='{"startTagSrc":"|-","a":{"[[foo]]":null},"sa":{"[[foo]]":""},"autoInsertedEnd":true}'></tr>
+<tbody><tr class='mw-empty-elt' data-parsoid='{"startTagSrc":"|-","a":{"[[foo]]":null},"sa":{"[[foo]]":""},"autoInsertedEnd":true}'></tr>
 </tbody></table>
 !!end
 
@@ -26421,7 +26461,7 @@ parsoid
 !! html
 <table>
 <tbody>
-<tr></tr>
+<tr class='mw-empty-elt'></tr>
 <tr about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"<tr><td>foo</td></tr>"}},"i":0}}]}'>
 <td>foo</td></tr>
 </tbody></table>
@@ -26443,7 +26483,7 @@ parsoid
 !! html
 <table>
 <tbody>
-<tr></tr>
+<tr class='mw-empty-elt'></tr>
  <!--c-->
 <tr>
 <!--c--> </tr><!--d-->
@@ -29240,17 +29280,18 @@ unclosed internal link XSS (T137264)
 <p>[[#%3Cscript%3Ealert(1)%3C/script%3E|</p>
 !! end
 
+# Use $wgRawHtml to inject a <style> tag, since you normally can't in wikitext
+# (Parsoid doesn't support $wgRawHtml==true)
 !! test
 Validating that <style> isn't eaten by tidy (T167349)
 !! options
-# Use $wgRawHtml to inject a <style> tag, since you normally can't in wikitext
 wgRawHtml=1
 !! wikitext
 <div class="foo">
 <html><style>.foo::before { content: "<foo>"; }</style></html>
 <html><style data-mw-foobar="baz">.foo::after { content: "<bar>"; }</style></html>
 </div>
-!! html+tidy
+!! html/php+tidy
 <div class="foo">
 <style>.foo::before { content: "<foo>"; }</style>
 <style data-mw-foobar="baz">.foo::after { content: "<bar>"; }</style>
@@ -29307,10 +29348,10 @@ wgFragmentMode=[ 'html5', 'legacy' ]
 <ul>
 <li class="toclevel-1 tocsection-1"><a href="#Foo_bar"><span class="tocnumber">1</span> <span class="toctext">Foo bar</span></a></li>
 <li class="toclevel-1 tocsection-2"><a href="#foo_Bar_2"><span class="tocnumber">2</span> <span class="toctext">foo Bar</span></a></li>
-<li class="toclevel-1 tocsection-3"><a href="#%D0%A2%D0%B5%D1%81%D1%82"><span class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-4"><a href="#%D0%A2%D0%B5%D1%81%D1%82_2"><span class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-5"><a href="#%D1%82%D0%B5%D1%81%D1%82"><span class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
-<li class="toclevel-1 tocsection-6"><a href="#Hey_%3C_%23_%22_%3E_%25_:_%27"><span class="tocnumber">6</span> <span class="toctext">Hey &lt; # " &gt;&#160;%&#160;: '</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Тест"><span class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Тест_2"><span class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#тест"><span class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
+<li class="toclevel-1 tocsection-6"><a href="#Hey_&lt;_#_&quot;_&gt;_%_:_'"><span class="tocnumber">6</span> <span class="toctext">Hey &lt; # " &gt;&#160;%&#160;: '</span></a></li>
 </ul>
 </div>
 
@@ -29320,9 +29361,9 @@ wgFragmentMode=[ 'html5', 'legacy' ]
 <h2><span id=".D0.A2.D0.B5.D1.81.D1.82_2"></span><span class="mw-headline" id="Тест_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
 <h2><span id=".D1.82.D0.B5.D1.81.D1.82"></span><span class="mw-headline" id="тест">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
 <h2><span id="Hey_.3C_.23_.22_.3E_.25_:_.27"></span><span class="mw-headline" id="Hey_&lt;_#_&quot;_&gt;_%_:_'">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
-<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#%D0%A2%D0%B5%D1%81%D1%82">#Тест</a> <a href="#%D1%82%D0%B5%D1%81%D1%82">#тест</a> <a href="#Hey_%3C_%23_%22_%3E_%25_:_%27">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
-</p><p>%F0%9F%92%A9 <span id="%F0%9F%92%A9"></span>
-</p><p><a href="#%E5%95%A4%E9%85%92">#啤酒</a> <a href="#%E5%95%A4%E9%85%92">#啤酒</a>
+<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#Тест">#Тест</a> <a href="#тест">#тест</a> <a href="#Hey_&lt;_#_&quot;_&gt;_%_:_'">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
+</p><p>💩 <span id="💩"></span>
+</p><p><a href="#啤酒">#啤酒</a> <a href="#啤酒">#啤酒</a>
 </p>
 !! end
 
@@ -29401,10 +29442,10 @@ wgFragmentMode=[ 'html5' ]
 <ul>
 <li class="toclevel-1 tocsection-1"><a href="#Foo_bar"><span class="tocnumber">1</span> <span class="toctext">Foo bar</span></a></li>
 <li class="toclevel-1 tocsection-2"><a href="#foo_Bar_2"><span class="tocnumber">2</span> <span class="toctext">foo Bar</span></a></li>
-<li class="toclevel-1 tocsection-3"><a href="#%D0%A2%D0%B5%D1%81%D1%82"><span class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-4"><a href="#%D0%A2%D0%B5%D1%81%D1%82_2"><span class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-5"><a href="#%D1%82%D0%B5%D1%81%D1%82"><span class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
-<li class="toclevel-1 tocsection-6"><a href="#Hey_%3C_%23_%22_%3E_%25_:_%27"><span class="tocnumber">6</span> <span class="toctext">Hey &lt; # " &gt;&#160;%&#160;: '</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Тест"><span class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Тест_2"><span class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#тест"><span class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
+<li class="toclevel-1 tocsection-6"><a href="#Hey_&lt;_#_&quot;_&gt;_%_:_'"><span class="tocnumber">6</span> <span class="toctext">Hey &lt; # " &gt;&#160;%&#160;: '</span></a></li>
 </ul>
 </div>
 
@@ -29414,8 +29455,8 @@ wgFragmentMode=[ 'html5' ]
 <h2><span class="mw-headline" id="Тест_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
 <h2><span class="mw-headline" id="тест">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
 <h2><span class="mw-headline" id="Hey_&lt;_#_&quot;_&gt;_%_:_'">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
-<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#%D0%A2%D0%B5%D1%81%D1%82">#Тест</a> <a href="#%D1%82%D0%B5%D1%81%D1%82">#тест</a> <a href="#Hey_%3C_%23_%22_%3E_%25_:_%27">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
-</p><p>%F0%9F%92%A9 <span id="%F0%9F%92%A9"></span>
-</p><p><a href="#%E5%95%A4%E9%85%92">#啤酒</a> <a href="#%E5%95%A4%E9%85%92">#啤酒</a>
+<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#Тест">#Тест</a> <a href="#тест">#тест</a> <a href="#Hey_&lt;_#_&quot;_&gt;_%_:_'">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
+</p><p>💩 <span id="💩"></span>
+</p><p><a href="#啤酒">#啤酒</a> <a href="#啤酒">#啤酒</a>
 </p>
 !! end
index 91aaff5..f04eec7 100644 (file)
@@ -213,6 +213,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
         *
         * @param Config|null $bootstrapConfig The bootstrap config to use with the new
         *        MediaWikiServices.
+        * @return MediaWikiServices
         */
        protected static function resetGlobalServices( Config $bootstrapConfig = null ) {
                $oldServices = MediaWikiServices::getInstance();
@@ -1591,7 +1592,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
         *
         * @since 1.20
         *
-        * @param array $array
+        * @param array &$array
         */
        protected function objectAssociativeSort( array &$array ) {
                uasort(
@@ -1609,7 +1610,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
         *
         * @since 1.20
         *
-        * @param mixed $r The array to remove string keys from.
+        * @param mixed &$r The array to remove string keys from.
         */
        protected static function stripStringKeys( &$r ) {
                if ( !is_array( $r ) ) {
@@ -1832,6 +1833,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 
        /**
         * Used as a marker to prevent wfResetOutputBuffers from breaking PHPUnit.
+        * @param string $buffer
         * @return string
         */
        public static function wfResetOutputBuffersBarrier( $buffer ) {
index f75cc22..1024ecd 100644 (file)
@@ -17,6 +17,7 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
         * - string 'modules' Pipe-separated list of module names
         * - string|null 'only' "scripts" (unwrapped script), "styles" (stylesheet), or null
         *    (mw.loader.implement).
+        * @param ResourceLoader|null $rl
         * @return ResourceLoaderContext
         */
        protected function getResourceLoaderContext( $options = [], ResourceLoader $rl = null ) {
diff --git a/tests/phpunit/data/templates/recurse.mustache b/tests/phpunit/data/templates/recurse.mustache
new file mode 100644 (file)
index 0000000..391f227
--- /dev/null
@@ -0,0 +1 @@
+r{{#r}}{{>recurse}}{{/r}}
\ No newline at end of file
index b6682f7..a70f136 100644 (file)
@@ -21,7 +21,7 @@ class WfTimestampTest extends MediaWikiTestCase {
                        [ -30281104, TS_MW, '19690115123456', 'Negative TS_UNIX to TS_MW' ],
                        [ $t, TS_UNIX, 979562096, 'TS_UNIX to TS_UNIX' ],
                        [ $t, TS_DB, '2001-01-15 12:34:56', 'TS_UNIX to TS_DB' ],
-                       [ $t + .01, TS_MW, '20010115123456', 'TS_UNIX float to TS_MW' ],
+                       [ $t + 0.01, TS_MW, '20010115123456', 'TS_UNIX float to TS_MW' ],
 
                        [ $t, TS_ISO_8601_BASIC, '20010115T123456Z', 'TS_ISO_8601_BASIC to TS_DB' ],
 
index d506623..350cb70 100644 (file)
@@ -432,7 +432,6 @@ class SanitizerTest extends MediaWikiTestCase {
         * @covers Sanitizer::escapeIdForLink()
         * @covers Sanitizer::escapeIdForExternalInterwiki()
         * @covers Sanitizer::escapeIdInternal()
-        * @covers Sanitizer::urlEscapeId()
         *
         * @param string $stuff
         * @param string[] $config
@@ -456,7 +455,6 @@ class SanitizerTest extends MediaWikiTestCase {
                $text = 'foo тест_#%!\'()[]:<>';
                $legacyEncoded = 'foo_.D1.82.D0.B5.D1.81.D1.82_.23.25.21.27.28.29.5B.5D:.3C.3E';
                $html5Encoded = 'foo_тест_#%!\'()[]:<>';
-               $html5Escaped = 'foo_%D1%82%D0%B5%D1%81%D1%82_%23%25%21%27%28%29%5B%5D:%3C%3E';
                $html5Experimental = 'foo_тест_!_()[]:<>';
 
                // Settings: last element is $wgExternalInterwikiFragmentMode, the rest is $wgFragmentMode
@@ -484,20 +482,20 @@ class SanitizerTest extends MediaWikiTestCase {
                        // New world: HTML5 links, legacy fallbacks
                        [ 'Attribute', $newLegacy, $text, $html5Encoded, Sanitizer::ID_PRIMARY ],
                        [ 'Attribute', $newLegacy, $text, $legacyEncoded, Sanitizer::ID_FALLBACK ],
-                       [ 'Link', $newLegacy, $text, $html5Escaped ],
+                       [ 'Link', $newLegacy, $text, $html5Encoded ],
                        [ 'ExternalInterwiki', $newLegacy, $text, $legacyEncoded ],
 
                        // Distant future: no legacy fallbacks, but still linking to leagacy wikis
                        [ 'Attribute', $new, $text, $html5Encoded, Sanitizer::ID_PRIMARY ],
                        [ 'Attribute', $new, $text, false, Sanitizer::ID_FALLBACK ],
-                       [ 'Link', $new, $text, $html5Escaped ],
+                       [ 'Link', $new, $text, $html5Encoded ],
                        [ 'ExternalInterwiki', $new, $text, $legacyEncoded ],
 
                        // Just before the heat death of universe: external interwikis are also HTML5 \m/
                        [ 'Attribute', $allNew, $text, $html5Encoded, Sanitizer::ID_PRIMARY ],
                        [ 'Attribute', $allNew, $text, false, Sanitizer::ID_FALLBACK ],
-                       [ 'Link', $allNew, $text, $html5Escaped ],
-                       [ 'ExternalInterwiki', $allNew, $text, $html5Escaped ],
+                       [ 'Link', $allNew, $text, $html5Encoded ],
+                       [ 'ExternalInterwiki', $allNew, $text, $html5Encoded ],
 
                        // Someone flipped $wgExperimentalHtmlIds on
                        [ 'Attribute', $experimentalLegacy, $text, $html5Experimental, Sanitizer::ID_PRIMARY ],
@@ -508,7 +506,7 @@ class SanitizerTest extends MediaWikiTestCase {
                        // Migration from $wgExperimentalHtmlIds to modern HTML5
                        [ 'Attribute', $newExperimental, $text, $html5Encoded, Sanitizer::ID_PRIMARY ],
                        [ 'Attribute', $newExperimental, $text, $html5Experimental, Sanitizer::ID_FALLBACK ],
-                       [ 'Link', $newExperimental, $text, $html5Escaped ],
+                       [ 'Link', $newExperimental, $text, $html5Encoded ],
                        [ 'ExternalInterwiki', $newExperimental, $text, $legacyEncoded ],
                ];
        }
index 2bd9086..c161f85 100644 (file)
@@ -109,4 +109,17 @@ class TemplateParserTest extends MediaWikiTestCase {
                        ],
                ];
        }
+
+       public function testEnableRecursivePartials() {
+               $tp = new TemplateParser( $this->templateDir );
+               $data = [ 'r' => [ 'r' => [ 'r' => [] ] ] ];
+
+               $tp->enableRecursivePartials( true );
+               $this->assertEquals( 'rrr', $tp->processTemplate( 'recurse', $data ) );
+
+               $tp->enableRecursivePartials( false );
+               $this->setExpectedException( 'Exception' );
+               $tp->processTemplate( 'recurse', $data );
+       }
+
 }
index 6c059ec..25b754d 100644 (file)
@@ -403,12 +403,15 @@ class XmlTest extends MediaWikiTestCase {
         */
        public function testListDropDown() {
                $this->assertEquals(
-                       '<select id="test-name" name="test-name" class="test-css" tabindex="2">' . "\n" .
-                               '<option value="other">other reasons</option>' .
-                               '<optgroup label="Foo"><option value="Foo 1">Foo 1</option>' .
-                               '<option value="Example" selected="">Example</option>' .
-                               '</optgroup><optgroup label="Bar">' .
-                               '<option value="Bar 1">Bar 1</option></optgroup>' . "\n" .
+                       '<select name="test-name" id="test-name" class="test-css" tabindex="2">' .
+                               '<option value="other">other reasons</option>' . "\n" .
+                               '<optgroup label="Foo">' .
+                               '<option value="Foo 1">Foo 1</option>' . "\n" .
+                               '<option value="Example" selected="">Example</option>' . "\n" .
+                               '</optgroup>' . "\n" .
+                               '<optgroup label="Bar">' .
+                               '<option value="Bar 1">Bar 1</option>' . "\n" .
+                               '</optgroup>' .
                                '</select>',
                        Xml::listDropDown(
                                // name
@@ -426,4 +429,52 @@ class XmlTest extends MediaWikiTestCase {
                        )
                );
        }
+
+       /**
+        * @covers Xml::listDropDownOptions
+        */
+       public function testListDropDownOptions() {
+               $this->assertEquals(
+                       [
+                               'other reasons' => 'other',
+                               'Foo' => [
+                                       'Foo 1' => 'Foo 1',
+                                       'Example' => 'Example',
+                               ],
+                               'Bar' => [
+                                       'Bar 1' => 'Bar 1',
+                               ],
+                       ],
+                       Xml::listDropDownOptions(
+                               "* Foo\n** Foo 1\n** Example\n* Bar\n** Bar 1",
+                               [ 'other' => 'other reasons' ]
+                       )
+               );
+       }
+
+       /**
+        * @covers Xml::listDropDownOptionsOoui
+        */
+       public function testListDropDownOptionsOoui() {
+               $this->assertEquals(
+                       [
+                               [ 'data' => 'other', 'label' => 'other reasons' ],
+                               [ 'optgroup' => 'Foo' ],
+                               [ 'data' => 'Foo 1', 'label' => 'Foo 1' ],
+                               [ 'data' => 'Example', 'label' => 'Example' ],
+                               [ 'optgroup' => 'Bar' ],
+                               [ 'data' => 'Bar 1', 'label' => 'Bar 1' ],
+                       ],
+                       Xml::listDropDownOptionsOoui( [
+                               'other reasons' => 'other',
+                               'Foo' => [
+                                       'Foo 1' => 'Foo 1',
+                                       'Example' => 'Example',
+                               ],
+                               'Bar' => [
+                                       'Bar 1' => 'Bar 1',
+                               ],
+                       ] )
+               );
+       }
 }
index 9ed8f15..d19d998 100644 (file)
@@ -53,6 +53,7 @@ class DatabaseTestHelper extends Database {
        /**
         * Returns SQL queries grouped by '; '
         * Clear the list of queries that have been done so far.
+        * @return string
         */
        public function getLastSqls() {
                $lastSqls = implode( '; ', $this->lastSqls );
index 881ace2..c762aa7 100644 (file)
@@ -1184,11 +1184,11 @@ class WANObjectCacheTest extends PHPUnit_Framework_TestCase {
 
        public static function provideAdaptiveTTL() {
                return [
-                       [ 3600, 900, 30, .2, 720 ],
-                       [ 3600, 500, 30, .2, 500 ],
-                       [ 3600, 86400, 800, .2, 800 ],
-                       [ false, 86400, 800, .2, 800 ],
-                       [ null, 86400, 800, .2, 800 ]
+                       [ 3600, 900, 30, 0.2, 720 ],
+                       [ 3600, 500, 30, 0.2, 500 ],
+                       [ 3600, 86400, 800, 0.2, 800 ],
+                       [ false, 86400, 800, 0.2, 800 ],
+                       [ null, 86400, 800, 0.2, 800 ]
                ];
        }
 
index cb18fb3..b6ea426 100644 (file)
@@ -112,10 +112,10 @@ class TransactionProfilerTest extends PHPUnit_Framework_TestCase {
                $tp->setLogger( $logger );
                $tp->setExpectation( 'queries', 2, __METHOD__ );
 
-               $tp->recordQueryCompletion( "SQL 1", microtime( true ) - .01, false, 0 );
-               $tp->recordQueryCompletion( "SQL 2", microtime( true ) - .01, false, 0 );
-               $tp->recordQueryCompletion( "SQL 3", microtime( true ) - .01, false, 0 ); // warn
-               $tp->recordQueryCompletion( "SQL 4", microtime( true ) - .01, false, 0 ); // warn
+               $tp->recordQueryCompletion( "SQL 1", microtime( true ) - 0.01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 2", microtime( true ) - 0.01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 3", microtime( true ) - 0.01, false, 0 ); // warn
+               $tp->recordQueryCompletion( "SQL 4", microtime( true ) - 0.01, false, 0 ); // warn
        }
 
        public function testWriteQueryCount() {
@@ -126,16 +126,16 @@ class TransactionProfilerTest extends PHPUnit_Framework_TestCase {
                $tp->setLogger( $logger );
                $tp->setExpectation( 'writes', 2, __METHOD__ );
 
-               $tp->recordQueryCompletion( "SQL 1", microtime( true ) - .01, false, 0 );
-               $tp->recordQueryCompletion( "SQL 2", microtime( true ) - .01, false, 0 );
-               $tp->recordQueryCompletion( "SQL 3", microtime( true ) - .01, false, 0 );
-               $tp->recordQueryCompletion( "SQL 4", microtime( true ) - .01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 1", microtime( true ) - 0.01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 2", microtime( true ) - 0.01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 3", microtime( true ) - 0.01, false, 0 );
+               $tp->recordQueryCompletion( "SQL 4", microtime( true ) - 0.01, false, 0 );
 
                $tp->transactionWritingIn( 'srv1', 'db1', '123' );
-               $tp->recordQueryCompletion( "SQL 1w", microtime( true ) - .01, true, 2 );
-               $tp->recordQueryCompletion( "SQL 2w", microtime( true ) - .01, true, 5 );
-               $tp->recordQueryCompletion( "SQL 3w", microtime( true ) - .01, true, 3 );
-               $tp->recordQueryCompletion( "SQL 4w", microtime( true ) - .01, true, 1 );
+               $tp->recordQueryCompletion( "SQL 1w", microtime( true ) - 0.01, true, 2 );
+               $tp->recordQueryCompletion( "SQL 2w", microtime( true ) - 0.01, true, 5 );
+               $tp->recordQueryCompletion( "SQL 3w", microtime( true ) - 0.01, true, 3 );
+               $tp->recordQueryCompletion( "SQL 4w", microtime( true ) - 0.01, true, 1 );
                $tp->transactionWritingOut( 'srv1', 'db1', '123', 1, 1 );
        }
 }
index b564310..456447f 100644 (file)
@@ -352,8 +352,8 @@ class DatabaseMysqlBaseTest extends PHPUnit_Framework_TestCase {
                $db->setLBInfo( 'clusterMasterHost', 'db1052' );
                $lagEst = $db->getLag();
 
-               $this->assertGreaterThan( $lag - .010, $lagEst, "Correct heatbeat lag" );
-               $this->assertLessThan( $lag + .010, $lagEst, "Correct heatbeat lag" );
+               $this->assertGreaterThan( $lag - 0.010, $lagEst, "Correct heatbeat lag" );
+               $this->assertLessThan( $lag + 0.010, $lagEst, "Correct heatbeat lag" );
        }
 
        public static function provideLagAmounts() {
index 2f7b767..e7cfca7 100644 (file)
@@ -15,7 +15,7 @@ class SpecialPageExecutor {
         * @param User|null $user The user which should be used in the context of this special page
         *
         * @throws Exception
-        * @return array( string, WebResponse ) A two-elements array containing the HTML output
+        * @return array [ string, WebResponse ] A two-elements array containing the HTML output
         * generated by the special page as well as the response object.
         */
        public function executeSpecialPage(
index 2f091d5..930bbe4 100644 (file)
@@ -51,7 +51,7 @@ abstract class SpecialPageTestBase extends MediaWikiTestCase {
         * @param User|null $user The user which should be used in the context of this special page
         *
         * @throws Exception
-        * @return array( string, WebResponse ) A two-elements array containing the HTML output
+        * @return array [ string, WebResponse ] A two-elements array containing the HTML output
         * generated by the special page as well as the response object.
         */
        protected function executeSpecialPage(
index d712254..6b9b782 100644 (file)
@@ -34,6 +34,7 @@ class DummyContentHandlerForTesting extends ContentHandler {
 
        /**
         * Creates an empty Content object of the type supported by this ContentHandler.
+        * @return DummyContentForTesting
         */
        public function makeEmptyContent() {
                return new DummyContentForTesting( '' );
index 098181d..9d91d4a 100644 (file)
@@ -34,6 +34,7 @@ class DummyNonTextContentHandler extends DummyContentHandlerForTesting {
 
        /**
         * Creates an empty Content object of the type supported by this ContentHandler.
+        * @return DummyNonTextContent
         */
        public function makeEmptyContent() {
                return new DummyNonTextContent( '' );
index 047c03a..ef1caa5 100644 (file)
@@ -41,6 +41,7 @@ class MockFSFile extends FSFile {
        /**
         * August 22 – The theft of the Mona Lisa is discovered in the Louvre."
         * T22281
+        * @return int
         */
        public function getSize() {
                return 1911;
index b965079..5ce61ea 100644 (file)
@@ -1,7 +1,7 @@
 ( function ( mw, $ ) {
        'use strict';
 
-       var grammarTests;
+       var grammarTests, bcp47Tests;
 
        QUnit.module( 'mediawiki.language', QUnit.newMwEnvironment( {
                setup: function () {
                assert.equal( mw.language.listToText( [ 'a', 'b' ] ), 'a and b', 'Two items' );
                assert.equal( mw.language.listToText( [ 'a', 'b', 'c' ] ), 'a, b and c', 'More than two items' );
        } );
+
+       bcp47Tests = [
+               // Extracted from BCP 47 (list not exhaustive)
+               // # 2.1.1
+               [ 'en-ca-x-ca', 'en-CA-x-ca' ],
+               [ 'sgn-be-fr', 'sgn-BE-FR' ],
+               [ 'az-latn-x-latn', 'az-Latn-x-latn' ],
+               // # 2.2
+               [ 'sr-Latn-RS', 'sr-Latn-RS' ],
+               [ 'az-arab-ir', 'az-Arab-IR' ],
+
+               // # 2.2.5
+               [ 'sl-nedis', 'sl-nedis' ],
+               [ 'de-ch-1996', 'de-CH-1996' ],
+
+               // # 2.2.6
+               [
+                       'en-latn-gb-boont-r-extended-sequence-x-private',
+                       'en-Latn-GB-boont-r-extended-sequence-x-private'
+               ],
+
+               // Examples from BCP 47 Appendix A
+               // # Simple language subtag:
+               [ 'DE', 'de' ],
+               [ 'fR', 'fr' ],
+               [ 'ja', 'ja' ],
+
+               // # Language subtag plus script subtag:
+               [ 'zh-hans', 'zh-Hans' ],
+               [ 'sr-cyrl', 'sr-Cyrl' ],
+               [ 'sr-latn', 'sr-Latn' ],
+
+               // # Extended language subtags and their primary language subtag
+               // # counterparts:
+               [ 'zh-cmn-hans-cn', 'zh-cmn-Hans-CN' ],
+               [ 'cmn-hans-cn', 'cmn-Hans-CN' ],
+               [ 'zh-yue-hk', 'zh-yue-HK' ],
+               [ 'yue-hk', 'yue-HK' ],
+
+               // # Language-Script-Region:
+               [ 'zh-hans-cn', 'zh-Hans-CN' ],
+               [ 'sr-latn-RS', 'sr-Latn-RS' ],
+
+               // # Language-Variant:
+               [ 'sl-rozaj', 'sl-rozaj' ],
+               [ 'sl-rozaj-biske', 'sl-rozaj-biske' ],
+               [ 'sl-nedis', 'sl-nedis' ],
+
+               // # Language-Region-Variant:
+               [ 'de-ch-1901', 'de-CH-1901' ],
+               [ 'sl-it-nedis', 'sl-IT-nedis' ],
+
+               // # Language-Script-Region-Variant:
+               [ 'hy-latn-it-arevela', 'hy-Latn-IT-arevela' ],
+
+               // # Language-Region:
+               [ 'de-de', 'de-DE' ],
+               [ 'en-us', 'en-US' ],
+               [ 'es-419', 'es-419' ],
+
+               // # Private use subtags:
+               [ 'de-ch-x-phonebk', 'de-CH-x-phonebk' ],
+               [ 'az-arab-x-aze-derbend', 'az-Arab-x-aze-derbend' ],
+               /**
+                * Previous test does not reflect the BCP 47 which states:
+                *  az-Arab-x-AZE-derbend
+                * AZE being private, it should be lower case, hence the test above
+                * should probably be:
+                * [ 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ],
+                */
+
+               // # Private use registry values:
+               [ 'x-whatever', 'x-whatever' ],
+               [ 'qaa-qaaa-qm-x-southern', 'qaa-Qaaa-QM-x-southern' ],
+               [ 'de-qaaa', 'de-Qaaa' ],
+               [ 'sr-latn-qm', 'sr-Latn-QM' ],
+               [ 'sr-qaaa-rs', 'sr-Qaaa-RS' ],
+
+               // # Tags that use extensions
+               [ 'en-us-u-islamcal', 'en-US-u-islamcal' ],
+               [ 'zh-cn-a-myext-x-private', 'zh-CN-a-myext-x-private' ],
+               [ 'en-a-myext-b-another', 'en-a-myext-b-another' ]
+
+               // # Invalid:
+               // de-419-DE
+               // a-DE
+               // ar-a-aaa-b-bbb-a-ccc
+       ];
+
+       QUnit.test( 'mw.language.bcp47', function ( assert ) {
+               bcp47Tests.forEach( function ( data ) {
+                       var input = data[ 0 ],
+                               expected = data[ 1 ];
+                       assert.equal( mw.language.bcp47( input ), expected );
+               } );
+       } );
 }( mediaWiki, jQuery ) );
index 2efe9cd..bb27626 100644 (file)
                // Test cases are kept in sync with SanitizerTest.php
                var text = 'foo тест_#%!\'()[]:<>',
                        legacyEncoded = 'foo_.D1.82.D0.B5.D1.81.D1.82_.23.25.21.27.28.29.5B.5D:.3C.3E',
-                       html5Escaped = 'foo_%D1%82%D0%B5%D1%81%D1%82_%23%25!\'()%5B%5D:%3C%3E',
+                       html5Encoded = 'foo_тест_#%!\'()[]:<>',
                        html5Experimental = 'foo_тест_!_()[]:<>',
                        // Settings: this is wgFragmentMode
                        legacy = [ 'legacy' ],
                        // Transition to a new world: legacy links with HTML5 fallback
                        [ legacyNew, text, legacyEncoded ],
                        // New world: HTML5 links, legacy fallbacks
-                       [ newLegacy, text, html5Escaped ],
+                       [ newLegacy, text, html5Encoded ],
                        // Distant future: no legacy fallbacks
-                       [ allNew, text, html5Escaped ],
+                       [ allNew, text, html5Encoded ],
                        // Someone flipped wgExperimentalHtmlIds on
                        [ experimentalLegacy, text, html5Experimental ],
                        // Migration from wgExperimentalHtmlIds to modern HTML5
-                       [ newExperimental, text, html5Escaped ]
+                       [ newExperimental, text, html5Encoded ]
                ], function ( index, testCase ) {
                        mw.config.set( 'wgFragmentMode', testCase[ 0 ] );