WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-12-04T15:18:48+0000
......................................................................

New Wikidata Build - 2015-12-04T15:18:48+0000

Change-Id: Ife85c30d3ac9b710fb082a0c096c0220e60a8f46
---
M composer.lock
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/Wikibase/client/includes/recentchanges/ExternalChangeFactory.php
M extensions/Wikibase/lib/includes/MessageException.php
M extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php
M extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
M 
extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M extensions/Wikibase/repo/includes/api/ModifyEntity.php
M extensions/Wikibase/repo/includes/api/QuerySearchEntities.php
M extensions/Wikibase/repo/includes/api/SearchEntities.php
M extensions/Wikibase/repo/includes/content/DeferredDecodingEntityHolder.php
M extensions/Wikibase/repo/includes/content/EntityHandler.php
M extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
M extensions/Wikibase/repo/tests/phpunit/MockEntityPerPage.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/EntityModificationTestHelper.php
M 
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.removetoolbar.js
M 
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
M 
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
M extensions/Wikibase/view/resources/templates.php
M 
extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
M vendor/composer/installed.json
21 files changed, 66 insertions(+), 62 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index c70c711..451f025 100644
--- a/composer.lock
+++ b/composer.lock
@@ -919,7 +919,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-                "reference": "72d071b8aab170b407ef708d28e61f376cb027ad"
+                "reference": "f20c24b0d30d1ad03f10241fd456a583d812d044"
             },
             "require": {
                 "php": ">=5.3.0",
@@ -965,7 +965,7 @@
             "support": {
                 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/";
             },
-            "time": "2015-11-29 11:36:41"
+            "time": "2015-12-04 13:24:30"
         },
         {
             "name": "wikibase/data-model",
@@ -1448,12 +1448,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "ca3adea230578cb5d859cf02c5d75be2fa84ea87"
+                "reference": "68d3d086acba76fb294d3f6cd5ad9950da415cfa"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ca3adea230578cb5d859cf02c5d75be2fa84ea87";,
-                "reference": "ca3adea230578cb5d859cf02c5d75be2fa84ea87",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/68d3d086acba76fb294d3f6cd5ad9950da415cfa";,
+                "reference": "68d3d086acba76fb294d3f6cd5ad9950da415cfa",
                 "shasum": ""
             },
             "require": {
@@ -1523,7 +1523,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2015-12-04 09:18:36"
+            "time": "2015-12-04 13:57:23"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/specials/SpecialConstraintReport.php 
b/extensions/Constraints/specials/SpecialConstraintReport.php
index 08a700f..6495c54 100644
--- a/extensions/Constraints/specials/SpecialConstraintReport.php
+++ b/extensions/Constraints/specials/SpecialConstraintReport.php
@@ -55,9 +55,10 @@
        /**
         * Id of the property, that is used to specify constraints on entities.
         *
+        * TODO set, when properties are created
+        *
         * @var int
         */
-       // TODO set, when properties are created
        const CONSTRAINT_PROPERTY_ID = 'P1';
 
        /**
diff --git 
a/extensions/Wikibase/client/includes/recentchanges/ExternalChangeFactory.php 
b/extensions/Wikibase/client/includes/recentchanges/ExternalChangeFactory.php
index ccc5f18..8432179 100644
--- 
a/extensions/Wikibase/client/includes/recentchanges/ExternalChangeFactory.php
+++ 
b/extensions/Wikibase/client/includes/recentchanges/ExternalChangeFactory.php
@@ -92,7 +92,7 @@
        }
 
        /**
-        * @param array Content of rc_params
+        * @param array $rc_params
         *
         * @throws UnexpectedValueException
         * @return array
diff --git a/extensions/Wikibase/lib/includes/MessageException.php 
b/extensions/Wikibase/lib/includes/MessageException.php
index abd5d54..e6308de 100644
--- a/extensions/Wikibase/lib/includes/MessageException.php
+++ b/extensions/Wikibase/lib/includes/MessageException.php
@@ -20,7 +20,7 @@
        protected $key;
 
        /**
-        * var array
+        * @var array
         */
        protected $params;
 
diff --git a/extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php 
b/extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php
index f7563c8..d5a73a4 100644
--- a/extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php
+++ b/extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php
@@ -200,8 +200,9 @@
                        throw new InvalidArgumentException( '$blob must be a 
string' );
                }
 
+               $format = $this->sanitizeFormat( $format );
                \MediaWiki\suppressWarnings();
-               switch ( $this->sanitizeFormat( $format ) ) {
+               switch ( $format ) {
                        case CONTENT_FORMAT_JSON:
                                $data = json_decode( $blob, true );
                                break;
diff --git 
a/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
 
b/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 36e5b26..5877d63 100644
--- 
a/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ 
b/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -112,7 +112,6 @@
                $this->entityTitleLookup = $entityTitleLookup;
                $this->entityInfoBuilderFactory = $entityInfoBuilderFactory;
                $this->languageFallbackChain = $languageFallbackChain;
-               $this->languageCode = $languageCode;
                $this->templateFactory = $templateFactory;
                $this->entityDataFormatProvider = $entityDataFormatProvider;
                $this->dataUpdaters = $dataUpdaters;
diff --git 
a/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
 
b/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index aee55fb..ae55499 100644
--- 
a/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ 
b/extensions/Wikibase/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -124,18 +124,18 @@
         * @return EntityParserOutputGenerator
         */
        public function getEntityParserOutputGenerator( ParserOptions $options 
) {
-               $languageCode = $options->getUserLang();
+               $language = $options->getUserLangObj();
 
                return new EntityParserOutputGenerator(
                        $this->entityViewFactory,
                        $this->newParserOutputJsConfigBuilder(),
                        $this->entityTitleLookup,
                        $this->entityInfoBuilderFactory,
-                       $this->getLanguageFallbackChain( $languageCode ),
+                       $this->getLanguageFallbackChain( $language ),
                        $this->templateFactory,
                        $this->entityDataFormatProvider,
                        $this->getDataUpdaters(),
-                       $languageCode
+                       $language->getCode()
                );
        }
 
@@ -147,15 +147,15 @@
        }
 
        /**
-        * @param string $languageCode
+        * @param Language $language
         *
         * @return LanguageFallbackChain
         */
-       private function getLanguageFallbackChain( $languageCode ) {
+       private function getLanguageFallbackChain( $language ) {
                // Language fallback must depend ONLY on the target language,
                // so we don't confuse the parser cache with user specific HTML.
-               return $this->languageFallbackChainFactory->newFromLanguageCode(
-                       $languageCode
+               return $this->languageFallbackChainFactory->newFromLanguage(
+                       $language
                );
        }
 
diff --git a/extensions/Wikibase/repo/includes/api/ModifyEntity.php 
b/extensions/Wikibase/repo/includes/api/ModifyEntity.php
index 118b92f..943febb 100644
--- a/extensions/Wikibase/repo/includes/api/ModifyEntity.php
+++ b/extensions/Wikibase/repo/includes/api/ModifyEntity.php
@@ -264,13 +264,11 @@
        }
 
        /**
-        * Returns the ID of the entity connected to $title on $site, or
-        * throws a usage exception if no such entity is found.
-        *
         * @param string $site
         * @param string $title
         *
-        * @return EntityId
+        * @throws UsageException If no such entity is found.
+        * @return EntityId The ID of the entity connected to $title on $site.
         */
        protected function getEntityIdFromSiteTitleCombination( $site, $title ) 
{
                // FIXME: Normalization missing, see T47282.
diff --git a/extensions/Wikibase/repo/includes/api/QuerySearchEntities.php 
b/extensions/Wikibase/repo/includes/api/QuerySearchEntities.php
index 4e7a7b1..074b152 100644
--- a/extensions/Wikibase/repo/includes/api/QuerySearchEntities.php
+++ b/extensions/Wikibase/repo/includes/api/QuerySearchEntities.php
@@ -56,7 +56,7 @@
                        new LanguageFallbackLabelDescriptionLookup(
                                $repo->getTermLookup(),
                                $repo->getLanguageFallbackChainFactory()
-                                       ->newFromLanguageCode( 
$this->getLanguage()->getCode() )
+                                       ->newFromLanguage( $this->getLanguage() 
)
                        )
                );
 
diff --git a/extensions/Wikibase/repo/includes/api/SearchEntities.php 
b/extensions/Wikibase/repo/includes/api/SearchEntities.php
index 14ee638..3e6a4bf 100644
--- a/extensions/Wikibase/repo/includes/api/SearchEntities.php
+++ b/extensions/Wikibase/repo/includes/api/SearchEntities.php
@@ -5,6 +5,7 @@
 use ApiBase;
 use ApiMain;
 use Wikibase\Lib\ContentLanguages;
+use Wikibase\Lib\Interactors\TermSearchResult;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
 use Wikibase\Repo\WikibaseRepo;
@@ -66,7 +67,7 @@
                        new LanguageFallbackLabelDescriptionLookup(
                                $repo->getTermLookup(),
                                $repo->getLanguageFallbackChainFactory()
-                                       ->newFromLanguageCode( 
$this->getLanguage()->getCode() )
+                                       ->newFromLanguage( $this->getLanguage() 
)
                        )
                );
 
diff --git 
a/extensions/Wikibase/repo/includes/content/DeferredDecodingEntityHolder.php 
b/extensions/Wikibase/repo/includes/content/DeferredDecodingEntityHolder.php
index df5a078..123da18 100644
--- a/extensions/Wikibase/repo/includes/content/DeferredDecodingEntityHolder.php
+++ b/extensions/Wikibase/repo/includes/content/DeferredDecodingEntityHolder.php
@@ -33,7 +33,7 @@
        private $blob;
 
        /**
-        * @var string
+        * @var string|null
         */
        private $contentFormat;
 
@@ -50,7 +50,8 @@
        /**
         * @param EntityContentDataCodec $codec
         * @param string $blob
-        * @param string $contentFormat Serialization format to decode the 
blob, typically CONTENT_FORMAT_JSON.
+        * @param string|null $contentFormat Serialization format to decode the 
blob, typically
+        *  CONTENT_FORMAT_JSON.
         * @param string $entityType
         * @param EntityId|null $entityId
         *
@@ -59,7 +60,7 @@
        public function __construct(
                EntityContentDataCodec $codec,
                $blob,
-               $contentFormat,
+               $contentFormat = null,
                $entityType,
                EntityId $entityId = null
        ) {
@@ -67,8 +68,8 @@
                        throw new InvalidArgumentException( '$blob must be a 
string' );
                }
 
-               if ( !is_string( $contentFormat ) ) {
-                       throw new InvalidArgumentException( '$contentFormat 
must be a string' );
+               if ( $contentFormat !== null && !is_string( $contentFormat ) ) {
+                       throw new InvalidArgumentException( '$contentFormat 
must be a string or null' );
                }
 
                if ( !is_string( $entityType ) ) {
diff --git a/extensions/Wikibase/repo/includes/content/EntityHandler.php 
b/extensions/Wikibase/repo/includes/content/EntityHandler.php
index 65ede17..b85d1a2 100644
--- a/extensions/Wikibase/repo/includes/content/EntityHandler.php
+++ b/extensions/Wikibase/repo/includes/content/EntityHandler.php
@@ -384,12 +384,12 @@
         * @see ContentHandler::unserializeContent
         *
         * @param string $blob
-        * @param string $format
+        * @param string|null $format
         *
         * @throws MWContentSerializationException
         * @return EntityContent
         */
-       public function unserializeContent( $blob, $format = 
CONTENT_FORMAT_JSON ) {
+       public function unserializeContent( $blob, $format = null ) {
                $redirect = $this->contentCodec->decodeRedirect( $blob, $format 
);
 
                if ( $redirect ) {
diff --git 
a/extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php 
b/extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
index cafd85f..ac48f34 100644
--- a/extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
+++ b/extensions/Wikibase/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
@@ -22,7 +22,7 @@
        private $factoryCallbacks;
 
        /**
-        * @param callable[] factory callback functions as returned by
+        * @param callable[] $factoryCallbacks Factory callback functions as 
returned by
         *        DataTypeDefinitions::getRdfBuilderFactoryCallbacks(). 
Callbacks will be invoked
         *        with the signature ($mode, RdfVocabulary, 
EntityMentionListener) and must
         *        return a ValueSnakRdfBuilder (or null).
diff --git a/extensions/Wikibase/repo/tests/phpunit/MockEntityPerPage.php 
b/extensions/Wikibase/repo/tests/phpunit/MockEntityPerPage.php
index 701fdb5..b372c2e 100644
--- a/extensions/Wikibase/repo/tests/phpunit/MockEntityPerPage.php
+++ b/extensions/Wikibase/repo/tests/phpunit/MockEntityPerPage.php
@@ -70,7 +70,6 @@
        ) {
                /** @var EntityId[] $entityIds */
                $entityIds = $this->pageIdToEntityId;
-               asort( $entityIds );
                $entityIds = array_values( $entityIds );
 
                // Act on $entityType
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/EntityModificationTestHelper.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/EntityModificationTestHelper.php
index 4c95d35..b689605 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/EntityModificationTestHelper.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/EntityModificationTestHelper.php
@@ -228,7 +228,7 @@
        /**
         * Asserts that the revision with the given ID has a summary matching 
$regex
         *
-        * @param string $regex|array The regex to match, or an array to build 
a regex from
+        * @param string|string[] $regex The regex to match, or an array to 
build a regex from
         * @param int $revid
         * @param string $message
         */
diff --git 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.removetoolbar.js
 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.removetoolbar.js
index f64801d..6049af2 100644
--- 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.removetoolbar.js
+++ 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.removetoolbar.js
@@ -48,7 +48,7 @@
                $link
                .attr( 'title', $link.text() )
                .text( '' )
-               .append( $( '<span/>' ) );
+               .append( $( '<span class="wb-icon"/>' ) );
 
                return $button;
        }
diff --git 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
index 70e2a78..a700c89 100644
--- 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
+++ 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
@@ -38,7 +38,7 @@
        padding: 0;
 }
 
-.wikibase-toolbar-button span.wb-icon {
+.wikibase-toolbar-button .wb-icon {
        background-position: center;
        background-size: 20px 20px;
        width: 20px;
@@ -48,15 +48,16 @@
        opacity: 0.7;
 }
 
-.wikibase-toolbar-button:hover > a > span.wb-icon {
+.wikibase-toolbar-button a:hover .wb-icon {
        opacity: 0.9;
 }
 
-.wikibase-toolbar-button.ui-state-disabled span.wb-icon {
+.wikibase-toolbar-button.ui-state-disabled .wb-icon,
+.wikibase-toolbar-button.ui-state-disabled a:hover .wb-icon{
        opacity: 0.5;
 }
 
-.wikibase-toolbar-button-edit span.wb-icon {
+.wikibase-toolbar-button-edit .wb-icon {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
@@ -68,7 +69,7 @@
        background-position: 0 40%;
 }
 
-.wikibase-toolbar-button-save span.wb-icon {
+.wikibase-toolbar-button-save .wb-icon {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
@@ -79,7 +80,7 @@
        background-image: linear-gradient(transparent, transparent), 
url(images/icons/oojs-ui/check.svg);
 }
 
-.wikibase-toolbar-button-remove span.wb-icon {
+.wikibase-toolbar-button-remove .wb-icon {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
@@ -90,7 +91,7 @@
        background-image: linear-gradient(transparent, transparent), 
url(images/icons/oojs-ui/remove.svg);
 }
 
-.wikibase-toolbar-button-cancel span.wb-icon {
+.wikibase-toolbar-button-cancel .wb-icon {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
@@ -101,7 +102,7 @@
        background-image: linear-gradient(transparent, transparent), 
url(images/icons/oojs-ui/close-ltr.svg);
 }
 
-.wikibase-toolbar-button-add span.wb-icon {
+.wikibase-toolbar-button-add .wb-icon {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
diff --git 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
index 2416fe9..bc5cf42 100644
--- 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
+++ 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
@@ -15,12 +15,17 @@
        width: 11px;
 }
 
-.wikibase-toolbar-item  span.mw-collapsible-toggle {
-       text-indent: -9999px;
+.wikibase-toolbar-item .mw-collapsible-toggle {
+       background-position: right;
+       background-repeat: no-repeat;
+       height: 24px;
+       overflow: hidden;
+       text-indent: 24px;
+       width: 24px;
 }
 
-.wikibase-toolbar-item  span.mw-collapsible-toggle-expanded,
-.wikibase-toolbar-item  span.mw-collapsible-toggle {
+.wikibase-toolbar-item .mw-collapsible-toggle,
+.wikibase-toolbar-item .mw-collapsible-toggle-expanded {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
@@ -29,13 +34,9 @@
        background-image: -webkit-linear-gradient(transparent, transparent), 
url(images/icons/oojs-ui/collapse.svg);
        /* @embed */
        background-image: linear-gradient(transparent, transparent), 
url(images/icons/oojs-ui/collapse.svg);
-       background-position: right;
-       background-repeat: no-repeat;
-       height: 24px;
-       width: 24px;
 }
 
-.wikibase-toolbar-item  span.mw-collapsible-toggle-collapsed {
+.wikibase-toolbar-item .mw-collapsible-toggle-collapsed {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support 
also SVG).
         * 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
diff --git a/extensions/Wikibase/view/resources/templates.php 
b/extensions/Wikibase/view/resources/templates.php
index 1e2d956..907ea49 100644
--- a/extensions/Wikibase/view/resources/templates.php
+++ b/extensions/Wikibase/view/resources/templates.php
@@ -38,7 +38,6 @@
 </span>
 HTML;
 
-// TODO: Add class="mw-headline".
        $templates['wb-section-heading'] =
 <<<HTML
 <h2 class="wb-section-heading section-heading $3" dir="auto"><span 
class="mw-headline" id="$2">$1</span></h2>
diff --git 
a/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
 
b/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
index 944b745..38151ce 100644
--- 
a/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
+++ 
b/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
@@ -3,17 +3,20 @@
  * @author Daniel Werner < [email protected] >
  */
 
-( function( wb, $, QUnit ) {
+( function( wb, mw, $, QUnit ) {
        'use strict';
 
        QUnit.module( 'wikibase.getLanguageNameByCode' );
 
        QUnit.test( 'wikibase.getLanguageNameByCode()', 2, function( assert ) {
                // TODO: Don't assume global state, control what languages are 
available for this test!
+               // Better might be to turn this into a LanguageNameLookup 
service and set language
+               // name in getEntityTermsView in ViewFactory. Then, all places 
that need language name
+               // would then have it.
                if ( $.uls !== undefined ) {
                        assert.strictEqual(
                                wb.getLanguageNameByCode( 'de' ),
-                               'Deutsch',
+                               mw.config.get( 'wgULSLanguages' ).de,
                                'getLanguageNameByCode() returns language name.'
                        );
                } else {
@@ -31,4 +34,4 @@
                );
        } );
 
-}( wikibase, jQuery, QUnit ) );
+}( wikibase, mediaWiki, jQuery, QUnit ) );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 66a7900..b20c766 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1236,12 +1236,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "ca3adea230578cb5d859cf02c5d75be2fa84ea87"
+            "reference": "68d3d086acba76fb294d3f6cd5ad9950da415cfa"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ca3adea230578cb5d859cf02c5d75be2fa84ea87";,
-            "reference": "ca3adea230578cb5d859cf02c5d75be2fa84ea87",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/68d3d086acba76fb294d3f6cd5ad9950da415cfa";,
+            "reference": "68d3d086acba76fb294d3f6cd5ad9950da415cfa",
             "shasum": ""
         },
         "require": {
@@ -1273,7 +1273,7 @@
             "jakub-onderka/php-parallel-lint": "0.9",
             "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
         },
-        "time": "2015-12-04 09:18:36",
+        "time": "2015-12-04 13:57:23",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {
@@ -1567,7 +1567,7 @@
         "source": {
             "type": "git",
             "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
-            "reference": "72d071b8aab170b407ef708d28e61f376cb027ad"
+            "reference": "f20c24b0d30d1ad03f10241fd456a583d812d044"
         },
         "require": {
             "php": ">=5.3.0",
@@ -1579,7 +1579,7 @@
             "phpunit/phpunit": "^3.7.37|~4.5",
             "satooshi/php-coveralls": "master-dev"
         },
-        "time": "2015-11-29 11:36:41",
+        "time": "2015-12-04 13:24:30",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife85c30d3ac9b710fb082a0c096c0220e60a8f46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to