WikidataBuilder has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315485

Change subject: New Wikidata Build - 2016-10-12T10:00:01+0000
......................................................................

New Wikidata Build - 2016-10-12T10:00:01+0000

Change-Id: Id15932bc2eb4148c925a31545a10f25383fa4609
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/pl.json
M extensions/Wikibase/client/i18n/mhr.json
M extensions/Wikibase/client/i18n/myv.json
M extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
M 
extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/includes/Diff/EntityContentDiffView.php
M extensions/Wikibase/tests/browser/ci.yml
M vendor/composer/installed.json
14 files changed, 46 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/85/315485/1

diff --git a/composer.lock b/composer.lock
index 4fbe5b6..63c2d18 100644
--- a/composer.lock
+++ b/composer.lock
@@ -788,12 +788,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
-                "reference": "cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5"
+                "reference": "19a73e13220453c4ba9d012b3515e9e36b36297c"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5";,
-                "reference": "cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/19a73e13220453c4ba9d012b3515e9e36b36297c";,
+                "reference": "19a73e13220453c4ba9d012b3515e9e36b36297c",
                 "shasum": ""
             },
             "require-dev": {
@@ -818,7 +818,7 @@
             ],
             "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
             "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
-            "time": "2016-10-10 20:24:47"
+            "time": "2016-10-11 20:40:30"
         },
         {
             "name": "propertysuggester/property-suggester",
@@ -1574,12 +1574,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "c246251d83a2691fde1752b92392d670db556e90"
+                "reference": "5fcda5a30ad7b1cd139a49efde3da88199cf7ae7"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c246251d83a2691fde1752b92392d670db556e90";,
-                "reference": "c246251d83a2691fde1752b92392d670db556e90",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5fcda5a30ad7b1cd139a49efde3da88199cf7ae7";,
+                "reference": "5fcda5a30ad7b1cd139a49efde3da88199cf7ae7",
                 "shasum": ""
             },
             "require": {
@@ -1653,7 +1653,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2016-10-10 20:29:43"
+            "time": "2016-10-12 08:23:19"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/i18n/pl.json 
b/extensions/ArticlePlaceholder/i18n/pl.json
index a95d6f1..b088d10 100644
--- a/extensions/ArticlePlaceholder/i18n/pl.json
+++ b/extensions/ArticlePlaceholder/i18n/pl.json
@@ -7,7 +7,9 @@
        "createtopicpage": "Utwórz stronę",
        "articleplaceholder-abouttopic-create-article-label": "Tytuł artykułu",
        "articleplaceholder-abouttopic-create-article-button": "Utwórz artykuł",
+       "articleplaceholder-abouttopic-create-article-submit-button": "Wyślij",
        "articleplaceholder-abouttopic-lua-identifier": "Źródła zewnętrzne",
+       "articleplaceholder-createpage-title": "Tworzenie $1",
        "articleplaceholder-createpage-alreadyexists": "Strona o tytule $1 już 
istnieje. Proszę wybrać inny tytuł.",
        "articleplaceholder-createpage-notitleprovided": "Tytuł nie został 
wpisany. Wpisz tytuł strony, którą chcesz utworzyć.",
        "articleplaceholder-createpage-invalidtitleprovided": "Tytuł jest 
nieprawidłowy. Podaj prawidłowy tytuł."
diff --git a/extensions/Wikibase/client/i18n/mhr.json 
b/extensions/Wikibase/client/i18n/mhr.json
index 395b94c..eaed7ad 100644
--- a/extensions/Wikibase/client/i18n/mhr.json
+++ b/extensions/Wikibase/client/i18n/mhr.json
@@ -1,9 +1,11 @@
 {
        "@metadata": {
                "authors": [
-                       "Сай"
+                       "Сай",
+                       "Санюн Вадик"
                ]
        },
        "wikibase-editlinks": "Кылверым тӧрлаташ",
+       "wikibase-editlinkstitle": "Править межъязыковые ссылки",
        "wikibase-rc-hide-wikidata-show": "ончыкташ"
 }
diff --git a/extensions/Wikibase/client/i18n/myv.json 
b/extensions/Wikibase/client/i18n/myv.json
index d46206e..8e3bd8a 100644
--- a/extensions/Wikibase/client/i18n/myv.json
+++ b/extensions/Wikibase/client/i18n/myv.json
@@ -1,9 +1,12 @@
 {
        "@metadata": {
                "authors": [
-                       "Botuzhaleny-sodamo"
+                       "Botuzhaleny-sodamo",
+                       "Rueter"
                ]
        },
+       "wikibase-editlinks": "Витнемс-петнемс сюлмавома петнень",
+       "wikibase-editlinkstitle": "Витнемс-петнемс кельютконь сюлмавома 
петнень",
        "wikibase-rc-hide-wikidata-hide": "Кекшемс",
        "wikibase-rc-hide-wikidata-show": "Невтемс"
 }
diff --git a/extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php 
b/extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
index 3623d20..4866e0b 100644
--- a/extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
+++ b/extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Client\Api;
 
 use ApiBase;
+use ApiPageSet;
 use ApiQuery;
 use ApiQueryGeneratorBase;
 use ApiResult;
@@ -78,13 +79,17 @@
         * @param array $prop
         * @param ApiPageSet|null $resultPageSet
         */
-       private function formatResult( ResultWrapper $res, $limit,
-               array $prop, ApiPageSet $resultPageSet = null
+       private function formatResult(
+               ResultWrapper $res,
+               $limit,
+               array $prop,
+               ApiPageSet $resultPageSet = null
        ) {
                $currentPageId = null;
                $entry = [];
                $count = 0;
                $result = $this->getResult();
+               $prRow = null;
 
                foreach ( $res as $row ) {
                        if ( ++$count > $limit ) {
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
 
b/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
index ddb7dd0..e8f97a9 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
@@ -57,12 +57,16 @@
        }
 
        /**
+        * This returns a SnakFormatter that will return wikitext escaped plain 
text.
+        * The only exception are URLs, these are plain text, but not escaped 
in any
+        * way.
+        *
         * @param Language $language
         * @param UsageAccumulator $usageAccumulator
         *
         * @return SnakFormatter
         */
-       public function newSnakFormatterForLanguage(
+       public function newEscapedPlainTextSnakFormatter(
                Language $language,
                UsageAccumulator $usageAccumulator
        ) {
@@ -76,7 +80,7 @@
                        SnakFormatter::OPT_LANG => $language->getCode(),
                ] );
 
-               $snakFormatter = $this->getSnakFormatterForOptions( $options );
+               $snakFormatter = $this->getPlainTextSnakFormatterForOptions( 
$options );
 
                return new UsageTrackingSnakFormatter(
                        $snakFormatter,
@@ -92,7 +96,7 @@
         * @param FormatterOptions $options
         * @return BinaryOptionDispatchingSnakFormatter
         */
-       private function getSnakFormatterForOptions( FormatterOptions $options 
) {
+       private function getPlainTextSnakFormatterForOptions( FormatterOptions 
$options ) {
                $plainTextSnakFormatter = 
$this->snakFormatterFactory->getSnakFormatter(
                        SnakFormatter::FORMAT_PLAIN,
                        $options
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
 
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
index a1adbb9..3e5f53b 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
@@ -109,7 +109,7 @@
                        $language,
                        $this->propertyIdResolver,
                        $this->snaksFinder,
-                       
$this->dataAccessSnakFormatterFactory->newSnakFormatterForLanguage( $language, 
$usageAccumulator ),
+                       
$this->dataAccessSnakFormatterFactory->newEscapedPlainTextSnakFormatter( 
$language, $usageAccumulator ),
                        $this->entityLookup
                );
 
diff --git 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 92117df..235f958 100644
--- 
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++ 
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -41,7 +41,7 @@
 
                $wikibaseClient = WikibaseClient::getDefaultInstance();
                $snakFormatterFactory = 
$wikibaseClient->getDataAccessSnakFormatterFactory();
-               $snakFormatter = 
$snakFormatterFactory->newSnakFormatterForLanguage(
+               $snakFormatter = 
$snakFormatterFactory->newEscapedPlainTextSnakFormatter(
                        $lang,
                        $this->getUsageAccumulator()
                );
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
index 973645d..c1792aa 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
@@ -68,7 +68,7 @@
 
        public function testNewSnakFormatterForLanguage() {
                $factory = $this->getDataAccessSnakFormatterFactory();
-               $snakFormatter = $factory->newSnakFormatterForLanguage(
+               $snakFormatter = $factory->newEscapedPlainTextSnakFormatter(
                        Language::factory( 'fr' ),
                        $this->getMock( UsageAccumulator::class )
                );
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
index bcec5b3..26c7cb5 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
@@ -91,7 +91,7 @@
        public function testOutput( $expected, $snak ) {
                // This is an integration test, use the global factory
                $factory = 
WikibaseClient::getDefaultInstance()->getDataAccessSnakFormatterFactory();
-               $formatter = $factory->newSnakFormatterForLanguage(
+               $formatter = $factory->newEscapedPlainTextSnakFormatter(
                        Language::factory( 'en' ),
                        $this->getMock( UsageAccumulator::class )
                );
diff --git a/extensions/Wikibase/repo/i18n/pl.json 
b/extensions/Wikibase/repo/i18n/pl.json
index c60ceaa..9e352ef 100644
--- a/extensions/Wikibase/repo/i18n/pl.json
+++ b/extensions/Wikibase/repo/i18n/pl.json
@@ -311,6 +311,7 @@
        "wikibase-pageinfo-subscription-none": "Brak",
        "apihelp-wbcreateclaim-description": "Tworzy stwierdzenia Wikibase.",
        "apihelp-wbcreateclaim-param-snaktype": "Typ łącznika",
+       "apihelp-wbeditentity-example-12": "Usuwa etykietę",
        "apihelp-wbformatvalue-description": "Formaty DataValues.",
        "apihelp-wbmergeitems-description": "Łączy wiele elementów.",
        "apihelp-wbremoveclaims-description": "Usuwa stwierdzenia Wikibase.",
diff --git a/extensions/Wikibase/repo/includes/Diff/EntityContentDiffView.php 
b/extensions/Wikibase/repo/includes/Diff/EntityContentDiffView.php
index fdaf676..272be7a 100644
--- a/extensions/Wikibase/repo/includes/Diff/EntityContentDiffView.php
+++ b/extensions/Wikibase/repo/includes/Diff/EntityContentDiffView.php
@@ -227,7 +227,7 @@
        protected function getDiffBodyCacheKey() {
                return wfMemcKey(
                        'diff',
-                       'version', MW_DIFF_VERSION,
+                       'version', self::DIFF_VERSION,
                        'oldid', $this->getOldid(),
                        'newid', $this->getNewid(),
                        'lang', $this->getLanguage()->getCode()
diff --git a/extensions/Wikibase/tests/browser/ci.yml 
b/extensions/Wikibase/tests/browser/ci.yml
index 0902f17..5fa93ad 100644
--- a/extensions/Wikibase/tests/browser/ci.yml
+++ b/extensions/Wikibase/tests/browser/ci.yml
@@ -1,5 +1,5 @@
 BROWSER:
-  - firefox
+  - chrome
 
 MEDIAWIKI_ENVIRONMENT:
   - beta
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 612ffb8..7da302e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -115,19 +115,19 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
-            "reference": "cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5"
+            "reference": "19a73e13220453c4ba9d012b3515e9e36b36297c"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5";,
-            "reference": "cdd7c8821fe4bcb7a9cd09f5f3d8766b609d94c5",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/19a73e13220453c4ba9d012b3515e9e36b36297c";,
+            "reference": "19a73e13220453c4ba9d012b3515e9e36b36297c",
             "shasum": ""
         },
         "require-dev": {
             "jakub-onderka/php-parallel-lint": "0.9.2",
             "mediawiki/mediawiki-codesniffer": "0.7.2"
         },
-        "time": "2016-10-10 20:24:47",
+        "time": "2016-10-11 20:40:30",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {
@@ -1348,12 +1348,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "c246251d83a2691fde1752b92392d670db556e90"
+            "reference": "5fcda5a30ad7b1cd139a49efde3da88199cf7ae7"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c246251d83a2691fde1752b92392d670db556e90";,
-            "reference": "c246251d83a2691fde1752b92392d670db556e90",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5fcda5a30ad7b1cd139a49efde3da88199cf7ae7";,
+            "reference": "5fcda5a30ad7b1cd139a49efde3da88199cf7ae7",
             "shasum": ""
         },
         "require": {
@@ -1386,7 +1386,7 @@
             "jakub-onderka/php-parallel-lint": "0.9.2",
             "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
         },
-        "time": "2016-10-10 20:29:43",
+        "time": "2016-10-12 08:23:19",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {

-- 
To view, visit https://gerrit.wikimedia.org/r/315485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id15932bc2eb4148c925a31545a10f25383fa4609
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to