WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247524
Change subject: New Wikidata Build - 2015-10-20T10:00:01+0000
......................................................................
New Wikidata Build - 2015-10-20T10:00:01+0000
Change-Id: I29c30edce2a382481bdda66fa363303d9ed3ad87
---
M composer.lock
M extensions/ExternalValidation/i18n/qqq.json
M extensions/Wikibase/client/i18n/it.json
M extensions/Wikibase/client/i18n/krl.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/sr-el.json
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M
extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
M extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
M vendor/composer/installed.json
10 files changed, 79 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/24/247524/1
diff --git a/composer.lock b/composer.lock
index 6a951be..b96cb58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1187,7 +1187,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";,
- "reference": "ed033a68d65f9a724087baecba7f68327d9e97a4"
+ "reference": "8df26250265b693c2fca2a4ad80f6f23199afb51"
},
"require": {
"php": ">=5.3.0",
@@ -1235,7 +1235,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1203/";
},
- "time": "2015-10-15 08:04:49"
+ "time": "2015-10-19 20:22:35"
},
{
"name": "wikibase/internal-serialization",
@@ -1441,12 +1441,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "64d84f46ab0dbf0260e93932be54d2a10554f64b"
+ "reference": "43c536974e2ec630049fabab74fbbfc429389bca"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/64d84f46ab0dbf0260e93932be54d2a10554f64b";,
- "reference": "64d84f46ab0dbf0260e93932be54d2a10554f64b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/43c536974e2ec630049fabab74fbbfc429389bca";,
+ "reference": "43c536974e2ec630049fabab74fbbfc429389bca",
"shasum": ""
},
"require": {
@@ -1515,7 +1515,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-10-18 19:59:00"
+ "time": "2015-10-19 20:22:29"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ExternalValidation/i18n/qqq.json
b/extensions/ExternalValidation/i18n/qqq.json
index fb8375a..af0bd2a 100644
--- a/extensions/ExternalValidation/i18n/qqq.json
+++ b/extensions/ExternalValidation/i18n/qqq.json
@@ -5,13 +5,16 @@
"Raymond",
"Metalhead64",
"Amire80",
- "Nemo bis"
+ "Nemo bis",
+ "Umherirrender"
]
},
"wbqev-desc":
"{{desc|name=WikibaseQualityExternalValidation|url=https://www.mediawiki.org/wiki/Extension:WikibaseQualityExternalValidation}}";,
"wbqev-crosscheck": "{{doc-special|CrossCheck}}",
"wbqev-crosscheck-explanation-general": "General explanation text for
special page.",
"wbqev-crosscheck-explanation-detail": "Mre detailed explanation text
for special page.",
+ "wbqev-crosscheck-form-section": "Used as section title on
[[Special:CrossCheck]]",
+ "wbqev-crosscheck-form-entityid-label": "Used as label on
[[Special:CrossCheck]]",
"wbqev-crosscheck-form-entityid-placeholder": "Entity id placeholder
for the input field.",
"wbqev-crosscheck-form-submit-label": "Label of the button, that starts
the check.\n{{Identical|Check}}",
"wbqev-crosscheck-invalid-entity-id": "Error message that appears when
the entered string is not a valid entity id.",
@@ -55,5 +58,6 @@
"wbqev-violation-short-message": "Short message that is shown for
violated claims in pop-up on item page. First parameter is name of the data
source.",
"wbqev-violation-long-message-headline": "Header for long message that
is shown for violated claims on item page.",
"wbqev-violation-long-message-external-values": "Long message that is
shown for violated claims on item page. First parameter are the external
values, second parameter is the number of external values.",
- "wbqev-violation-long-message-solve-issue": "Message that is shown for
violated claims in order to advise the user how to solve the issue."
+ "wbqev-violation-long-message-solve-issue": "Message that is shown for
violated claims in order to advise the user how to solve the issue.",
+ "wbqev-violation-mark-as-exception": "Used as label"
}
diff --git a/extensions/Wikibase/client/i18n/it.json
b/extensions/Wikibase/client/i18n/it.json
index 6c766da..1154517 100644
--- a/extensions/Wikibase/client/i18n/it.json
+++ b/extensions/Wikibase/client/i18n/it.json
@@ -14,7 +14,8 @@
"Fringio",
"Ricordisamoa",
"Macofe",
- "Lucas2"
+ "Lucas2",
+ "Horcrux92"
]
},
"wikibase-client-desc": "Client per l'estensione Wikibase",
@@ -71,6 +72,7 @@
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|collegamento
interlinguistico|collegamenti interlinguistici}} nella pagina)",
"wikibase-unconnectedpages-submit": "Mostra pagine",
"pageswithbadges": "Pagine con distintivi",
+ "pageswithbadges-summary": "In questa pagina vengono elencate le pagine
con distintivi (ad es. voci in vetrina o di qualità). La lista è orinata per ID
decrescente, quindi le pagine più recenti appariranno in alto.",
"wikibase-pageswithbadges-invalid-id": "$1 non è un ID elemento valido",
"wikibase-pageswithbadges-legend": "Elenco di pagine con un distintivo
specificato",
"wikibase-pageswithbadges-badge": "Distintivo:",
diff --git a/extensions/Wikibase/client/i18n/krl.json
b/extensions/Wikibase/client/i18n/krl.json
index fb1c17d..ad44717 100644
--- a/extensions/Wikibase/client/i18n/krl.json
+++ b/extensions/Wikibase/client/i18n/krl.json
@@ -4,5 +4,6 @@
"Likopiän tyttö"
]
},
- "wikibase-rc-hide-wikidata-show": "Näytä"
+ "wikibase-rc-hide-wikidata-show": "Näytä",
+ "wikibase-rc-wikibase-edit-letter": "D"
}
diff --git a/extensions/Wikibase/client/i18n/sr-ec.json
b/extensions/Wikibase/client/i18n/sr-ec.json
index 22fea0a..34397c6 100644
--- a/extensions/Wikibase/client/i18n/sr-ec.json
+++ b/extensions/Wikibase/client/i18n/sr-ec.json
@@ -55,6 +55,7 @@
"unconnectedpages": "Странице које нису повезане са ставкама",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|међујезичка
веза|међујезичких веза}} на страници)",
"wikibase-unconnectedpages-submit": "Прикажи странице",
+ "pageswithbadges": "Странице с беџевима",
"wikibase-pageinfo-entity-id": "ИД ставке на Википодацима",
"wikibase-pageinfo-entity-id-none": "Нема",
"wikibase-otherprojects": "Остали пројекти",
diff --git a/extensions/Wikibase/client/i18n/sr-el.json
b/extensions/Wikibase/client/i18n/sr-el.json
index a02a65b..f5efcde 100644
--- a/extensions/Wikibase/client/i18n/sr-el.json
+++ b/extensions/Wikibase/client/i18n/sr-el.json
@@ -46,6 +46,7 @@
"unconnectedpages": "Stranice koje nisu povezane sa stavkama",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|međujezička
veza|međujezičkih veza}} na stranici)",
"wikibase-unconnectedpages-submit": "Prikaži stranice",
+ "pageswithbadges": "Stranice s bedževima",
"wikibase-pageinfo-entity-id": "ID stavke na Vikipodacima",
"wikibase-pageinfo-entity-id-none": "Nema",
"wikibase-otherprojects": "Ostali projekti",
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index bc37bfd..ad33438 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -119,6 +119,12 @@
},
/**
+ * @property {jQuery.wikibase.snakview}
+ * @private
+ */
+ _mainSnakSnakView: null,
+
+ /**
* @property {jQuery.wikibase.statementview.RankSelector}
* @private
*/
@@ -196,6 +202,7 @@
*/
_createMainSnak: function( snak ) {
if ( this.$mainSnak.data( 'snakview' ) ) {
+ this._mainSnakSnakView = this.$mainSnak.data(
'snakview' );
return;
}
@@ -210,7 +217,7 @@
event.stopPropagation();
} );
- this.$mainSnak.snakview( {
+ this._mainSnakSnakView = this.$mainSnak.snakview( {
value: snak || undefined,
locked: this.options.locked.mainSnak,
autoStartEditing: false,
@@ -220,7 +227,7 @@
entityStore: this.options.entityStore,
valueViewBuilder: this.options.valueViewBuilder,
encapsulatedBy: ':' + this.widgetFullName.toLowerCase()
- } );
+ } ).data( 'snakview' );
},
/**
@@ -314,30 +321,30 @@
return;
}
+ var lia = new $.wikibase.listview.ListItemAdapter( {
+ listItemWidget: $.wikibase.referenceview,
+ newItemOptionsFn: function( value ) {
+ return {
+ value: value || null,
+ statementGuid: self.options.value
+ ?
self.options.value.getClaim().getGuid()
+ : null,
+ dataTypeStore:
self.options.dataTypeStore,
+ entityIdHtmlFormatter:
self.options.entityIdHtmlFormatter,
+ entityIdPlainFormatter:
self.options.entityIdPlainFormatter,
+ entityStore: self.options.entityStore,
+ valueViewBuilder:
self.options.valueViewBuilder,
+ referencesChanger:
self.options.referencesChanger
+ };
+ }
+ } );
+
$listview.listview( {
- listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
- listItemWidget: $.wikibase.referenceview,
- newItemOptionsFn: function( value ) {
- return {
- value: value || null,
- statementGuid:
self.options.value
- ?
self.options.value.getClaim().getGuid()
- : null,
- dataTypeStore:
self.options.dataTypeStore,
- entityIdHtmlFormatter:
self.options.entityIdHtmlFormatter,
- entityIdPlainFormatter:
self.options.entityIdPlainFormatter,
- entityStore:
self.options.entityStore,
- valueViewBuilder:
self.options.valueViewBuilder,
- referencesChanger:
self.options.referencesChanger
- };
- }
- } ),
+ listItemAdapter: lia,
value: references
} );
this._referencesListview = $listview.data( 'listview' );
-
- var lia = this._referencesListview.listItemAdapter();
$listview
.on( 'listviewitemadded listviewitemremoved', function( event,
value, $li ) {
@@ -427,7 +434,7 @@
this._rankSelector.destroy();
this.$rankSelector.off( '.' + this.widgetName );
- this.$mainSnak.snakview( 'destroy' );
+ this._mainSnakSnakView.destroy();
this.$mainSnak.off( '.' + this.widgetName );
this._destroyQualifiersListView();
@@ -473,7 +480,7 @@
this._createMainSnak( this.options.value
? this.options.value.getClaim().getMainSnak()
- : this.option( 'predefined' ).mainSnak || null
+ : this.options.predefined.mainSnak || null
);
if ( this.isInEditMode()
@@ -536,7 +543,7 @@
}
}
- return this.$mainSnak.data( 'snakview' ).isInitialValue();
+ return this._mainSnakSnakView.isInitialValue();
},
/**
@@ -547,7 +554,7 @@
* @return {wikibase.datamodel.Statement|null}
*/
_instantiateStatement: function( guid ) {
- var mainSnak = this.$mainSnak.data( 'snakview' ).snak();
+ var mainSnak = this._mainSnakSnakView.snak();
if ( !mainSnak ) {
return null;
@@ -693,7 +700,7 @@
.fail( deferred.reject );
} );
- this.$mainSnak.data( 'snakview' ).startEditing();
+ this._mainSnakSnakView.startEditing();
return deferred.promise();
},
@@ -703,8 +710,8 @@
* @protected
*/
_afterStopEditing: function( dropValue ) {
- if ( this.$mainSnak.data( 'snakview' ) ) {
- this.$mainSnak.data( 'snakview' ).stopEditing(
dropValue );
+ if ( this._mainSnakSnakView ) {
+ this._mainSnakSnakView.stopEditing( dropValue );
}
this._stopEditingQualifiers( dropValue );
this._rankSelector.stopEditing( dropValue );
@@ -773,7 +780,7 @@
throw new Error( 'Unable to instantiate Statement' );
}
- return this.option( 'claimsChanger' ).setStatement( statement )
+ return this.options.claimsChanger.setStatement( statement )
.done( function( savedStatement ) {
// Update model of represented Statement:
self.options.value = savedStatement;
@@ -786,7 +793,7 @@
isEmpty: function() {
return false;
// TODO: Supposed to do at least...
- // this.$mainSnak.data( 'snakview' ).isEmpty(); (does not exist
at the moment of writing)
+ // this._mainSnakSnakView.isEmpty(); (does not exist at the
moment of writing)
},
/**
@@ -796,7 +803,7 @@
var snaklistviews,
i;
- if ( this.$mainSnak.data( 'snakview' ) && !this.$mainSnak.data(
'snakview' ).isValid() ) {
+ if ( this._mainSnakSnakView &&
!this._mainSnakSnakView.isValid() ) {
return false;
}
@@ -829,7 +836,7 @@
var response = PARENT.prototype._setOption.apply( this,
arguments );
if ( key === 'disabled' ) {
- this.$mainSnak.data( 'snakview' ).option( key, value );
+ this._mainSnakSnakView.option( key, value );
if ( this._qualifiers ) {
this._qualifiers.option( key, value );
}
@@ -844,7 +851,7 @@
* @inheritdoc
*/
focus: function() {
- this.$mainSnak.data( 'snakview' ).focus();
+ this._mainSnakSnakView.focus();
}
} );
diff --git
a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
index 15a5e64..561bd09 100644
---
a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
+++
b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
@@ -145,11 +145,11 @@
),
referencesChanger: referencesChanger
} ),
- statementview = $statementview.data( 'statementview' );
+ statementview = $statementview.data( 'statementview' ),
+ referenceslistview = statementview._referencesListview,
+ referenceview =
referenceslistview.listItemAdapter().liInstance( $(
referenceslistview.items()[0] ) );
- statementview.remove(
- $statementview.find( ':wikibase-referenceview' ).data(
'referenceview' )
- );
+ statementview.remove( referenceview );
sinon.assert.calledWith( referencesChanger.removeReference, 'guid',
reference );
} );
@@ -216,14 +216,18 @@
} ),
statementview = $statementview.data( 'statementview' );
- statementview.startEditing();
-
- statementview.$mainSnak.find( ':wikibase-entityselector' ).data(
'wikibase-entityselector' )._select( { id: 'P1' } );
- statementview.$mainSnak.find( ':wikibase-snaktypeselector' ).data(
'snaktypeselector' ).snakType( 'novalue' );
-
QUnit.stop();
+ statementview.startEditing().then( function() {
+ QUnit.start();
+ assert.ok( statementview.isInEditMode(), 'should be in edit
mode after starting editing' );
- statementview.stopEditing( false ).then( function() {
+ // Change main snak
+ statementview.$mainSnak.find( ':wikibase-entityselector'
).data( 'wikibase-entityselector' )._select( { id: 'P1' } );
+ statementview.$mainSnak.find( ':wikibase-snaktypeselector'
).data( 'snaktypeselector' ).snakType( 'novalue' );
+
+ QUnit.stop();
+ return statementview.stopEditing( false );
+ } ).then( function() {
QUnit.start();
sinon.assert.calledWith(
setStatement,
diff --git a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
index 8c0acdb..9a426ae 100644
--- a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
@@ -290,7 +290,6 @@
'test.sinonjs',
'wikibase.datamodel.Claim',
'wikibase.datamodel.PropertyNoValueSnak',
- 'wikibase.datamodel.PropertyValueSnak',
'wikibase.datamodel.Reference',
'wikibase.datamodel.ReferenceList',
'wikibase.datamodel.Statement',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 8f2e07e..700b943 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1229,12 +1229,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "64d84f46ab0dbf0260e93932be54d2a10554f64b"
+ "reference": "43c536974e2ec630049fabab74fbbfc429389bca"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/64d84f46ab0dbf0260e93932be54d2a10554f64b";,
- "reference": "64d84f46ab0dbf0260e93932be54d2a10554f64b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/43c536974e2ec630049fabab74fbbfc429389bca";,
+ "reference": "43c536974e2ec630049fabab74fbbfc429389bca",
"shasum": ""
},
"require": {
@@ -1265,7 +1265,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-10-18 19:59:00",
+ "time": "2015-10-19 20:22:29",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1398,7 +1398,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";,
- "reference": "ed033a68d65f9a724087baecba7f68327d9e97a4"
+ "reference": "8df26250265b693c2fca2a4ad80f6f23199afb51"
},
"require": {
"php": ">=5.3.0",
@@ -1411,7 +1411,7 @@
"phpunit/phpunit": "~3.7,>=3.7.37",
"satooshi/php-coveralls": "dev-master"
},
- "time": "2015-10-15 08:04:49",
+ "time": "2015-10-19 20:22:35",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/247524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29c30edce2a382481bdda66fa363303d9ed3ad87
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
