WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155513
Change subject: New Wikidata Build - 21/08/2014 10:00
......................................................................
New Wikidata Build - 21/08/2014 10:00
Change-Id: I447a5649da63c60f6aa7efbb7e5264db5c8a8ca1
---
M composer.lock
M extensions/Wikibase/client/i18n/fi.json
M extensions/Wikibase/client/i18n/la.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/scn.json
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/WikibaseLib.hooks.php
M extensions/Wikibase/lib/i18n/ckb.json
M extensions/Wikibase/lib/i18n/et.json
M extensions/Wikibase/lib/i18n/nl.json
M extensions/Wikibase/lib/i18n/pl.json
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M extensions/Wikibase/lib/resources/templates.php
M extensions/Wikibase/lib/resources/wikibase.Site.js
M
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
A extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/resources.php
M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
M extensions/Wikibase/repo/config/Wikibase.example.php
M extensions/Wikibase/repo/i18n/ckb.json
M extensions/Wikibase/repo/i18n/et.json
M extensions/Wikibase/repo/i18n/fi.json
M extensions/Wikibase/repo/i18n/ka.json
M extensions/Wikibase/repo/i18n/nl.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/includes/View/SiteLinksView.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
M vendor/wikibase/serialization-javascript/.jshintrc
M vendor/wikibase/serialization-javascript/README.md
M vendor/wikibase/serialization-javascript/resources.mw.php
A
vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.itemExpert.js
M
vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.js
39 files changed, 382 insertions(+), 208 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/13/155513/1
diff --git a/composer.lock b/composer.lock
index 36a633d..8030ed3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1084,16 +1084,16 @@
},
{
"name": "wikibase/serialization-javascript",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url":
"https://github.com/wmde/WikibaseSerializationJavaScript.git";,
- "reference": "53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028"
+ "reference": "aeeca302e86383c36677d2b4b58a6a00ad834e2b"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseSerializationJavaScript/zipball/53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028";,
- "reference": "53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028",
+ "url":
"https://api.github.com/repos/wmde/WikibaseSerializationJavaScript/zipball/aeeca302e86383c36677d2b4b58a6a00ad834e2b";,
+ "reference": "aeeca302e86383c36677d2b4b58a6a00ad834e2b",
"shasum": ""
},
"require": {
@@ -1112,30 +1112,25 @@
],
"authors": [
{
+ "name": "Adrian Lang",
+ "email": "[email protected]"
+ },
+ {
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- },
- {
- "name": "Adrian Lang",
- "email": "[email protected]"
+ "homepage": "http://www.snater.com";
}
],
"description": "Wikibase datamodel serialization implementation in
JavaScript",
- "time": "2014-07-10 12:57:32"
+ "time": "2014-08-20 15:36:05"
},
{
"name": "wikibase/wikibase",
@@ -1143,12 +1138,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "386d2754eef93d9ec96641f332e9afdd3eebfe8a"
+ "reference": "05c771e36eadae5e4e6b533227b82f05bde4d1b9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/386d2754eef93d9ec96641f332e9afdd3eebfe8a";,
- "reference": "386d2754eef93d9ec96641f332e9afdd3eebfe8a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/05c771e36eadae5e4e6b533227b82f05bde4d1b9";,
+ "reference": "05c771e36eadae5e4e6b533227b82f05bde4d1b9",
"shasum": ""
},
"require": {
@@ -1217,7 +1212,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-08-19 21:52:18"
+ "time": "2014-08-21 09:16:33"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/client/i18n/fi.json
b/extensions/Wikibase/client/i18n/fi.json
index 7f65da1..47eca28 100644
--- a/extensions/Wikibase/client/i18n/fi.json
+++ b/extensions/Wikibase/client/i18n/fi.json
@@ -63,5 +63,7 @@
"wikibase-pageinfo-entity-id": "{{WBREPONAME}}-kohteen tunniste",
"wikibase-pageinfo-entity-id-none": "Ei mitään",
"wikibase-property-render-error": "Ominaisuuden $1 näyttäminen
epäonnistui: $2",
- "wikibase-otherprojects": "Muut projektit"
+ "wikibase-otherprojects": "Muut projektit",
+ "wikibase-otherprojects-beta-message": "Muut projektit -sivupalkki",
+ "wikibase-otherprojects-beta-description": "Lisää sivupalkkiin osion
\"{{int:wikibase-otherprojects}}\", joka tarjoaa linkit muihin
Wikimedia-projekteihin perustuen dataan sivustolla {{WBREPONAME}}."
}
diff --git a/extensions/Wikibase/client/i18n/la.json
b/extensions/Wikibase/client/i18n/la.json
index deed208..bd88661 100644
--- a/extensions/Wikibase/client/i18n/la.json
+++ b/extensions/Wikibase/client/i18n/la.json
@@ -8,5 +8,7 @@
"wikibase-editlinks": "Nexus recensere",
"wikibase-editlinkstitle": "Nexus inter linguas recensere",
"wikibase-rc-hide-wikidata": "$1 Vicidata",
+ "wikibase-rc-hide-wikidata-hide": "Celare",
+ "wikibase-rc-hide-wikidata-show": "Monstrare",
"wikibase-rc-wikibase-edit-title": "Recensio apud Wikidata"
}
diff --git a/extensions/Wikibase/client/i18n/nl.json
b/extensions/Wikibase/client/i18n/nl.json
index 6e790a2..844d7a9 100644
--- a/extensions/Wikibase/client/i18n/nl.json
+++ b/extensions/Wikibase/client/i18n/nl.json
@@ -63,5 +63,7 @@
"wikibase-pageinfo-entity-id": "{{WBREPONAME}} item-ID",
"wikibase-pageinfo-entity-id-none": "Geen",
"wikibase-property-render-error": "Het verwerken van de eigenschap $1
is mislukt: $2",
- "wikibase-otherprojects": "Andere projecten"
+ "wikibase-otherprojects": "Andere projecten",
+ "wikibase-otherprojects-beta-message": "Andere projecten-zijbalk",
+ "wikibase-otherprojects-beta-description": "Voegt een
\"{{int:wikibase-otherprojects}}\"-sectie toe aan de zijbalk welke toegang
biedt tot andere Wikimedia-projecten op basis van gegevens van {{WBREPONAME}}."
}
diff --git a/extensions/Wikibase/client/i18n/scn.json
b/extensions/Wikibase/client/i18n/scn.json
index 46c8dee..f68bc49 100644
--- a/extensions/Wikibase/client/i18n/scn.json
+++ b/extensions/Wikibase/client/i18n/scn.json
@@ -35,9 +35,9 @@
"wikibase-linkitem-not-loggedin": "Hai a siri luggatu nti sta wiki e
nti l'[$1 archiviu cintralizzatu dî dati] pi utilizzari sta funziunalitati.",
"wikibase-linkitem-success-link": "Li pàggini foru culligati di manera
giusta. Puoi truvari l'elimentu cuntinenti li liami ntô nostru [$1 archiviu dî
dati cintralizzatu].",
"wikibase-property-notfound": "Prupritati $1 nun truvata.",
- "wikibase-property-notsupportedyet": "Wikibase nun supporta ancora lu
tipu di prupritatu pi la prupritati $1.",
"wikibase-rc-hide-wikidata": "$1 Wikidata",
"wikibase-rc-show-wikidata-pref": "Ammuscia li canciamenti di Wikidata
nti l'ùrtimi canciamenti",
+ "wikibase-rc-wikibase-edit-title": "Chistu è nu canciu supra a
{{WBREPONAME}}",
"wikibase-watchlist-show-changes-pref": "Ammuscia li canciamenti supra
Wikidata ntâ tò lista di ussirvati spiciali",
"wikibase-error-serialize-error": "Mpussibbili sirializzari li dati",
"wikibase-error-invalid-entity-id": "Lu ID spicificatu è scanusciutu ô
sistema. Usa nu ID di entitati vàliddu.",
diff --git a/extensions/Wikibase/docs/options.wiki
b/extensions/Wikibase/docs/options.wiki
index def19b5..26af029 100644
--- a/extensions/Wikibase/docs/options.wiki
+++ b/extensions/Wikibase/docs/options.wiki
@@ -10,7 +10,7 @@
;changesDatabase: The database that changes are recorded to for processing by
clients. This must be set to a symbolic database identifier that MediaWiki's
LBFactory class understands; <code>false</code> means that the wiki's own
database shall be used. '''Note''' that on the client, this setting should
usually be the same as the <code>repoDatabase</code> setting.
;siteLinkGroups: The site groups to use in sitelinks. Must correspond to a
value used to give the site group in the MediaWiki <code>sites</code> table.
Default is array( "wikipedia" ). This defines which groups of sites can be
linked to Wikibase items. '''Note''' that this setting replaces the old
''siteLinkGroup'' setting, which only allowed for a single group.
-;specialSiteLinkGroups: This maps one or more site groups into a single
"special" group. This is useful if sites from multiple site groups should be
shown in a single "special" section on item pages, instead of one section per
site group.
+;specialSiteLinkGroups: This maps one or more site groups into a single
"special" group. This is useful if sites from multiple site groups should be
shown in a single "special" section on item pages, instead of one section per
site group. To show these site-groups you have to add the group "special" to
the '''siteLinkGroups''' setting (see above).
;localClientDatabases: An array of locally accessible client databases, for
use by the <code>dispatchChanges.php</code> script. This setting determines
which wikis changes are pushed to directly. It must be given either as an
associative array, mapping global site IDs to logical database names, or, of
the database names are the same as the site IDs, as a list of databases. The
default is an empty array, indicating no local client databases.
=== Expert Settings ===
diff --git a/extensions/Wikibase/lib/WikibaseLib.hooks.php
b/extensions/Wikibase/lib/WikibaseLib.hooks.php
index b4479cd..f406f41 100644
--- a/extensions/Wikibase/lib/WikibaseLib.hooks.php
+++ b/extensions/Wikibase/lib/WikibaseLib.hooks.php
@@ -109,11 +109,6 @@
'tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js',
'tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js',
-
'tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js',
-
'tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js',
-
-
'tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js',
-
'tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js',
),
'dependencies' => array(
'wikibase.tests.qunit.testrunner',
@@ -130,8 +125,6 @@
'wikibase.ui.PropertyEditTool',
'jquery.ui.suggester',
'jquery.wikibase.entityselector',
- 'jquery.wikibase.toolbar',
- 'jquery.wikibase.toolbareditgroup',
'jquery.NativeEventHandler',
'jquery.client',
'jquery.event.special.eachchange',
@@ -176,22 +169,11 @@
),
);
- $testModules['qunit']['jquery.wikibase.movetoolbar.tests'] =
$moduleBase + array(
- 'scripts' => array(
-
'tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js',
- ),
- 'dependencies' => array(
- 'jquery.wikibase.movetoolbar',
- 'jquery.wikibase.listview',
- ),
- );
-
$testModules['qunit']['jquery.wikibase.pagesuggester.tests'] =
$moduleBase + array(
'scripts' => array(
'tests/qunit/jquery.wikibase/jquery.wikibase.pagesuggester.tests.js'
),
'dependencies' => array(
- 'jquery',
'jquery.wikibase.pagesuggester',
),
);
@@ -237,15 +219,6 @@
'mediawiki.Title',
'jquery.valueview',
'valueFormatters'
- ),
- );
-
- $testModules['qunit']['jquery.wikibase.toolbarbase.tests'] =
$moduleBase + array(
- 'scripts' => array(
-
'tests/qunit/jquery.wikibase/toolbar/toolbarbase.tests.js',
- ),
- 'dependencies' => array(
- 'jquery.wikibase.toolbarbase',
),
);
@@ -334,6 +307,11 @@
)
);
+ $testModules['qunit'] = array_merge(
+ $testModules['qunit'],
+ include( __DIR__ .
'/tests/qunit/jquery.wikibase/toolbar/resources.php' )
+ );
+
return true;
}
}
diff --git a/extensions/Wikibase/lib/i18n/ckb.json
b/extensions/Wikibase/lib/i18n/ckb.json
index caf4c40..6610b2f 100644
--- a/extensions/Wikibase/lib/i18n/ckb.json
+++ b/extensions/Wikibase/lib/i18n/ckb.json
@@ -20,6 +20,9 @@
"wikibase-sitelinks-sitename-columnheading-special": "پێگە",
"wikibase-sitelinks-siteid-columnheading": "کۆد",
"wikibase-sitelinks-link-columnheading": "پەڕەی بەستەردراو",
+ "wikibase-snakview-snaktypeselector-somevalue": "نرخی نەزانراو",
+ "wikibase-snakview-snaktypeselector-novalue": "بێ نرخ",
"wikibase-tooltip-error-details": "وردەکارییەکان",
- "datatypes-type-wikibase-item": "بەند"
+ "datatypes-type-wikibase-item": "بەند",
+ "wikibase-add-badges": "نیشانەکان زیاد بکە"
}
diff --git a/extensions/Wikibase/lib/i18n/et.json
b/extensions/Wikibase/lib/i18n/et.json
index 3dd8a34..9cf06f2 100644
--- a/extensions/Wikibase/lib/i18n/et.json
+++ b/extensions/Wikibase/lib/i18n/et.json
@@ -83,5 +83,6 @@
"datatypes-type-commonsMedia": "Commonsi meediafail",
"version-wikibase": "Vikibaas",
"wikibase-snakformatter-valuetype-mismatch": "Väärtuse tüüp \"$1\" ei
vasta omaduse tüübile \"$2\".",
- "wikibase-snakformatter-property-not-found": "Omadust $1 ei leitud.
Kasutatavat andmetüüpi ei õnnestu määrata."
+ "wikibase-snakformatter-property-not-found": "Omadust $1 ei leitud.
Kasutatavat andmetüüpi ei õnnestu määrata.",
+ "wikibase-add-badges": "Lisa äramärkimised"
}
diff --git a/extensions/Wikibase/lib/i18n/nl.json
b/extensions/Wikibase/lib/i18n/nl.json
index dfa9dbd..56ebf73 100644
--- a/extensions/Wikibase/lib/i18n/nl.json
+++ b/extensions/Wikibase/lib/i18n/nl.json
@@ -26,7 +26,7 @@
"wikibase-diffview-alias": "aliassen",
"wikibase-diffview-description": "beschrijving",
"wikibase-diffview-link": "koppelingen",
- "wikibase-error-unexpected": "Er is een onverwachte fout opgetreden.",
+ "wikibase-error-unexpected": "Er is een onverwachte fout opgetreden:
$1.",
"wikibase-error-save-generic": "Er is een fout opgetreden tijdens het
opslaan van uw wijzigingen. Uw wijzigingen konden niet worden opgeslagen.",
"wikibase-error-remove-generic": "Er is een fout opgetreden tijdens het
verwijderen. Uw wijzigingen konden niet worden opgeslagen.",
"wikibase-error-save-connection": "Er is een fout in de verbinding
opgetreden tijdens het opslaan. Uw wijzigingen konden niet worden opgeslagen.
Controleer uw internetverbinding.",
@@ -87,5 +87,6 @@
"wikibase-validator-not-allowed": "Ongeldige waarde: $1",
"datatypes-type-wikibase-item": "Item",
"datatypes-type-commonsMedia": "Mediabestand van Commons",
- "version-wikibase": "Wikibase"
+ "version-wikibase": "Wikibase",
+ "wikibase-add-badges": "Badges toevoegen"
}
diff --git a/extensions/Wikibase/lib/i18n/pl.json
b/extensions/Wikibase/lib/i18n/pl.json
index af4d2e5..41ae70c 100644
--- a/extensions/Wikibase/lib/i18n/pl.json
+++ b/extensions/Wikibase/lib/i18n/pl.json
@@ -60,6 +60,8 @@
"wikibase-globedetails-globe": "Globus",
"wikibase-parse-error": "Nieprawidłowa wartość.",
"wikibase-parse-error-coordinate": "Wartość współrzędnych ma
nieprawidłowy format.",
+ "wikibase-parse-error-entity-id": "Identyfikator encji ma nieprawidłowy
format.",
+ "wikibase-parse-error-quantity": "Wartość ma nieprawidłowy format.",
"wikibase-parse-error-time": "Wartość czasu ma nieprawidłowy format.",
"wikibase-replicationnote": "Zwróć uwagę, że może upłynąć kilka minut,
zanim zmiany staną się widoczne na wszystkich wiki",
"wikibase-sitelinks-wikipedia": "Strony Wikipedii powiązane z tym
elementem",
@@ -83,7 +85,7 @@
"wikibase-validator-bad-entity-type": "Nieoczekiwany typ obiektu $1",
"wikibase-validator-no-such-entity": "$1 nie znaleziono",
"wikibase-validator-no-such-property": "Właściwości $1 nie została
znaleziona",
- "wikibase-validator-bad-value-type": "Zły typ wartości $1, oczekuje się
$2",
+ "wikibase-validator-bad-value-type": "Błędny typ wartości $1,
oczekiwano $2",
"wikibase-validator-bad-url": "Nieprawidłowy URL: $1",
"wikibase-validator-bad-url-scheme": "Nieobsługiwany schemat adresu
URL: $1",
"wikibase-validator-bad-http-url": "Nieprawidłowy URL HTTP: $1",
@@ -94,5 +96,6 @@
"datatypes-type-commonsMedia": "Plik multimedialny na Commons",
"version-wikibase": "Wikibase",
"wikibase-snakformatter-valuetype-mismatch": "Typ wartości „$1” nie
jest zgodny z typem właściwości „$2”.",
- "wikibase-snakformatter-property-not-found": "Właściwość „$1” nie
została znaleziona, nie można określić typ danych."
+ "wikibase-snakformatter-property-not-found": "Właściwość „$1” nie
została znaleziona, nie można określić typ danych.",
+ "wikibase-add-badges": "dodaj odznaczenia"
}
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
index d821406..b82ef05 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
@@ -11,6 +11,11 @@
* @since 0.2
*
* @example $( 'input' ).siteselector( { source: <{wb.Site[]}> } );
+ *
+ * @event selected
+ * Triggered whenever a site is selected or de-selected.
+ * (1) {jQuery.Event}
+ * (2) {string|null}
*/
$.widget( 'wikibase.siteselector', $.ui.suggester, {
/**
@@ -52,7 +57,7 @@
if( self.options.menu.element.is(
':visible' ) ) {
self._selectFirstSite();
} else {
- self._trigger( 'selected',
[null] );
+ self._trigger( 'selected',
null, [null] );
}
} );
} )
@@ -73,20 +78,24 @@
* Implicitly selects the first site from the suggested sites.
*/
_selectFirstSite: function() {
- if( this._selectedSite ) {
- // No need to select "fall-back" since a site
is selected specifically.
- return;
- }
-
var menu = this.options.menu,
menuItems = menu.option( 'items' );
if( menuItems.length > 0 && menu.element.is( ':visible'
) ) {
this.options.menu.activate( menuItems[0] );
+
+ if( this._selectedSite && this._selectedSite
=== menuItems[0].getSite() ) {
+ return;
+ }
+
this._selectedSite = menuItems[0].getSite();
}
- this._trigger( 'selected', [menuItems[0]] );
+ this._trigger(
+ 'selected',
+ null,
+ menuItems.length ?
[menuItems[0].getSite().getId()] : null
+ );
},
/**
@@ -148,28 +157,6 @@
}
},
- /**
- * @see jQuery.ui.suggester._search
- */
-/* _search: function( event ) {
- var deferred = $.Deferred();
-
- this._term = this.element.val();
-
- if( this._term.length < 1 ) {
- this._close();
- return deferred.resolve( [], this._term
).promise();
- }
-
- this.element.addClass( 'ui-suggester-loading' );
- this._pending++;
-
- var suggestions = this._getSuggestions( this._term );
- this._handleSuggestions( suggestions );
-
- return deferred.resolve( suggestions );
- },
-*/
/**
* @see jQuery.ui.suggester._getSuggestionsFromArray
*/
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
index f4b05cf..c7c80b2 100644
--- a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
+++ b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
@@ -100,11 +100,10 @@
// Look up the parent widget if defined via options:
if ( this.options.parentWidgetFullName ) {
- var namespace =
this.options.parentWidgetFullName.split( '.' )[ 0 ],
- name =
this.options.parentWidgetFullName.split( '.' )[ 1 ],
- prototype = $[ namespace ][ name
].prototype,
- parentWidgetNode =
this.element.closest( '.' + prototype.widgetBaseClass );
- this._parentWidget = parentWidgetNode.data(
prototype.widgetName );
+ var namespace =
this.options.parentWidgetFullName.split( '.' )[0],
+ name =
this.options.parentWidgetFullName.split( '.' )[1];
+ this._parentWidget = this.element.closest( ':'
+ namespace + '-' + name )
+ .data( name );
}
if (
diff --git a/extensions/Wikibase/lib/resources/templates.php
b/extensions/Wikibase/lib/resources/templates.php
index 2b26837..4e3195a 100644
--- a/extensions/Wikibase/lib/resources/templates.php
+++ b/extensions/Wikibase/lib/resources/templates.php
@@ -340,6 +340,11 @@
</tr>
HTML;
+ $templates['wb-badge'] =
+<<<HTML
+<span class="wb-badge wb-badge-$1" title="$2"></span>
+HTML;
+
$templates['wb-property-datatype'] =
<<<HTML
<div class="wb-datatype">
diff --git a/extensions/Wikibase/lib/resources/wikibase.Site.js
b/extensions/Wikibase/lib/resources/wikibase.Site.js
index 0b428ba..74218b9 100644
--- a/extensions/Wikibase/lib/resources/wikibase.Site.js
+++ b/extensions/Wikibase/lib/resources/wikibase.Site.js
@@ -117,7 +117,10 @@
* @return {string}
*/
getLanguageDirection: function() {
- return $.uls && $.uls.data.getDir( this.getLanguageCode() ) ||
'auto';
+ var languageCode = this.getLanguageCode();
+ return $.uls && $.uls.data.languages[languageCode]
+ ? $.uls.data.getDir( languageCode )
+ : 'auto';
},
/**
diff --git
a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
index 11b225a..7d06063 100644
---
a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
+++
b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
@@ -202,9 +202,9 @@
if( this._inputElem ) {
var lang = this.getSubject().attr( 'lang' ) ||
mw.config.get( 'wgUserLanguage' );
- var dir = ( $.uls && $.uls.data.getDir( lang ) )
- || this.getSubject().css( 'direction' )
- || 'auto';
+ var dir = ( $.uls && $.uls.data.languages[lang] )
+ ? $.uls.data.getDir( lang )
+ : this.getSubject().css( 'direction' ) ||
'auto';
this._inputElem.attr( 'lang', lang ).attr( 'dir', dir );
}
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
index dc79e34..354bd59 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
@@ -96,7 +96,7 @@
}
} ) );
- QUnit.test( 'getSelectedSite()', function( assert ) {
+ QUnit.test( 'getSelectedSite()', 23, function( assert ) {
var $siteSelector = newTestSiteSelector(),
siteSelector = $siteSelector.data( 'siteselector' );
@@ -114,10 +114,18 @@
{ frrwiki: 'nord' }
];
- var testString = function( string, expectedSiteId ) {
+ var testString = function( string, expectedSiteId, next ) {
$siteSelector.val( string );
QUnit.stop();
+
+ $siteSelector.one( 'siteselectorselected', function(
event, siteId ) {
+ assert.strictEqual(
+ siteId,
+ expectedSiteId,
+ 'Triggered "selected" event returning
site id: "' + siteId + '".'
+ );
+ } );
$siteSelector.one( 'siteselectoropen', function() {
// siteselector sets the selected site on the
"siteselector" open. So, defer
@@ -130,40 +138,67 @@
+ '" using input "' +
string + '".'
);
siteSelector._close();
+ QUnit.start();
+ next();
}, 0 );
} );
siteSelector.search()
.done( function( suggestions ) {
+
assert.equal(
suggestions.length > 0 ? suggestions[0]
: null,
expectedSiteId ? getSite(
expectedSiteId ) : null,
'Returned expected first suggestion "'
+ ( expectedSiteId || 'NULL' )
+ '" using input "' + string +
'".'
);
+
+ if( !suggestions.length ) {
+ QUnit.start();
+ next();
+ }
} )
.fail( function() {
QUnit.ok(
false,
'Search failed.'
);
- } )
- .always( function() {
QUnit.start();
+ next();
} );
};
+ var $queue = $( {} );
+
+ /**
+ * @param {Object} testSet
+ * @param {jQuery} $queue
+ * @return {jQuery}
+ */
+ function addToQueue( testSet, $queue ) {
+ $.each( testSet, function( siteId, string ) {
+ $queue.queue( 'tests', function( next ) {
+ testString( string, siteId, next );
+ } );
+ } );
+ return $queue;
+ }
+
for( var i = 0; i < testStrings.length; i++ ) {
- for( var siteId in testStrings[i] ) {
- testString( testStrings[i][siteId], siteId );
- }
+ $queue = addToQueue( testStrings[i], $queue );
}
// Reset selected site by clearing input:
- testString( '', null );
+ $queue.queue( 'tests', function( next ) {
+ testString( '', null, next );
+ } );
- testString( 'doesnotexist', null );
+ $queue.queue( 'tests', function( next ) {
+ testString( 'doesnotexist', null, next );
+ } );
+
+ $queue.dequeue( 'tests' );
} );
QUnit.test( 'Item constructor', function( assert ) {
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
index cec29f7..4004caa 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
@@ -1,6 +1,4 @@
/**
- * @since 0.4
- *
* @licence GNU GPL v2+
* @author H. Snater < [email protected] >
*/
@@ -48,7 +46,7 @@
return $listview;
}
- QUnit.module( 'jquery.wikibase.movetoolbar', QUnit.newWbEnvironment( {
+ QUnit.module( 'jquery.wikibase.movetoolbar', QUnit.newMwEnvironment( {
setup: function() {
/**
* Basic widget to be used as list item.
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/resources.php
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/resources.php
new file mode 100644
index 0000000..34644fd
--- /dev/null
+++ b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/resources.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater < [email protected] >
+ *
+ * @codeCoverageIgnoreStart
+ */
+return call_user_func( function() {
+
+ $remoteExtPathParts = explode(
+ DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR,
__DIR__, 2
+ );
+ $moduleTemplate = array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => $remoteExtPathParts[1],
+ );
+
+ $resources = array(
+
+ 'jquery.wikibase.movetoolbar.tests' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'movetoolbar.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.movetoolbar',
+ 'jquery.wikibase.listview',
+ ),
+ ),
+
+ 'jquery.wikibase.toolbar.tests' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'toolbar.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.toolbar',
+ 'jquery.wikibase.toolbarbutton',
+ 'jquery.wikibase.toolbarlabel',
+ 'wikibase.utilities',
+ ),
+ ),
+
+ 'jquery.wikibase.toolbarbase.tests' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'toolbarbase.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.toolbarbase',
+ ),
+ ),
+
+ 'jquery.wikibase.toolbarbutton.tests' => $moduleTemplate +
array(
+ 'scripts' => array(
+ 'toolbarbutton.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.toolbarbutton',
+ 'wikibase.templates',
+ ),
+ ),
+
+ 'jquery.wikibase.toolbareditgroup.tests' => $moduleTemplate +
array(
+ 'scripts' => array(
+ 'toolbareditgroup.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.toolbar',
+ 'jquery.wikibase.toolbarbutton',
+ 'jquery.wikibase.toolbareditgroup',
+ ),
+ ),
+
+ 'jquery.wikibase.toolbarlabel.tests' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'toolbarlabel.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.wikibase.toolbarlabel',
+ ),
+ ),
+
+ );
+
+ return $resources;
+} );
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
index cc21cb1..56256ea 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js
@@ -1,6 +1,4 @@
/**
- * @since 0.1
- *
* @licence GNU GPL v2+
* @author H. Snater < [email protected] >
*/
@@ -8,7 +6,7 @@
( function( wb, $, QUnit ) {
'use strict';
- QUnit.module( 'jQuery.wikibase.toolbar', QUnit.newWbEnvironment( {} ) );
+ QUnit.module( 'jQuery.wikibase.toolbar', QUnit.newMwEnvironment() );
QUnit.test( 'Init and destroy', function( assert ) {
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
index c7a7a40..4799363 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js
@@ -1,6 +1,4 @@
/**
- * @since 0.4
- *
* @licence GNU GPL v2+
* @author H. Snater < mediawiki at snater.com >
*/
@@ -22,7 +20,7 @@
.toolbarbutton( options );
};
- QUnit.module( 'jquery.wikibase.toolbarbutton', QUnit.newWbEnvironment( {
+ QUnit.module( 'jquery.wikibase.toolbarbutton', QUnit.newMwEnvironment( {
teardown: function() {
$( '.test_button' ).each( function( i, node ) {
var $node = $( node );
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js
index ea8d0dd..79df68b 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js
@@ -6,7 +6,7 @@
( function( $, QUnit ) {
'use strict';
- QUnit.module( 'jQuery.wikibase.toolbareditgroup',
QUnit.newWbEnvironment() );
+ QUnit.module( 'jQuery.wikibase.toolbareditgroup',
QUnit.newMwEnvironment() );
QUnit.test( 'Create & Destroy', function( assert ) {
var $editGroup = $( '<span/>' ).toolbareditgroup(),
diff --git
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
index bc58fc9..279591d 100644
---
a/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
+++
b/extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js
@@ -1,6 +1,4 @@
/**
- * @since 0.4
- *
* @licence GNU GPL v2+
* @author H. Snater < [email protected] >
*/
@@ -23,7 +21,7 @@
.toolbarlabel( options );
};
- QUnit.module( 'jquery.wikibase.toolbarlabel', QUnit.newWbEnvironment( {
+ QUnit.module( 'jquery.wikibase.toolbarlabel', QUnit.newMwEnvironment( {
teardown: function() {
$( '.test_label' ).each( function( i, node ) {
var $node = $( node );
diff --git a/extensions/Wikibase/repo/config/Wikibase.example.php
b/extensions/Wikibase/repo/config/Wikibase.example.php
index da57272..5377581 100644
--- a/extensions/Wikibase/repo/config/Wikibase.example.php
+++ b/extensions/Wikibase/repo/config/Wikibase.example.php
@@ -51,6 +51,20 @@
$wgGroupPermissions['wbeditor']['item-set'] = true;
$wgWBRepoSettings['normalizeItemByTitlePageNames'] = true;
+
+ // the special group includes all the sites in the
specialSiteLinkGroups,
+ // grouped together in a 'Pages linked to other sites' section.
+ $wgWBRepoSettings['siteLinkGroups'] = array(
+ 'wikipedia',
+ 'wikinews',
+ 'wikiquote',
+ 'wikisource',
+ 'wikivoyage',
+ 'special'
+ );
+
+ // these are the site_group codes as listed in the sites table
+ $wgWBRepoSettings['specialSiteLinkGroups'] = array( 'commons',
'wikidata' );
} );
diff --git a/extensions/Wikibase/repo/i18n/ckb.json
b/extensions/Wikibase/repo/i18n/ckb.json
index b4f7c34..d534269 100644
--- a/extensions/Wikibase/repo/i18n/ckb.json
+++ b/extensions/Wikibase/repo/i18n/ckb.json
@@ -38,12 +38,9 @@
"wikibase-snakview-variations-somevalue-label": "نرخی نەزانراو",
"wikibase-snakview-variations-novalue-label": "بێ نرخ",
"wikibase-snakview-snaktypeselector-value": "نرخی ڕاسپێردراو",
- "wikibase-snakview-snaktypeselector-somevalue": "نرخی نەزانراو",
- "wikibase-snakview-snaktypeselector-novalue": "بێ نرخ",
"wikibase-entityselector-more": "زیاتر",
"wikibase-anonymouseditwarning": "ھۆشیار بە: نەچوویتە
ژوورەوە.\nناونیشانی IPی تۆ لە مێژووی دەستکارییەکانی ئەم $1ەدا تۆمار دەکرێت.",
"wikibase-blockeduser-tooltip-message": "تۆ بەربەستکراوی بۆ
دەستکاریکردن.",
- "wikibase-error-sitelink-already-used": "بەستەری پێگەی [$1 $2] پێشتر لە
بەندی [[$3]]دا بەکارگیراوە.",
"special-itembytitle": "بەندەکان بە پێی سەردێڕ",
"wikibase-itembytitle-lookup-fieldset": "گەڕانی بەندەکان بە پێی پێگە و
سەردێڕ",
"wikibase-itembytitle-lookup-site": "پێگە:",
@@ -80,6 +77,7 @@
"wikibase-setaliases-introfull": "تۆ خەریکی دانانی نازناوی بە $2 بۆ
[[$1]]. چەند نازناو بە <code>|</code> جیا دەکرێتەوە.",
"wikibase-setaliases-label": "نازناوەکان:",
"wikibase-setaliases-submit": "نازناوەکان دابنێ",
+ "wikibase-setsitelink-badges": "نیشانەکان:",
"wikibase-modifyentity-id": "پێناسە:",
"wikibase-modifyterm-language": "زمان:",
"wikibase-dispatchstats-change-id": "پێناسە",
@@ -117,7 +115,7 @@
"wikibase-property-summary-wbsetaliases-add":
"{{PLURAL:$1|نازناو|نازناوەکان}}ی [$2] زیاد کرا",
"wikibase-property-summary-wbsetaliases-remove":
"{{PLURAL:$1|نازناو|نازناوەکان}}ی [$2] سڕایەوە",
"wikibase-listdatatypes-wikibase-item-head": "بەند",
- "wikibase-listdatatypes-multilingual-text-head": "دەقی فرەزمانی",
+ "wikibase-listdatatypes-multilingualtext-head": "دەقی فرەزمانی",
"wikibase-listdatatypes-string-head": "زنجیرەنووسە",
"wikibase-listdatatypes-time-head": "کات"
}
diff --git a/extensions/Wikibase/repo/i18n/et.json
b/extensions/Wikibase/repo/i18n/et.json
index d3fe628..85a44e0 100644
--- a/extensions/Wikibase/repo/i18n/et.json
+++ b/extensions/Wikibase/repo/i18n/et.json
@@ -32,6 +32,7 @@
"wikibase-terms": "Teistes keeltes",
"wikibase-sitelinks-empty": "Ükski lehekülg pole veel selle üksusega
lingitud.",
"wikibase-sitelinks-input-help-message": "Määra selle üksusega seotud
leheküljele viitav link.",
+ "wikibase-sitelinks-special": "Sellele üksusele viitavad leheküljed
teistes võrgukohtades",
"wikibase-remove": "eemalda",
"wikibase-move-up": "liiguta üles",
"wikibase-move-down": "liiguta alla",
@@ -92,6 +93,11 @@
"wikibase-itembytitle-lookup-page": "Lehekülg:",
"wikibase-itembytitle-submit": "Otsi",
"wikibase-itembytitle-create": "Saad üksuse ka
[{{fullurl:Special:NewItem|site=$1&page=$2}} luua].",
+ "special-gotolinkedpage": "Minek lingitud leheküljele",
+ "wikibase-gotolinkedpage-lookup-fieldset": "Minek leheküljele võrgukoha
ja üksuse järgi",
+ "wikibase-gotolinkedpage-lookup-site": "Võrgukoht:",
+ "wikibase-gotolinkedpage-lookup-item": "Üksuse ID:",
+ "wikibase-gotolinkedpage-submit": "Mine",
"special-itemdisambiguation": "Sama sildiga üksuste eristamine",
"wikibase-itemdisambiguation-lookup-fieldset": "Üksuste otsimine keele
ja sildi järgi",
"wikibase-itemdisambiguation-lookup-language": "Keel:",
@@ -139,6 +145,7 @@
"special-setsitelink": "Võrgukohalingi määramine",
"wikibase-setsitelink-introfull": "Määrad $2 keeles üksuse [[$1]]
võrgukohalinki.",
"wikibase-setsitelink-intro": "See vorm võimaldab määrata üksuse
võrgukohalingi. Sul tuleb ära tuua üksuse identifikaator (nt Q23), võrgukoha
identifikaator (nt \"et\") ja soovitud võrgukohalink.",
+ "wikibase-setsitelink-intro-badges": "Lisaks saad selle võrgukohalingi
juurde lisada erinevaid äramärkimisi, mis on loetletud allpool.",
"wikibase-setsitelink-site": "Võrgukoha identifikaator:",
"wikibase-setsitelink-label": "Võrgukohalink:",
"wikibase-setsitelink-badges": "Märgistused:",
@@ -146,6 +153,7 @@
"wikibase-setsitelink-warning-remove": "Kas soovid tõesti üksuse [[$1]]
võrgukohalingi eemaldada?",
"wikibase-setsitelink-invalid-site": "Võrgukoha identifikaator \"$1\"
on tundmatu. Palun kasuta olemasolevat võrgukoha identifikaatorit nagu
\"etwiki\".",
"wikibase-setsitelink-not-item": "$1 pole üksuse identifikaator.",
+ "wikibase-setsitelink-not-badge": "Üksus $1 pole äramärkimine.",
"wikibase-setsitelink-add-failed": "Võrgukohalinki ei õnnestunud
salvestada.",
"wikibase-setsitelink-remove-failed": "Võrgukohalinki ei õnnestunud
eemaldada.",
"wikibase-modifyentity-id": "Identifikaator:",
diff --git a/extensions/Wikibase/repo/i18n/fi.json
b/extensions/Wikibase/repo/i18n/fi.json
index 90bac07..ff0b00e 100644
--- a/extensions/Wikibase/repo/i18n/fi.json
+++ b/extensions/Wikibase/repo/i18n/fi.json
@@ -43,6 +43,7 @@
"wikibase-terms": "Muilla kielillä",
"wikibase-sitelinks-empty": "Tässä kohteessa ei vielä ole sivua
linkitettynä.",
"wikibase-sitelinks-input-help-message": "Aseta linkki tähän kohteeseen
liittyvälle sivulle.",
+ "wikibase-sitelinks-special": "Tähän kohteeseen linkitetyt muiden
sivustojen sivut",
"wikibase-remove": "poista",
"wikibase-move-up": "siirrä ylös",
"wikibase-move-down": "siirrä alas",
@@ -99,10 +100,14 @@
"wikibase-wikibaserepopage-invalid-id": "Tunniste \"$1\" on
järjestelmälle tuntematon. Käytä kelvollista tunnistetta.",
"special-itembytitle": "Hae kohdetta otsikolla",
"wikibase-itembytitle-lookup-fieldset": "Etsi kohteita sivuston ja
otsikon mukaan",
- "wikibase-itembytitle-lookup-site": "Sivusto:",
- "wikibase-itembytitle-lookup-page": "Sivu:",
+ "wikibase-itembytitle-lookup-site": "Sivusto",
+ "wikibase-itembytitle-lookup-page": "Sivu",
"wikibase-itembytitle-submit": "Etsi",
"wikibase-itembytitle-create": "Voit myös
[{{fullurl:Special:NewItem|site=$1&page=$2}} luoda kohteen].",
+ "special-gotolinkedpage": "Siirry linkitetylle sivulle",
+ "wikibase-gotolinkedpage-lookup-site": "Sivusto",
+ "wikibase-gotolinkedpage-lookup-item": "Kohteen tunniste",
+ "wikibase-gotolinkedpage-submit": "Siirry",
"special-itemdisambiguation": "Kohdetäsmennys",
"wikibase-itemdisambiguation-lookup-fieldset": "Hae kohteita kielen ja
nimen mukaan",
"wikibase-itemdisambiguation-lookup-language": "Kieli",
@@ -111,7 +116,7 @@
"wikibase-itemdisambiguation-nothing-found": "Valitettavasti kohdetta
tällä nimellä ei löytynyt.",
"wikibase-itemdisambiguation-search": "Voit
[{{fullurl:Special:Search|search=$1}} etsiä kohdetta].",
"wikibase-itemdisambiguation-create": "Voit
[{{fullurl:Special:NewItem|label=$1}} luoda kohteen].",
- "wikibase-itemdisambiguation-invalid-langcode": "Valitettavasti
järjestelmä ei tunne antamaasi kielitunnistetta. Käytä kelvollista tunnistetta
kuten \"fi\".",
+ "wikibase-itemdisambiguation-invalid-langcode": "Valitettavasti
järjestelmä ei tunne antamaasi kielikoodia. Käytä kelvollista kielikoodia kuten
\"fi\".",
"wikibase-itemdisambiguation-description": "Hakuun käytettyjen arvojen
tulee olla niiden kokonaisia tekstejä. Kieli tarkoittaa tunnusta, kuten
\"fi\".",
"special-newproperty": "Luo uusi ominaisuus",
"wikibase-newproperty-summary":
"[[Special:PropertyDisambiguation|Tarkista, onko ominaisuus jo olemassa]]!<br
/>Sinun tulee lisätä [[Help:Label|nimi]] ja [[Help:Description|kuvaus]]
kaikille uusille ominaisuuksille sekä lisäksi kelvollinen tietotyyppi.",
@@ -149,7 +154,8 @@
"wikibase-setaliases-warning-remove": "Haluatko todella poistaa kaikki
aliakset aiheesta [[$1]]?",
"special-setsitelink": "Aseta sivustolinkki",
"wikibase-setsitelink-introfull": "Olet asettamassa sivustolla $2
olevaa linkkiä kohteeseen [[$1]].",
- "wikibase-setsitelink-intro": "Tällä lomakkeella voit asettaa
sivustolinkin aiheelle. Sinun täytyy antaa aiheen tunniste (esim. Q23),
sivuston tunniste (esim. \"fiwiki\") ja sivustolinkki, jonka haluat asettaa.",
+ "wikibase-setsitelink-intro": "Tällä lomakkeella voit asettaa
sivustolinkin kohteeseen. Sinun täytyy antaa kohteen tunniste (esim. Q23),
sivuston tunniste (esim. \"fiwiki\") ja sivustolinkki, jonka haluat asettaa.",
+ "wikibase-setsitelink-intro-badges": "Lisäksi voit asettaa tälle
sivustolinkille eri merkkejä, jotka on lueteltu alla.",
"wikibase-setsitelink-site": "Sivuston tunniste:",
"wikibase-setsitelink-label": "Sivustolinkki",
"wikibase-setsitelink-badges": "Merkit:",
@@ -217,8 +223,10 @@
"wikibase-no-direct-editing": "Sivun lähdekoodin muokkaaminen on
poistettu käytöstä nimiavaruudessa $1",
"wikibase-noentity": "Valitsemaasi datakokonaisuutta ei löytynyt.\nVoit
<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}}
selata sivuun liittyviä lokeja]</span> ottaaksesi selvää, mitä sille on
tapahtunut.",
"wikibase-noentity-createone": "Voit myös [[$1|luoda uuden]].",
+ "wikibase-special-mergeitems-error-prefix": "Kohteita ei voitu
yhdistää. Tapahtui seuraava virhe:",
"wikibase-item-summary-wbsetitem": "Uusi kohde luotiin",
"wikibase-item-summary-wbcreate-new": "Uusi kohde luotiin",
+ "wikibase-item-summary-wbcreateredirect": "Uudelleenohjattu sivulle $4",
"wikibase-item-summary-wbeditentity": "Uusi kohde luotiin",
"wikibase-item-summary-wbeditentity-create": "Uusi kohde luotiin",
"wikibase-item-summary-wbeditentity-update": "Kohde muutettu",
@@ -227,18 +235,21 @@
"wikibase-item-summary-wbsetreference-add": "Lisätty lähde väitteelle",
"wikibase-item-summary-wbsetreference-set": "Muutettu väitteen
lähdettä",
"wikibase-item-summary-wbsetlabel-add": "Lisätty [$2]-nimi",
- "wikibase-item-summary-wbsetlabel-set": "[$2]-nimi muutettu",
- "wikibase-item-summary-wbsetlabel-remove": "[$2]-nimi poistettu",
+ "wikibase-item-summary-wbsetlabel-set": "Muutettu [$2]-nimi",
+ "wikibase-item-summary-wbsetlabel-remove": "Poistettu [$2]-nimi",
"wikibase-item-summary-wbsetdescription-add": "Lisätty [$2]-kuvaus",
- "wikibase-item-summary-wbsetdescription-set": "[$2]-kuvaus muutettu",
- "wikibase-item-summary-wbsetdescription-remove": "[$2]-kuvaus
poistettu",
+ "wikibase-item-summary-wbsetdescription-set": "Muutettu [$2]-kuvaus",
+ "wikibase-item-summary-wbsetdescription-remove": "Poistettu
[$2]-kuvaus",
"wikibase-item-summary-wbsetaliases-set": "Asetettiin
[$2]-{{PLURAL:$1|alias|aliaksia}}",
"wikibase-item-summary-wbsetaliases-add-remove": "Lisätty ja poistettu
[$2]-{{PLURAL:$1|alias|aliaksia}}",
"wikibase-item-summary-wbsetaliases-add": "Lisätty [$2]
{{PLURAL:$1|alias|aliasta}}",
"wikibase-item-summary-wbsetaliases-remove": "Poistettu [$2]
{{PLURAL:$1|alias|aliasta}}",
- "wikibase-item-summary-wbsetsitelink-add": "[$2]-linkki lisättiin",
- "wikibase-item-summary-wbsetsitelink-set": "[$2]-linkki muutettiin",
- "wikibase-item-summary-wbsetsitelink-remove": "[$2]-linkki poistettiin",
+ "wikibase-item-summary-wbsetsitelink-add": "Lisättiin [$2]-linkki",
+ "wikibase-item-summary-wbsetsitelink-add-both": "Lisätty [$2]-linkki
merkkeineen",
+ "wikibase-item-summary-wbsetsitelink-set": "Muutettu [$2]-linkki",
+ "wikibase-item-summary-wbsetsitelink-set-badges": "Muutettu
[$2]-merkkejä",
+ "wikibase-item-summary-wbsetsitelink-set-both": "Muutettu [$2]-linkki
ja merkkejä",
+ "wikibase-item-summary-wbsetsitelink-remove": "Poistettu [$2]-linkki",
"wikibase-item-summary-wblinktitles-create": "Kohde luotu yhdistämään
sivut",
"wikibase-item-summary-wblinktitles-connect": "Lisättiin kielilinkki
yhdistämään sivuja",
"wikibase-item-summary-wbcreateclaim-value":
"{{PLURAL:$1|Väite|Väitteitä}} luotu",
@@ -267,15 +278,15 @@
"wikibase-property-summary-wbeditentity-update": "Ominaisuus muutettu",
"wikibase-property-summary-wbeditentity-override": "Ominaisuus
korvattu",
"wikibase-property-summary-wbsetlabel-add": "Lisätty [$2]-nimi",
- "wikibase-property-summary-wbsetlabel-set": "[$2]-nimeä muutettiin",
- "wikibase-property-summary-wbsetlabel-remove": "[$2]-nimi poistettiin",
+ "wikibase-property-summary-wbsetlabel-set": "Muutettu [$2]-nimi",
+ "wikibase-property-summary-wbsetlabel-remove": "Poistettu [$2]-nimi",
"wikibase-property-summary-wbsetdescription-add": "Lisätty [$2]-kuvaus",
- "wikibase-property-summary-wbsetdescription-set": "[$2]-kuvausta
muutettiin",
- "wikibase-property-summary-wbsetdescription-remove": "[$2]-kuvaus
poistettiin",
- "wikibase-property-summary-wbsetaliases-set":
"[$2]-{{PLURAL:$1|alias|aliaksia}} asetettiin",
- "wikibase-property-summary-wbsetaliases-add-remove":
"[$2]-{{PLURAL:$1|alias|aliaksia}} lisättiin ja/tai poistettiin",
- "wikibase-property-summary-wbsetaliases-add":
"[$2]-{{PLURAL:$1|alias|aliaksia}} lisättiin",
- "wikibase-property-summary-wbsetaliases-remove":
"[$2]-{{PLURAL:$1|alias|aliaksia}} poistettiin",
+ "wikibase-property-summary-wbsetdescription-set": "Muutettu
[$2]-kuvaus",
+ "wikibase-property-summary-wbsetdescription-remove": "Poistettu
[$2]-kuvaus",
+ "wikibase-property-summary-wbsetaliases-set": "Asetettu
[$2]-{{PLURAL:$1|alias|aliaksia}}",
+ "wikibase-property-summary-wbsetaliases-add-remove": "Lisättiin ja
poistettiin [$2]-{{PLURAL:$1|alias|aliaksia}}",
+ "wikibase-property-summary-wbsetaliases-add": "Lisätty
[$2]-{{PLURAL:$1|alias|aliaksia}}",
+ "wikibase-property-summary-wbsetaliases-remove": "Poistettu
[$2]-{{PLURAL:$1|alias|aliaksia}}",
"wikibase-property-summary-special-create-property": "[$2]-ominaisuus
luotiin {{PLURAL:$1|arvolla|arvoilla}}",
"wikibase-listdatatypes-wikibase-item-head": "Kohde",
"wikibase-listdatatypes-commonsmedia-head": "Commons-media",
@@ -286,6 +297,7 @@
"wikibase-listdatatypes-string-head": "Merkkijono",
"wikibase-listdatatypes-time-head": "Aika",
"wikibase-listdatatypes-url-head": "URL",
+ "wikibase-concept-uri": "Käsitteen URI",
"datatypes-type-url": "URL",
"content-model-wikibase-item": "Wikibase-kohde",
"content-model-wikibase-property": "Wikibase-ominaisuus",
diff --git a/extensions/Wikibase/repo/i18n/ka.json
b/extensions/Wikibase/repo/i18n/ka.json
index d1b2c00..5e1dfa8 100644
--- a/extensions/Wikibase/repo/i18n/ka.json
+++ b/extensions/Wikibase/repo/i18n/ka.json
@@ -12,7 +12,7 @@
"wikibase-cancel": "გაუქმება",
"wikibase-add": "დამატება",
"wikibase-addqualifier": "შესარჩევის დამატება",
- "wikibase-addreference": "წყაროს დამატება",
+ "wikibase-addreference": "სქოლიოს დამატება",
"wikibase-save-inprogress": "ინახება...",
"wikibase-remove-inprogress": "იშლება...",
"wikibase-label-empty": "სახელი ჯერ არ არის განსაზღვრული",
@@ -26,7 +26,6 @@
"wikibase-description-input-help-message": "დაამატეთ მოკლე აღწერა
შემდეგ ენაზე: $1.",
"wikibase-statements": "ფაქტები",
"wikibase-terms": "სხვა ენებზე",
- "wikibase-sitelinks-add": "საიტის გვერდზე ბმულის დამატება",
"wikibase-sitelinks-empty": "საიტის არცერთ გვერდს არ აქვს აქ ბმული.",
"wikibase-sitelinks-input-help-message": "ამ ელემენტთან დაკავშირებულ
გვერდზე ბმულის დაყენება.",
"wikibase-remove": "წაშლა",
@@ -58,8 +57,6 @@
"wikibase-snakview-variations-somevalue-label": "უცნობი მნიშვნელობა",
"wikibase-snakview-variations-novalue-label": "მნიშვნელობა არ არის
მითითებული",
"wikibase-snakview-snaktypeselector-value": "საკუთარი მნიშვნელობა",
- "wikibase-snakview-snaktypeselector-somevalue": "უცნობი მნიშვნელობა",
- "wikibase-snakview-snaktypeselector-novalue": "მნიშვნელობა არ არის
მითითებული",
"wikibase-shortcopyrightwarning": "ღილაკზე „$1“ დაწკაპუნებით, თქვენ
ეთანხმებით [[$2|გამოყენების პირობებს]] და თქვენ შეუქცევადად ეთანხმებით თქვენი
წვლილის გამოქვეყნებას შემდეგი პირობით $3.",
"wikibase-copyrighttooltip-acknowledge": "მე ვეთანხმები ამ პირობებს
ჩემი მომავალი რედაქტირებებისათვის. აღარ მაჩვენოთ ეს შეტყობინება.",
"wikibase-entityselector-more": "მეტი",
@@ -67,16 +64,12 @@
"wikibase-restrictionedit-tooltip-message": "ეს გვერდი დაცულია. მისი
რედაქტირება დაუშვებელია.",
"wikibase-blockeduser-tooltip-message": "თქვენთვის რედაქტირება
დაბლოკილია.",
"wikibase-move-error": "თქვენ არ შეგიძლიათ გვერდების გადატანა, რომლებიც
მდებარეობს მონაცემების სახელთა სივრცეში და თქვენ არ შეგიძლიათ გვერდების მასში
გადატანა.",
- "wikibase-error-sitelink-already-used": "საიტის ბმულს [$1 $2] უკვე
იყენებს ელემენტი [[$3]].",
"wikibase-wikibaserepopage-invalid-langcode": "ენის კოდი „$1“ უცნობია.
გთხოვთ, გამოიყენოთ სისტემისთვის ცნობილი ერთ-ერთი ენის კოდი, მაგალითად „ka“.",
"special-itembytitle": "ელემენტი სათაურის მიხედვით",
"wikibase-itembytitle-lookup-fieldset": "ელემენტების ძიება საიტისა და
სახელწოდების მიხედვით",
"wikibase-itembytitle-lookup-site": "ვებ-გვერდი:",
"wikibase-itembytitle-lookup-page": "გვერდი:",
"wikibase-itembytitle-submit": "ძიება",
- "wikibase-itembytitle-nothing-found": "წინა ძიებისას ვერცერთი ელემენტი
ვერ მოიძებნა. დააზუსტეთ მოთხოვნა გარე გვერდის უკეთესი იდენტიფიცირებისათვის.",
- "wikibase-itembytitle-invalid-site": "წინა მოთხოვნის გამოყენება
საძიებოდ შეუძლებელია. გთხოვთ, მიუთითოთ საიტის სწორი იდენტიფიკატორი.",
- "wikibase-itembytitle-description": "საიტი არის საიდენტიფიკაციო კოდი,
როგორიცაა მაგალითად \"kawiki\".",
"wikibase-itembytitle-create": "თქვენ აგრეთვე შეგიძლიათ
[{{fullurl:Special:NewItem|site=$1&page=$2}} შექმნათ ელემენტი].",
"special-itemdisambiguation": "ელემენტის მრავალმნიშვნელობა",
"wikibase-itemdisambiguation-lookup-fieldset": "ელემენტების ძიება ენისა
და სახელის მიხედვით",
@@ -157,7 +150,7 @@
"wikibase-item-summary-wbcreate-new": "ახალი ელემენტის შექმნა",
"wikibase-item-summary-wbeditentity": "შექმნილია ახალი ელემენტი",
"wikibase-item-summary-wbeditentity-create": "შექმნილია ახალი ელემენტი",
- "wikibase-item-summary-wbeditentity-update": "ელემენტი განახლებულია",
+ "wikibase-item-summary-wbeditentity-update": "ელემენტი შეიცვალა",
"wikibase-item-summary-wbsetlabel-set": "შეცვლილია სახელი [$2]",
"wikibase-item-summary-wbsetlabel-remove": "წაშლილია სახელი [$2]",
"wikibase-item-summary-wbsetdescription-set": "შეცვლილია აღწერა [$2]",
@@ -181,7 +174,7 @@
"wikibase-item-summary-wbremoveclaims-remove": "წაიშალა
{{PLURAL:$1|განცხადება}}",
"wikibase-property-summary-wbcreate-new": "შეიქმნა ახალი თვისება",
"wikibase-property-summary-wbeditentity-create": "შექმნილია ახალი
თვისება",
- "wikibase-property-summary-wbeditentity-update": "თვისება განახლებულია",
+ "wikibase-property-summary-wbeditentity-update": "თვისება განახლდა",
"wikibase-property-summary-wbeditentity-override": "თვისების
მნიშვნელობა გასუფთავებულია",
"wikibase-property-summary-wbsetlabel-set": "შეცვლილია [$2] სახელი",
"wikibase-property-summary-wbsetlabel-remove": "წაშლილია [$2] სახელი",
@@ -196,8 +189,8 @@
"wikibase-listdatatypes-commonsmedia-head": "ვიკისაწყობის მედიაფაილი",
"wikibase-listdatatypes-globe-coordinate-head": "გლობალური
კოორდინატები",
"wikibase-listdatatypes-quantity-head": "რაოდენობა",
- "wikibase-listdatatypes-monolingual-text-head": "ერთენოვანი ტექსტი",
- "wikibase-listdatatypes-multilingual-text-head": "მრავალენოვანი ტექსტი",
+ "wikibase-listdatatypes-monolingualtext-head": "ერთენოვანი ტექსტი",
+ "wikibase-listdatatypes-multilingualtext-head": "მრავალენოვანი ტექსტი",
"wikibase-listdatatypes-string-head": "ველი",
"wikibase-listdatatypes-time-head": "დრო",
"wikibase-listdatatypes-url-head": "URL",
diff --git a/extensions/Wikibase/repo/i18n/nl.json
b/extensions/Wikibase/repo/i18n/nl.json
index 5dc5cec..c4286bd 100644
--- a/extensions/Wikibase/repo/i18n/nl.json
+++ b/extensions/Wikibase/repo/i18n/nl.json
@@ -40,13 +40,14 @@
"wikibase-sitelink-site-edit-placeholder": "site",
"wikibase-sitelink-page-edit-placeholder": "pagina",
"wikibase-alias-edit-placeholder": "geef een alias op",
- "wikibase-label-input-help-message": "Geef de naam van deze gegevensset
in in $1.",
+ "wikibase-label-input-help-message": "Geef de naam van deze entiteit op
in $1.",
"wikibase-description-input-help-message": "Geef een korte beschrijving
in in $1.",
"wikibase-statements": "Verklaringen",
"wikibase-attributes": "Eigenschappen",
"wikibase-terms": "In andere talen",
- "wikibase-sitelinks-empty": "Er zijn nog geen sitepagina's voor dit
item.",
+ "wikibase-sitelinks-empty": "Er is nog geen pagina gekoppeld aan dit
item.",
"wikibase-sitelinks-input-help-message": "Geef een koppeling op naar
een pagina over dit item.",
+ "wikibase-sitelinks-special": "Pagina's op andere sites die gekoppeld
zijn aan dit item",
"wikibase-remove": "verwijderen",
"wikibase-move-up": "omhoog",
"wikibase-move-down": "omlaag",
@@ -107,6 +108,8 @@
"wikibase-itembytitle-lookup-page": "Pagina:",
"wikibase-itembytitle-submit": "Zoeken",
"wikibase-itembytitle-create": "U kunt ook
[{{fullurl:Special:NewItem|site=$1&page=$2}} een item aanmaken].",
+ "wikibase-gotolinkedpage-lookup-site": "Site:",
+ "wikibase-gotolinkedpage-submit": "OK",
"special-itemdisambiguation": "Items disambigueren",
"wikibase-itemdisambiguation-lookup-fieldset": "Naar items zoeken op
taal en label",
"wikibase-itemdisambiguation-lookup-language": "Taal:",
@@ -123,7 +126,7 @@
"wikibase-newproperty-datatype": "Gegevenstype:",
"wikibase-newproperty-invalid-datatype": "Er is een ongeldig
gegevenstype opgegeven.",
"special-newitem": "Nieuw item aanmaken",
- "wikibase-newitem-summary": "Zorg ervoor dat u
[[Special:ItemByTitle|controleert of de eigenschap al bestaat]]!<br />U moet
een [[Help:Label|label]] en een [[Help:Description|beschrijving]] opgeven voor
alle nieuwe items.",
+ "wikibase-newitem-summary": "Zorg ervoor dat u
[[Special:ItemByTitle|controleert of het item al bestaat]]!<br />U moet een
[[Help:Label|label]] en een [[Help:Description|beschrijving]] opgeven voor alle
nieuwe items.",
"wikibase-newitem-fieldset": "Nieuw item aanmaken",
"wikibase-newitem-site": "Site van de eerste gekoppelde pagina",
"wikibase-newitem-page": "Naam van de eerste gekoppelde pagina",
@@ -153,7 +156,7 @@
"wikibase-setaliases-warning-remove": "Wilt u echt alle aliassen
verwijderen van [[$1]]?",
"special-setsitelink": "Sitekoppeling instellen",
"wikibase-setsitelink-introfull": "U bent de sitekoppeling van $2 voor
[[$1]] aan het instellen.",
- "wikibase-setsitelink-intro": "Met dit formulier kunt u de
sitekoppeling van een entiteit instellen. U moet het ID van de entiteit opgeven
(bijvoorbeeld Q23), een site-ID (bijvoorbeeld \"nwiki\") en de in te stellen
sitekoppeling.",
+ "wikibase-setsitelink-intro": "Met dit formulier kunt u de
sitekoppeling van een item instellen. U moet het ID van het item opgeven
(bijvoorbeeld Q23), een site-ID (bijvoorbeeld \"nwiki\") en de in te stellen
sitekoppeling.",
"wikibase-setsitelink-site": "Site-ID:",
"wikibase-setsitelink-label": "Sitekoppeling:",
"wikibase-setsitelink-badges": "Badges",
@@ -228,6 +231,7 @@
"wikibase-special-mergeitems-error-prefix": "De items konden niet
samengevoegd worden. De volgende fout is opgetreden:",
"wikibase-item-summary-wbsetitem": "Nieuw item aangemaakt",
"wikibase-item-summary-wbcreate-new": "Nieuw item aangemaakt",
+ "wikibase-item-summary-wbcreateredirect": "Doorverwezen naar $4",
"wikibase-item-summary-wbeditentity": "Nieuw item aangemaakt",
"wikibase-item-summary-wbeditentity-create": "Nieuw item gemaakt",
"wikibase-item-summary-wbeditentity-update": "Een item bijgewerkt",
@@ -246,10 +250,10 @@
"wikibase-item-summary-wbsetaliases-add": "{{PLURAL:$1|Alias|$1
aliassen}} voor [$2] toegevoegd en verwijderd",
"wikibase-item-summary-wbsetaliases-remove": "{{PLURAL:$1|Alias|$1
aliassen}} voor [$2] verwijderd",
"wikibase-item-summary-wbsetsitelink-add": "Koppeling toegevoegd voor
[$2]",
- "wikibase-item-summary-wbsetsitelink-add-both": "Koppeling met insignes
toegevoegd aan [$2]",
+ "wikibase-item-summary-wbsetsitelink-add-both": "Koppeling met badges
toegevoegd aan [$2]",
"wikibase-item-summary-wbsetsitelink-set": "Koppeling naar [$2]
gewijzigd",
- "wikibase-item-summary-wbsetsitelink-set-badges": "Insignes voor [$2]
gewijzigd",
- "wikibase-item-summary-wbsetsitelink-set-both": "Koppeling en insignes
voor [$2] gewijzigd",
+ "wikibase-item-summary-wbsetsitelink-set-badges": "Badges voor [$2]
gewijzigd",
+ "wikibase-item-summary-wbsetsitelink-set-both": "Koppeling en badges
voor [$2] gewijzigd",
"wikibase-item-summary-wbsetsitelink-remove": "Koppeling verwijderd
voor [$2]",
"wikibase-item-summary-wblinktitles-create": "Item aangemaakt om
pagina's te koppelen",
"wikibase-item-summary-wblinktitles-connect": "Taalkoppeling naar
gekoppelde pagina's toegevoegd",
diff --git a/extensions/Wikibase/repo/i18n/tr.json
b/extensions/Wikibase/repo/i18n/tr.json
index 76a0787..f07dbd2 100644
--- a/extensions/Wikibase/repo/i18n/tr.json
+++ b/extensions/Wikibase/repo/i18n/tr.json
@@ -5,7 +5,8 @@
"Incelemeelemani",
"Rapsar",
"Marmase",
- "Sayginer"
+ "Sayginer",
+ "Sucsuzz"
]
},
"wikibase-edit": "değiştir",
@@ -23,6 +24,7 @@
"wikibase-aliases-label": "Şu şekilde de bilinir:",
"wikibase-shortcopyrightwarning": "\"$1\" düğmesine tıkladığınızda,
[[$2|kullanım şartlarını]] kabul ederek katkınızı, $3 kapsamında geri
döndürülemez bir biçimde sağlamış olacaksınız.",
"special-itembytitle": "Başlığına göre öge",
+ "wikibase-gotolinkedpage-lookup-site": "Site:",
"wikibase-itemdisambiguation-lookup-language": "Dil:",
"wikibase-newproperty-invalid-datatype": "Geçersiz veri türü
belirtildi.",
"special-newitem": "Yeni bir öge oluştur",
diff --git a/extensions/Wikibase/repo/includes/View/SiteLinksView.php
b/extensions/Wikibase/repo/includes/View/SiteLinksView.php
index efbf17b..3bd5872 100644
--- a/extensions/Wikibase/repo/includes/View/SiteLinksView.php
+++ b/extensions/Wikibase/repo/includes/View/SiteLinksView.php
@@ -2,7 +2,6 @@
namespace Wikibase\Repo\View;
-use Html;
use InvalidArgumentException;
use Message;
use Sanitizer;
@@ -363,17 +362,14 @@
/** @var ItemId $badge */
foreach ( $siteLink->getBadges() as $badge ) {
$serialization = $badge->getSerialization();
- $classes = 'wb-badge wb-badge-' .
Sanitizer::escapeClass( $serialization );
+ $classes = Sanitizer::escapeClass( $serialization );
if ( !empty( $this->badgeItems[$serialization] ) ) {
$classes .= ' ' . Sanitizer::escapeClass(
$this->badgeItems[$serialization] );
}
- $html .= Html::element(
- 'span',
- array(
- 'class' => $classes,
- 'title' => $this->getTitleForBadge(
$badge )
- )
+ $html .= wfTemplate( 'wb-badge',
+ $classes,
+ $this->getTitleForBadge( $badge )
);
}
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 4a41671..57ac864 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit622c485cf7ae8e8eed335d75464c5bee::getLoader();
+return ComposerAutoloaderInit66e2c11f26f5ea04ce15d0eb93eaefeb::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 900019f..597178b 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit622c485cf7ae8e8eed335d75464c5bee
+class ComposerAutoloaderInit66e2c11f26f5ea04ce15d0eb93eaefeb
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit622c485cf7ae8e8eed335d75464c5bee',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit66e2c11f26f5ea04ce15d0eb93eaefeb',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit622c485cf7ae8e8eed335d75464c5bee',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit66e2c11f26f5ea04ce15d0eb93eaefeb',
'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequire622c485cf7ae8e8eed335d75464c5bee($file);
+ composerRequire66e2c11f26f5ea04ce15d0eb93eaefeb($file);
}
return $loader;
}
}
-function composerRequire622c485cf7ae8e8eed335d75464c5bee($file)
+function composerRequire66e2c11f26f5ea04ce15d0eb93eaefeb($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 674c0bf..a1f80e4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -810,24 +810,24 @@
},
{
"name": "wikibase/serialization-javascript",
- "version": "1.1.1",
- "version_normalized": "1.1.1.0",
+ "version": "1.1.2",
+ "version_normalized": "1.1.2.0",
"source": {
"type": "git",
"url":
"https://github.com/wmde/WikibaseSerializationJavaScript.git";,
- "reference": "53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028"
+ "reference": "aeeca302e86383c36677d2b4b58a6a00ad834e2b"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseSerializationJavaScript/zipball/53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028";,
- "reference": "53cc6abd5e8fd612bb408bf2bc0ad6fc234bb028",
+ "url":
"https://api.github.com/repos/wmde/WikibaseSerializationJavaScript/zipball/aeeca302e86383c36677d2b4b58a6a00ad834e2b";,
+ "reference": "aeeca302e86383c36677d2b4b58a6a00ad834e2b",
"shasum": ""
},
"require": {
"data-values/javascript": "~0.5.0",
"wikibase/data-model-javascript": "~0.3.0"
},
- "time": "2014-07-10 12:57:32",
+ "time": "2014-08-20 15:36:05",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -841,26 +841,21 @@
],
"authors": [
{
+ "name": "Adrian Lang",
+ "email": "[email protected]"
+ },
+ {
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- },
- {
- "name": "Adrian Lang",
- "email": "[email protected]"
+ "homepage": "http://www.snater.com";
}
],
"description": "Wikibase datamodel serialization implementation in
JavaScript"
@@ -1130,12 +1125,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "386d2754eef93d9ec96641f332e9afdd3eebfe8a"
+ "reference": "05c771e36eadae5e4e6b533227b82f05bde4d1b9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/386d2754eef93d9ec96641f332e9afdd3eebfe8a";,
- "reference": "386d2754eef93d9ec96641f332e9afdd3eebfe8a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/05c771e36eadae5e4e6b533227b82f05bde4d1b9";,
+ "reference": "05c771e36eadae5e4e6b533227b82f05bde4d1b9",
"shasum": ""
},
"require": {
@@ -1162,7 +1157,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-08-19 21:52:18",
+ "time": "2014-08-21 09:16:33",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
diff --git a/vendor/wikibase/serialization-javascript/.jshintrc
b/vendor/wikibase/serialization-javascript/.jshintrc
index bce0e3a..b45efeb 100644
--- a/vendor/wikibase/serialization-javascript/.jshintrc
+++ b/vendor/wikibase/serialization-javascript/.jshintrc
@@ -28,18 +28,9 @@
// Globals
"predef": [
- "dataValues",
- "globeCoordinate",
"jQuery",
- "mediaWiki",
"QUnit",
- "valueFormatters",
- "valueParsers",
- "time",
"util",
- // require.js globals:
- "require",
- "requirejs",
- "define"
+ "wikibase"
]
}
diff --git a/vendor/wikibase/serialization-javascript/README.md
b/vendor/wikibase/serialization-javascript/README.md
index 7ce4852..aa19f0e 100644
--- a/vendor/wikibase/serialization-javascript/README.md
+++ b/vendor/wikibase/serialization-javascript/README.md
@@ -21,6 +21,11 @@
## Release notes
+### 1.1.2 (2014-08-20)
+
+* Added serialization.EntityUnserializer.itemExpert unserializing site links.
+* Fixed unserializing aliases in EntityUnserializer.
+
### 1.1.0 (2014-07-10)
* Adapt to changes in wikibase/[email protected].
diff --git a/vendor/wikibase/serialization-javascript/resources.mw.php
b/vendor/wikibase/serialization-javascript/resources.mw.php
index f053b48..e9db5a0 100644
--- a/vendor/wikibase/serialization-javascript/resources.mw.php
+++ b/vendor/wikibase/serialization-javascript/resources.mw.php
@@ -47,6 +47,7 @@
'wikibase.serialization.entities' => $moduleTemplate + array(
'scripts' => array(
'src/serialization.EntityUnserializer.js',
+
'src/serialization.EntityUnserializer.itemExpert.js',
'src/serialization.EntityUnserializer.propertyExpert.js',
),
'dependencies' => array(
diff --git
a/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.itemExpert.js
b/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.itemExpert.js
new file mode 100644
index 0000000..a0c5143
--- /dev/null
+++
b/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.itemExpert.js
@@ -0,0 +1,50 @@
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater < [email protected] >
+ */
+( function( wb, util ) {
+'use strict';
+
+var MODULE = wb.serialization,
+ PARENT = MODULE.Unserializer;
+
+/**
+ * Unserializer for parts of a Item Entity that are specific to Items.
+ *
+ * @constructor
+ * @extends wikibase.Unserializer
+ * @since 1.1
+ */
+var ItemUnserializationExpert =
+ util.inherit( 'WbEntityUnserializerItemExpert', PARENT,
+{
+ /**
+ * @see wikibase.serialization.Unserializer.unserialize
+ *
+ * @return {Object}
+ */
+ unserialize: function( serialization ) {
+ var siteLinks = [];
+
+ for( var siteId in serialization.sitelinks ) {
+ siteLinks.push( new wb.datamodel.SiteLink(
+ siteId,
+ serialization.sitelinks[siteId].title,
+ serialization.sitelinks[siteId].badges
+ ) );
+ }
+
+ return {
+ sitelinks: siteLinks
+ };
+ }
+} );
+
+// register to EntityUnserializer:
+// FIXME: Modules should not register themselves.
+MODULE.EntityUnserializer.registerTypeSpecificExpert(
+ wb.datamodel.Item.TYPE,
+ ItemUnserializationExpert
+);
+
+}( wikibase, util ) );
diff --git
a/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.js
b/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.js
index f8b4bdb..ea82b0c 100644
---
a/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.js
+++
b/vendor/wikibase/serialization-javascript/src/serialization.EntityUnserializer.js
@@ -15,6 +15,16 @@
var typeSpecificUnserializers = {};
/**
+ * @param {Object[]} array
+ * @return {*[]}
+ */
+ function extractValuesFromObjectArray( array ) {
+ return $.map( array, function( valueObj ) {
+ return valueObj.value;
+ } );
+ }
+
+ /**
* Helper for unserializing multilingual value.
*
* @param {Object} serialization
@@ -27,8 +37,11 @@
var unserialized = {};
for( var lang in serialization ) {
- unserialized[ lang ] = serialization[ lang ].value;
+ unserialized[lang] = $.isArray( serialization[lang] )
+ ? extractValuesFromObjectArray(
serialization[lang] )
+ : serialization[lang].value;
}
+
return unserialized;
}
--
To view, visit https://gerrit.wikimedia.org/r/155513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I447a5649da63c60f6aa7efbb7e5264db5c8a8ca1
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
