Tobias Gritschacher has submitted this change and it was merged.
Change subject: Entity selector: Using user language when in MediaWiki context
......................................................................
Entity selector: Using user language when in MediaWiki context
patch set 3: rebase
Change-Id: I001bd969c234b520b889f8f9c09fe1b924f0d79b
---
M lib/resources/jquery.valueview.views/wikibaseItem.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
M repo/resources/wikibase.ui.entitysearch.js
5 files changed, 8 insertions(+), 13 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.valueview.views/wikibaseItem.js
b/lib/resources/jquery.valueview.views/wikibaseItem.js
index 9a7251c..b3eaeef 100644
--- a/lib/resources/jquery.valueview.views/wikibaseItem.js
+++ b/lib/resources/jquery.valueview.views/wikibaseItem.js
@@ -54,8 +54,6 @@
* @private
*/
_buildInputDom: function() {
- var language = mw.config.get( 'wgUserLanguage' );
-
return $( '<textarea/>', {
'class': this.widgetBaseClass + '-input',
'type': 'text',
@@ -64,8 +62,6 @@
.inputAutoExpand( { expandWidth: false,
expandHeight:true, suppressNewLine: true } )
.entityselector( {
url: mw.util.wikiScript( 'api' ),
- language: language,
- type: 'item',
selectOnAutocomplete: true
} )
.eachchange( function( event, oldValue ) {
@@ -76,7 +72,7 @@
id: ui.item.id,
label: {}
};
- itemData.label[ language ] = ui.item.label;
+ itemData.label[ mw.config.get( 'wgUserLanguage'
) ] = ui.item.label;
// update local store with newest information
about selected item
// TODO: create more sophisticated local store
interface rather than accessing
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index ae85f8b..1856547 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -16,7 +16,9 @@
*
* @option url {String} URL to retrieve results from.
*
- * @option language {String} Code of the language results shall be fetched in.
+ * @option language {String} (optional when in MediaWiki context) Code of the
language results shall
+ * be fetched in. Required if not in MediaWiki context.
+ * Default value: User language (when in MediaWiki context)
*
* @option type {String} (optional) Entity type that will be queried for
results.
* Default value: 'item'
@@ -106,7 +108,7 @@
*/
options: {
url: null,
- language: null,
+ language: ( IS_MW_CONTEXT ) ? mw.config.get(
'wgUserLanguage' ) : null,
type: 'item',
limit: null,
selectOnAutocomplete: false,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index 1e75366..cfd542a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -182,12 +182,10 @@
* @return {jQuery}
*/
_buildPropertySelector: function() {
- var self = this,
- language = mw.config.get( 'wgUserLanguage' );
+ var self = this;
return $( '<input/>' ).entityselector( {
url: mw.util.wikiScript( 'api' ),
- language: language,
type: 'property'
} )
.prop( 'placeholder', mw.msg(
'wikibase-snakview-property-input-placeholder' ) )
@@ -204,6 +202,7 @@
// entity chosen in entity selector but we still need
the data type of the entity, so
// we have to make a separate API call:
var api = new wb.RepoApi(),
+ language = mw.config.get( 'wgUserLanguage' ),
entityId = ui.item.id;
// Display spinner as long as the value view is
loading. There is no need to display the
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
index 55e9900..2064ac0 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
@@ -19,8 +19,7 @@
*/
var newTestEntitySelector = function( customOptions ) {
var options = {
- url: 'url',
- language: 'language'
+ url: 'url'
};
if ( options ) {
$.extend( options, customOptions );
diff --git a/repo/resources/wikibase.ui.entitysearch.js
b/repo/resources/wikibase.ui.entitysearch.js
index 8be2044..366f050 100644
--- a/repo/resources/wikibase.ui.entitysearch.js
+++ b/repo/resources/wikibase.ui.entitysearch.js
@@ -52,7 +52,6 @@
} )
.entityselector( {
url: mw.config.get( 'wgServer' ) + mw.config.get(
'wgScriptPath' ) + '/api.php',
- language: mw.config.get( 'wgUserLanguage' ),
emulateSearchBox: true,
customListItem: {
content: $( '<div/>' ).addClass(
'suggestions-special' )
--
To view, visit https://gerrit.wikimedia.org/r/51646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I001bd969c234b520b889f8f9c09fe1b924f0d79b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[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
