jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2015-06-30T10:00:01+0000
......................................................................
New Wikidata Build - 2015-06-30T10:00:01+0000
Change-Id: I78fb779efe3b1b50c8b548ff5bee58e5fd194161
---
M composer.lock
M extensions/Wikibase/client/i18n/ady-cyrl.json
A extensions/Wikibase/repo/i18n/ady-cyrl.json
M extensions/Wikibase/repo/includes/api/SearchEntities.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
M
extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
M extensions/Wikibase/view/resources/wikibase/wikibase.css
M vendor/composer/installed.json
11 files changed, 66 insertions(+), 31 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 9445014..10afbaf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "d076d3f1c87eaec762fd97e7ed3fa243d4b70c84"
+ "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d076d3f1c87eaec762fd97e7ed3fa243d4b70c84";,
- "reference": "d076d3f1c87eaec762fd97e7ed3fa243d4b70c84",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8a4445f67012a5b55e26a5f66a3e1e80d309d374";,
+ "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-06-28 20:19:23"
+ "time": "2015-06-30 01:17:52"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/ady-cyrl.json
b/extensions/Wikibase/client/i18n/ady-cyrl.json
index 60768b0..85693d3 100644
--- a/extensions/Wikibase/client/i18n/ady-cyrl.json
+++ b/extensions/Wikibase/client/i18n/ady-cyrl.json
@@ -1,11 +1,16 @@
{
"@metadata": {
"authors": [
- "Bedynokue.nart"
+ "Bedynokue.nart",
+ "SamGamgee"
]
},
"tooltip-t-wikibase": "Ехьыл1агъэу хъарзынэщым и элементгорэм гъэзэгъэ
зэпыщ",
+ "wikibase-comment-update": "{{WBREPONAME}} зэхъок1ыгъэ",
"wikibase-dataitem": "{{WBREPONAME}} зыгор",
"wikibase-editlinks": "Зэпыщэмэ я1аз",
- "wikibase-editlinkstitle": "Бзэзэпыщэмэ я1аз"
+ "wikibase-editlinkstitle": "Бзэзэпыщэмэ я1аз",
+ "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
+ "wikibase-rc-hide-wikidata-show": "Къэгъэлъагъу",
+ "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} и е1эзэныгъэ"
}
diff --git a/extensions/Wikibase/repo/i18n/ady-cyrl.json
b/extensions/Wikibase/repo/i18n/ady-cyrl.json
new file mode 100644
index 0000000..dd1e47b
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/ady-cyrl.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "SamGamgee"
+ ]
+ },
+ "wikibase-edit": "е1аз",
+ "wikibase-add": "хэгъахъу"
+}
diff --git a/extensions/Wikibase/repo/includes/api/SearchEntities.php
b/extensions/Wikibase/repo/includes/api/SearchEntities.php
index 3d89e0d..c54e7fb 100644
--- a/extensions/Wikibase/repo/includes/api/SearchEntities.php
+++ b/extensions/Wikibase/repo/includes/api/SearchEntities.php
@@ -180,7 +180,8 @@
$entry['url'] = $title->getFullUrl();
$entry = array_merge( $entry, $this->termsToArray(
$match['displayTerms'] ) );
$entry['match']['type'] =
$match[TermIndexSearchInteractor::MATCHEDTERMTYPE_KEY];
- //Special handeling for 'entityId's as these are not
actually Term objects
+
+ //Special handling for 'entityId's as these are not
actually Term objects
if ( $entry['match']['type'] === 'entityId' ) {
$entry['match']['text'] = $match['entityId'];
$entry['aliases'] = array( $match['entityId'] );
@@ -189,7 +190,10 @@
$matchedTerm =
$match[TermIndexSearchInteractor::MATCHEDTERM_KEY];
$entry['match']['language'] =
$matchedTerm->getLanguageCode();
$entry['match']['text'] =
$matchedTerm->getText();
- $entry['aliases'] = array(
$matchedTerm->getText() );
+
+ if ( $match['matchedTermType'] === 'alias' ) {
+ $entry['aliases'] = array(
$matchedTerm->getText() );
+ }
}
$entries[] = $entry;
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
index e3b1217..c5d9acb 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
@@ -249,7 +249,6 @@
'url' => 'http://fullTitleUrl',
TermIndexEntry::TYPE_LABEL => 'FooHeHe',
TermIndexEntry::TYPE_DESCRIPTION => 'FooHeHe en
description',
- 'aliases' => array( 'Fooooo' ),
'match' => array(
'type' => 'label',
'language' => 'en-gb',
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
index f0e540a..1a9ee33 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
@@ -148,7 +148,7 @@
var $snaklistview = $( event.target ).closest(
':wikibase-snaklistview' ),
snaklistview = $snaklistview.data(
'snaklistview' );
- if( snaklistview && !snaklistview.value() ) {
+ if( snaklistview &&
!snaklistview.value().length ) {
self.$listview.data( 'listview'
).removeItem( snaklistview.element );
}
}
@@ -208,7 +208,11 @@
*/
value: function( reference ) {
if( reference ) {
- this.option( 'value', reference );
+ return this.option( 'value', reference );
+ }
+
+ if( !this.$listview ) {
+ return null;
}
var snakList = new wb.datamodel.SnakList();
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
index 7474e77..0f394d1 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
@@ -319,7 +319,7 @@
* committed).
*
* @param {wikibase.datamodel.SnakList} [snakList]
- * @return {wikibase.datamodel.SnakList|null|undefined}
+ * @return {wikibase.datamodel.SnakList|undefined}
*/
value: function( snakList ) {
if( snakList !== undefined ) {
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
index bf9aefd..60e7330 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
@@ -189,10 +189,10 @@
property: !!(
value || propertyId )
}
},
- dataTypeStore: self.option(
'dataTypeStore' ),
- entityStore: self.option(
'entityStore' ),
- valueViewBuilder: self.option(
'valueViewBuilder' ),
- entityChangersFactory:
self.option( 'entityChangersFactory' ),
+ dataTypeStore:
self.options.dataTypeStore,
+ entityStore:
self.options.entityStore,
+ valueViewBuilder:
self.options.valueViewBuilder,
+ entityChangersFactory:
self.options.entityChangersFactory,
claimsChanger:
self._claimsChanger,
guidGenerator:
self.options.claimGuidGenerator
};
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
index fea0e98..731a075 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
@@ -108,6 +108,26 @@
}
/**
+ * @private
+ *
+ * @param
{wikibase.store.FetchedContent|undefined|null} property
+ * @return {dataTypes.DataType|null}
+ */
+ function _getDataType( property ) {
+ // If the set property is not there, we have to
display a warning. This can happen
+ // if a property got deleted but the Snaks
using it didn't change the property.
+ var dataTypeId = property
+ ? property.getContent().getDataTypeId()
+ : false;
+
+ if( dataTypeId ) {
+ return self._dataTypeStore.getDataType(
dataTypeId );
+ }
+
+ return null;
+ }
+
+ /**
* Handles a data value type mismatch by rendering
appropriate messages.
* Such a mismatch can happen whenever something
changes internally but there were no
* update scripts executed to change the data store.
E.g. if a data type changes its
@@ -161,17 +181,7 @@
return;
}
- // If the set property is not there, we
have to display a warning. This can
- // happen if a property got deleted but
the Snaks using it didn't change the
- // property.
- var dataTypeId = fetchedProperty
- ?
fetchedProperty.getContent().getDataTypeId()
- : false;
- var dataType = null;
-
- if( dataTypeId ) {
- dataType =
self._dataTypeStore.getDataType( dataTypeId );
- }
+ var dataType = _getDataType(
fetchedProperty );
// If the new value's type is not the
data value type used by the Snak's
// property data type, something is
very wrong. Display warning!
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.css
b/extensions/Wikibase/view/resources/wikibase/wikibase.css
index 527738e..e59e1dd 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.css
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.css
@@ -87,6 +87,10 @@
clear: both; /* to not overlay success message */
}
+#toc {
+ display: none;
+}
+
h2.wb-section-heading {
position: relative;
float: left;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2bd71cc..d302cf4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1212,12 +1212,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "d076d3f1c87eaec762fd97e7ed3fa243d4b70c84"
+ "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d076d3f1c87eaec762fd97e7ed3fa243d4b70c84";,
- "reference": "d076d3f1c87eaec762fd97e7ed3fa243d4b70c84",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8a4445f67012a5b55e26a5f66a3e1e80d309d374";,
+ "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374",
"shasum": ""
},
"require": {
@@ -1247,7 +1247,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-06-28 20:19:23",
+ "time": "2015-06-30 01:17:52",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/221845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78fb779efe3b1b50c8b548ff5bee58e5fd194161
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
