WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270907
Change subject: New Wikidata Build - 2016-02-16T10:00:02+0000
......................................................................
New Wikidata Build - 2016-02-16T10:00:02+0000
Change-Id: Ic086a095908e4c3e3b53c66f155071c2d7e0bf3d
---
M composer.lock
M extensions/Wikibase/.jscsrc
M extensions/Wikibase/client/i18n/cu.json
M extensions/Wikibase/client/i18n/sa.json
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/lib/i18n/cu.json
M extensions/Wikibase/lib/i18n/es.json
M extensions/Wikibase/lib/includes/EntityFactory.php
M extensions/Wikibase/lib/tests/qunit/data/testrunner.js
M extensions/Wikibase/repo/i18n/cu.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/includes/Interactors/ItemMergeInteractor.php
M extensions/Wikibase/repo/includes/ParserOutput/ParserOutputJsConfigBuilder.php
M extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
M extensions/Wikibase/repo/resources/wikibase.EntityInitializer.js
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
M
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/entitytermsview.js
M vendor/composer/installed.json
24 files changed, 128 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/07/270907/1
diff --git a/composer.lock b/composer.lock
index addf373..aad4ce4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1481,12 +1481,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "20484df503871fed349b7d097b79b44aba5466b3"
+ "reference": "0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/20484df503871fed349b7d097b79b44aba5466b3";,
- "reference": "20484df503871fed349b7d097b79b44aba5466b3",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4";,
+ "reference": "0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4",
"shasum": ""
},
"require": {
@@ -1558,7 +1558,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-02-14 20:32:08"
+ "time": "2016-02-16 00:08:50"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/.jscsrc b/extensions/Wikibase/.jscsrc
index d341dd1..04201a6 100644
--- a/extensions/Wikibase/.jscsrc
+++ b/extensions/Wikibase/.jscsrc
@@ -12,7 +12,19 @@
"requireVarDeclFirst": null,
"jsDoc": {
// what we don't yet follow is commented out
- //"checkAnnotations": "jsduck5",
+ "checkAnnotations": {
+ "preset": "jsduck5",
+ "extra": {
+ "TODO:": "some",
+ "licence": "some",
+ "license": "some",
+ "note:": "some",
+ "option": "some",
+ "see": "some",
+ "todo": "some",
+ "triggers": "some"
+ }
+ },
"checkParamNames": true,
"requireParamTypes": true,
"checkRedundantParams": true,
diff --git a/extensions/Wikibase/client/i18n/cu.json
b/extensions/Wikibase/client/i18n/cu.json
index e9ebff9..1c40923 100644
--- a/extensions/Wikibase/client/i18n/cu.json
+++ b/extensions/Wikibase/client/i18n/cu.json
@@ -8,9 +8,11 @@
"wikibase-editlinks": "исправи съвѧꙁи",
"wikibase-editlinkstitle": "мєждоуѩꙁꙑчьнъ съвѧꙁии исправлѥниѥ",
"wikibase-linkitem-input-site": "ѩꙁꙑкъ :",
+ "wikibase-linkitem-input-page": "страница :",
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "съкрꙑтиѥ",
"wikibase-rc-hide-wikidata-show": "каꙁаниѥ",
"wikibase-rc-wikibase-edit-letter": "в҃с",
- "wikibase-rc-wikibase-edit-title": "{{grammar:genitive|{{WBREPONAME}}}}
мѣна"
+ "wikibase-rc-wikibase-edit-title": "{{grammar:genitive|{{WBREPONAME}}}}
мѣна",
+ "wikibase-pageinfo-entity-id-none": "нѣстъ"
}
diff --git a/extensions/Wikibase/client/i18n/sa.json
b/extensions/Wikibase/client/i18n/sa.json
index 9d2be3d..b4e75b5 100644
--- a/extensions/Wikibase/client/i18n/sa.json
+++ b/extensions/Wikibase/client/i18n/sa.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"NehalDaveND",
- "Shubha"
+ "Shubha",
+ "రహ్మానుద్దీన్"
]
},
"tooltip-t-wikibase": "सूचनाकोषस्य वस्तूनां परिसन्धिः",
@@ -16,7 +17,7 @@
"wikibase-linkitem-input-site": "भाषा :",
"wikibase-linkitem-input-page": "पृष्ठम् :",
"wikibase-linkitem-confirmitem-button": "दृढीकरोतु",
- "wikibase-rc-hide-wikidata": "विकिडेटा $1",
+ "wikibase-rc-hide-wikidata": "{{WBREPONAME}} $1",
"wikibase-rc-hide-wikidata-hide": "गोप्यताम्",
"wikibase-rc-hide-wikidata-show": "दृश्यताम्",
"wikibase-rc-wikibase-edit-letter": "डेटा",
diff --git
a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
index abf3dfc..3184c9d 100644
--- a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
+++ b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
@@ -4,7 +4,7 @@
* @since 0.4
*
* @licence GNU GPL v2+
- * @author: Marius Hoch < [email protected] >
+ * @author Marius Hoch < [email protected] >
*/
( function( mw, $ ) {
'use strict';
diff --git a/extensions/Wikibase/lib/i18n/cu.json
b/extensions/Wikibase/lib/i18n/cu.json
index 91007f9..a9c3472 100644
--- a/extensions/Wikibase/lib/i18n/cu.json
+++ b/extensions/Wikibase/lib/i18n/cu.json
@@ -4,6 +4,7 @@
"ОйЛ"
]
},
+ "wikibase-error-unexpected": "блаꙁна : $1",
"wikibase-sitelinks-wikipedia": "Википєдїꙗ",
"wikibase-sitelinks-sitename-columnheading": "ѩꙁꙑкъ"
}
diff --git a/extensions/Wikibase/lib/i18n/es.json
b/extensions/Wikibase/lib/i18n/es.json
index be1788b..22fbec3 100644
--- a/extensions/Wikibase/lib/i18n/es.json
+++ b/extensions/Wikibase/lib/i18n/es.json
@@ -74,6 +74,7 @@
"wikibase-validator-no-such-property": "No se encontró la propiedad $1",
"wikibase-validator-bad-value": "Valor corrupto: $1",
"wikibase-validator-bad-value-type": "Tipo de valor incorrecto $1, se
esperaba $2",
+ "wikibase-validator-bad-data-type": "Tipo de dato erróneo: $1",
"wikibase-validator-bad-url": "URL incorrecta: $1",
"wikibase-validator-bad-url-scheme": "Esquema de URL no admitido: $1",
"wikibase-validator-unknown-unit": "Unidad desconocida: $1",
diff --git a/extensions/Wikibase/lib/includes/EntityFactory.php
b/extensions/Wikibase/lib/includes/EntityFactory.php
index dcc6ae8..bba224c 100644
--- a/extensions/Wikibase/lib/includes/EntityFactory.php
+++ b/extensions/Wikibase/lib/includes/EntityFactory.php
@@ -4,7 +4,7 @@
use OutOfBoundsException;
use RuntimeException;
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
/**
* Factory for Entity objects.
@@ -83,7 +83,7 @@
* @param String $entityType The type of the desired new entity.
*
* @throws RuntimeException
- * @return Entity The new Entity object.
+ * @return EntityDocument The new Entity object.
*/
public function newEmpty( $entityType ) {
$class = $this->getEntityClass( $entityType );
diff --git a/extensions/Wikibase/lib/tests/qunit/data/testrunner.js
b/extensions/Wikibase/lib/tests/qunit/data/testrunner.js
index 8c042bc..5b55838 100644
--- a/extensions/Wikibase/lib/tests/qunit/data/testrunner.js
+++ b/extensions/Wikibase/lib/tests/qunit/data/testrunner.js
@@ -16,7 +16,7 @@
*
* @param {Object} custom test environment variables according to
QUnit.newMwEnvironment
*
- * @example:
+ * @example
* <code>
* module( ..., newWbEnvironment() );
*
diff --git a/extensions/Wikibase/repo/i18n/cu.json
b/extensions/Wikibase/repo/i18n/cu.json
index cbf119f..98a4e9d 100644
--- a/extensions/Wikibase/repo/i18n/cu.json
+++ b/extensions/Wikibase/repo/i18n/cu.json
@@ -10,7 +10,9 @@
"wikibase-add": "доложєниѥ",
"wikibase-save-inprogress": "съхранѥниѥ···",
"wikibase-remove-inprogress": "поничьжєниѥ···",
+ "wikibase-entitytermsforlanguagelistview-language": "ѩꙁꙑкъ",
"wikibase-description-empty": "опьсаниꙗ ѥщє нѣстъ",
+ "wikibase-diffview-link": "съвѧꙁи",
"wikibase-sitelink-site-edit-placeholder": "мѣсто",
"wikibase-sitelink-page-edit-placeholder": "страница",
"wikibase-sitelinks-special": "инꙑ мєждоусѣтьнꙑ мѣста",
diff --git a/extensions/Wikibase/repo/i18n/en.json
b/extensions/Wikibase/repo/i18n/en.json
index e630e69..db0fb6c 100644
--- a/extensions/Wikibase/repo/i18n/en.json
+++ b/extensions/Wikibase/repo/i18n/en.json
@@ -121,15 +121,15 @@
"wikibase-validator-sitelink-conflict": "The link $1 is already used by
item $2. You may remove it from $2 if it does not belong there or merge the
items if they are about the exact same topic.",
"wikibase-validator-label-conflict": "Property $3 already has label
\"$1\" associated with language code $2.",
"wikibase-validator-label-with-description-conflict": "Item $3 already
has label \"$1\" associated with language code $2, using the same description
text.",
- "wikibase-validator-label-no-entityid": "The label must not be a valid
entity id.",
+ "wikibase-validator-label-no-entityid": "The label must not be a valid
entity ID.",
"wikibase-validator-no-such-media": "The file \"$1\" does not exist on
[https://commons.wikimedia.org/ Wikimedia Commons].",
"wikibase-itemlink": "$1 $2",
"wikibase-itemlink-id-wrapper": "($1)",
"wikibase-itemlink-userlang-wrapper": " ($1: $2)",
"wikibase-itemlink-title": "$1 | $2",
- "wikibase-wikibaserepopage-not-itemid": "\"$1\" is not a valid item
id.",
+ "wikibase-wikibaserepopage-not-itemid": "\"$1\" is not a valid item
ID.",
"wikibase-wikibaserepopage-invalid-langcode": "The language code \"$1\"
is unknown. Please use a language code known to the system, such as \"en\".",
- "wikibase-wikibaserepopage-invalid-id": "The id \"$1\" is unknown to
the system. Please use a valid entity id.",
+ "wikibase-wikibaserepopage-invalid-id": "The ID \"$1\" is unknown to
the system. Please use a valid entity ID.",
"wikibase-wikibaserepopage-unresolved-redirect": "$1 is a redirect.",
"wikibase-wikibaserepopage-storage-exception": "An error occurred while
trying to load $1: $2.",
"special-itembytitle": "Item by title",
@@ -144,7 +144,7 @@
"special-gotolinkedpage": "Go to linked page",
"wikibase-gotolinkedpage-lookup-fieldset": "Go to linked page by site
and item",
"wikibase-gotolinkedpage-lookup-site": "Site:",
- "wikibase-gotolinkedpage-lookup-item": "Item id:",
+ "wikibase-gotolinkedpage-lookup-item": "Item ID:",
"wikibase-gotolinkedpage-submit": "Go",
"wikibase-gotolinkedpage-summary": "Special:GoToLinkedPage is used to
find the page for an item on a connected site.<br />The first field,
\"{{int:wikibase-gotolinkedpage-lookup-site}}\", is where you enter the
language and site code.<br />For the second field,
\"{{int:wikibase-gotolinkedpage-lookup-item}}\", you must put in the item id
you are looking for.",
"wikibase-gotolinkedpage-error-page-not-found": "There was no page
found for that combination of item and site",
@@ -181,36 +181,36 @@
"wikibase-newentity-submit": "Create",
"special-setlabel": "Set a label",
"wikibase-setlabel-introfull": "You are setting the label in $2 for
[[$1]].",
- "wikibase-setlabel-intro": "This form allows you to set the label of an
entity. You need to provide the id of the entity (e.g. Q23), a language code
(e.g. \"en\") and the label to set to.",
+ "wikibase-setlabel-intro": "This form allows you to set the label of an
entity. You need to provide the ID of the entity (e.g. Q23), a language code
(e.g. \"en\") and the label to set to.",
"wikibase-setlabel-label": "Label:",
"wikibase-setlabel-submit": "Set label",
"special-setdescription": "Set a description",
"wikibase-setdescription-introfull": "You are setting the description
in $2 for [[$1]].",
- "wikibase-setdescription-intro": "This form allows you to set the
description of an entity. You need to provide the id of the entity (e.g. Q23),
a language code (e.g. \"en\") and the description to set to.",
+ "wikibase-setdescription-intro": "This form allows you to set the
description of an entity. You need to provide the ID of the entity (e.g. Q23),
a language code (e.g. \"en\") and the description to set to.",
"wikibase-setdescription-label": "Description:",
"wikibase-setdescription-submit": "Set description",
"special-setaliases": "Set aliases",
"wikibase-setaliases-introfull": "You are setting the aliases in $2 for
[[$1]]. Several aliases are separated by a pipe (<code>|</code>) character.",
- "wikibase-setaliases-intro": "This form allows you to set the aliases
of an entity. You need to provide the id of the entity (e.g. Q23), a language
code (e.g. \"en\") and the aliases to set to. Several aliases are separated by
a pipe (<code>|</code>) character.",
+ "wikibase-setaliases-intro": "This form allows you to set the aliases
of an entity. You need to provide the ID of the entity (e.g. Q23), a language
code (e.g. \"en\") and the aliases to set to. Several aliases are separated by
a pipe (<code>|</code>) character.",
"wikibase-setaliases-label": "Aliases:",
"wikibase-setaliases-submit": "Set aliases",
"special-setlabeldescriptionaliases": "Set label, description and
aliases",
"wikibase-setlabeldescriptionaliases-introfull": "You are setting
label, description and aliases in $2 for [[$1]]. Several aliases are separated
by a pipe (<code>|</code>) character.",
- "wikibase-setlabeldescriptionaliases-intro": "This form allows you to
set label, description and aliases of an entity. You need to first provide the
id of the entity (e.g. \"Q23\") and a language code (e.g. \"en\").",
+ "wikibase-setlabeldescriptionaliases-intro": "This form allows you to
set label, description and aliases of an entity. You need to first provide the
ID of the entity (e.g. \"Q23\") and a language code (e.g. \"en\").",
"wikibase-setlabeldescriptionaliases-label-label": "Label:",
"wikibase-setlabeldescriptionaliases-description-label": "Description:",
"wikibase-setlabeldescriptionaliases-aliases-label": "Aliases:",
"wikibase-setlabeldescriptionaliases-submit": "Set label, description
and aliases",
"special-setsitelink": "Set a sitelink",
"wikibase-setsitelink-introfull": "You are setting the sitelink of $2
for [[$1]].",
- "wikibase-setsitelink-intro": "This form allows you to set the sitelink
of an item. You need to provide the id of the item (e.g. Q23), a site id (e.g.
\"enwiki\") and the sitelink to set to.",
+ "wikibase-setsitelink-intro": "This form allows you to set the sitelink
of an item. You need to provide the ID of the item (e.g. Q23), a site id (e.g.
\"enwiki\") and the sitelink to set to.",
"wikibase-setsitelink-intro-badges": "Additionally you can set various
badges for this sitelink which are listed below.",
- "wikibase-setsitelink-site": "Site id:",
+ "wikibase-setsitelink-site": "Site ID:",
"wikibase-setsitelink-label": "Sitelink:",
"wikibase-setsitelink-badges": "Badges:",
"wikibase-setsitelink-submit": "Set the sitelink",
- "wikibase-setsitelink-invalid-site": "The site id \"$1\" is unknown.
Please use an existing site id, such as \"enwiki\".",
- "wikibase-setsitelink-not-item": "The id $1 does not belong to an
item.",
+ "wikibase-setsitelink-invalid-site": "The site ID \"$1\" is unknown.
Please use an existing site ID, such as \"enwiki\".",
+ "wikibase-setsitelink-not-item": "The ID $1 does not belong to an
item.",
"wikibase-setsitelink-not-badge": "The item $1 is not a badge.",
"wikibase-setsitelink-add-failed": "The sitelink could not be saved.",
"wikibase-setsitelink-remove-failed": "The sitelink could not be
removed.",
@@ -218,8 +218,8 @@
"wikibase-modifyterm-language": "Language code:",
"special-mergeitems": "Merge two items",
"wikibase-mergeitems-intro": "If you merge two items, all labels,
descriptions, aliases, sitelinks and statements will be moved from one item to
the other.",
- "wikibase-mergeitems-fromid": "The id to merge from",
- "wikibase-mergeitems-toid": "The id to merge to",
+ "wikibase-mergeitems-fromid": "The ID to merge from",
+ "wikibase-mergeitems-toid": "The ID to merge to",
"wikibase-mergeitems-submit": "Merge items",
"wikibase-mergeitems-success": "$1 was successfully merged into $3 and
redirected.",
"wikibase-itemmerge-missing-parameter": "Incomplete input.",
@@ -285,53 +285,53 @@
"wikibase-entitydata-text": "This page provides a linked data interface
to entity values. Please provide the entity ID in the URL, using subpage
syntax.\n* Content negotiation applies based on you client's Accept header.
This means that the entity data will be provided in the format preferred by
your client. For a web browser, this will be HTML, causing your browser to be
redirected to the regular entity page.\n* You can explicitly request a specific
data format by adding the appropriate file extension to the entity ID: Q23.json
will return data in the JSON format, Q23.ttl will return RDF/Turtle, and so
on.",
"special-redirectentity": "Redirect an entity",
"wikibase-redirectentity-success": "$1 was successfully redirected to
$2.",
- "wikibase-redirectentity-fromid": "The id to redirect from",
- "wikibase-redirectentity-toid": "The id to redirect to",
+ "wikibase-redirectentity-fromid": "The ID to redirect from",
+ "wikibase-redirectentity-toid": "The ID to redirect to",
"wikibase-redirectentity-submit": "Redirect",
"special-mylanguagefallbackchain": "My language fallback chain",
"wikibase-mylanguagefallbackchain-text": "The language fallback chain
used to display entity labels for you is shown below.",
"wikibase-mylanguagefallbackchain-babel": "You can edit it by putting
<nowiki>{{#babel: }}</nowiki> on {{GENDER:$1|your}} [[Special:MyPage|user
page]].",
"wikibase-mylanguagefallbackchain-verbatim-item": "$1 - $2",
"wikibase-mylanguagefallbackchain-converted-item": "$1 - $2, converted
from $3 - $4",
- "wikibase-api-common-item": "Common item detected",
- "wikibase-api-badtoken": "Bad token detected",
+ "wikibase-api-common-item": "Common item detected.",
+ "wikibase-api-badtoken": "Bad token detected.",
"wikibase-api-cant-load-entity-content": "Cannot access content,
revision may be deleted.",
"wikibase-api-unresolved-redirect": "The given entity ID refers to a
redirect, which is not supported in this context.",
- "wikibase-api-editconflict": "Edit conflict, could not patch the
current revision",
- "wikibase-api-failed-add-sitelink": "The sitelink could not be saved",
- "wikibase-api-failed-modify": "Attempted modification of the item
failed",
- "wikibase-api-failed-save": "The save has failed",
- "wikibase-api-inconsistent-language": "Inconsistent language detected",
- "wikibase-api-inconsistent-site": "Inconsistent site detected",
- "wikibase-api-invalid-guid": "Invalid claim guid",
- "wikibase-api-invalid-json": "Invalid json in request",
- "wikibase-api-invalid-snak": "Invalid snak",
- "wikibase-api-invalid-list": "Invalid list",
- "wikibase-api-invalid-property-id": "Invalid property id",
- "wikibase-api-invalid-entity-id": "Invalid entity id",
- "wikibase-api-no-common-iten": "There is no common item",
- "wikibase-api-no-data": "No data to operate on",
- "wikibase-api-no-external-page": "The external client site '$1' did not
provide page information for page '$2'.",
- "wikibase-api-nosuchrevid": "Revision with id not found",
- "wikibase-api-no-such-claim": "Could not find such a claim",
- "wikibase-api-no-such-entity": "Could not find such an entity",
- "wikibase-api-no-such-entity-id": "Could not find such an entity id",
- "wikibase-api-no-such-entity-link": "Could not find such an entity
link",
- "wikibase-api-no-such-reference": "Could not find such a reference",
- "wikibase-api-no-such-site": "Could not find such a site",
- "wikibase-api-no-such-sitelink": "Could not find a sitelink to '$1'
when trying to edit badges.",
- "wikibase-api-no-such-statement": "Could not find such a statement",
- "wikibase-api-not-statement": "Not a statement",
- "wikibase-api-not-item": "Not an item",
- "wikibase-api-not-recognized-siteid": "The supplied site identifier was
not recognized",
- "wikibase-api-not-recognized": "Something was not recognized",
- "wikibase-api-not-recognized-array": "An array was expected, but not
recognized",
- "wikibase-api-not-recognized-language": "The supplied language code was
not recognized",
- "wikibase-api-not-recognized-string": "A string was expected, but not
recognized",
- "wikibase-api-param-missing": "A parameter that is required was
missing",
- "wikibase-api-param-illegal": "An illegal set of parameters have been
used",
- "wikibase-api-permissiondenied": "You do not have the permissions
needed to carry out this action",
- "wikibase-api-wrong-class": "Wrong class type detected",
+ "wikibase-api-editconflict": "Edit conflict. Could not patch the
current revision.",
+ "wikibase-api-failed-add-sitelink": "The sitelink could not be saved.",
+ "wikibase-api-failed-modify": "Attempted modification of the item
failed.",
+ "wikibase-api-failed-save": "The save has failed.",
+ "wikibase-api-inconsistent-language": "Inconsistent language detected.",
+ "wikibase-api-inconsistent-site": "Inconsistent site detected.",
+ "wikibase-api-invalid-guid": "Invalid claim guid.",
+ "wikibase-api-invalid-json": "Invalid json in request.",
+ "wikibase-api-invalid-snak": "Invalid snak.",
+ "wikibase-api-invalid-list": "Invalid list.",
+ "wikibase-api-invalid-property-id": "Invalid property ID.",
+ "wikibase-api-invalid-entity-id": "Invalid entity ID.",
+ "wikibase-api-no-common-iten": "There is no common item.",
+ "wikibase-api-no-data": "No data to operate on.",
+ "wikibase-api-no-external-page": "The external client site \"$1\" did
not provide page information for page \"$2\".",
+ "wikibase-api-nosuchrevid": "Revision with ID not found.",
+ "wikibase-api-no-such-claim": "Could not find such a claim.",
+ "wikibase-api-no-such-entity": "Could not find such an entity.",
+ "wikibase-api-no-such-entity-id": "Could not find such an entity ID.",
+ "wikibase-api-no-such-entity-link": "Could not find such an entity
link.",
+ "wikibase-api-no-such-reference": "Could not find such a reference.",
+ "wikibase-api-no-such-site": "Could not find such a site.",
+ "wikibase-api-no-such-sitelink": "Could not find a sitelink to \"$1\"
when trying to edit badges.",
+ "wikibase-api-no-such-statement": "Could not find such a statement.",
+ "wikibase-api-not-statement": "Not a statement.",
+ "wikibase-api-not-item": "Not an item.",
+ "wikibase-api-not-recognized-siteid": "The supplied site identifier was
not recognized.",
+ "wikibase-api-not-recognized": "Something was not recognized.",
+ "wikibase-api-not-recognized-array": "An array was expected, but not
recognized.",
+ "wikibase-api-not-recognized-language": "The supplied language code was
not recognized.",
+ "wikibase-api-not-recognized-string": "A string was expected, but not
recognized.",
+ "wikibase-api-param-missing": "A parameter that is required was
missing.",
+ "wikibase-api-param-illegal": "An illegal set of parameters have been
used.",
+ "wikibase-api-permissiondenied": "You do not have the permissions
needed to carry out this action.",
+ "wikibase-api-wrong-class": "Wrong class type detected.",
"wikibase-api-target-not-empty": "The redirect can only be created on
top of an empty or deleted entity.",
"wikibase-api-target-is-redirect": "The redirect's target must not be a
redirect too.",
"wikibase-api-target-is-incompatible": "Attempt to redirect to an
entity of a different type.",
diff --git a/extensions/Wikibase/repo/i18n/es.json
b/extensions/Wikibase/repo/i18n/es.json
index 3c27e50..315aa46 100644
--- a/extensions/Wikibase/repo/i18n/es.json
+++ b/extensions/Wikibase/repo/i18n/es.json
@@ -106,6 +106,7 @@
"wikibase-aliases-input-help-message": "Para que sea más fácil
encontrar esta entidad, puedes escribir nombres alternativos.",
"wikibase-aliases-empty": "No hay alias definidos.",
"wikibase-propertypage-datatype": "Tipo de dato",
+ "wikibase-propertypage-bad-datatype": "Tipo de dato desconocido: $1",
"wikibase-claimview-snak-tooltip": "Ingresa un valor correspondiente a
la propiedad \"$1\". Si la propiedad no tiene ningún valor asignado o si éste
no se conoce, puedes elegir una alternativa y especificar un valor
personalizado haciendo clic en el icono junto a la caja de entrada del valor.",
"wikibase-statementview-rank-preferred": "Nivel preferido",
"wikibase-statementview-rank-normal": "Calificación normal",
@@ -286,7 +287,7 @@
"wikibase-redirectentity-submit": "Redirigir",
"wikibase-mylanguagefallbackchain-babel": "Puedes editar esto poniendo
<nowiki>{{#babel: }}</nowiki> en tu [[Special:MyPage|página de
{{GENDER:$1|usuario|usuaria}}]].",
"wikibase-mylanguagefallbackchain-converted-item": "$1 - $2, convertido
desde $3 - $4",
- "wikibase-api-target-not-empty": "Solo se puede crear la redirección
sobre una entidad vacía.",
+ "wikibase-api-target-not-empty": "Solo se puede crear la redirección
sobre una entidad vacía o eliminada.",
"wikibase-api-target-is-redirect": "El destino de la redirección no
debe ser una redirección.",
"wikibase-api-target-is-incompatible": "Intento de redirigir a una
entidad de un tipo diferente.",
"wikibase-api-cant-redirect": "No se puede crear la redirección
(posiblemente porque redirige entre estos tipos de entidad no son compatibles
para nada).",
diff --git a/extensions/Wikibase/repo/i18n/qqq.json
b/extensions/Wikibase/repo/i18n/qqq.json
index 4bb0da2..d63cde7 100644
--- a/extensions/Wikibase/repo/i18n/qqq.json
+++ b/extensions/Wikibase/repo/i18n/qqq.json
@@ -346,7 +346,7 @@
"wikibase-api-nosuchrevid": "!!DO NOT TRANSLATE!! Page or entity with
this revision id could not be found in the database",
"wikibase-api-no-such-claim": "!!DO NOT TRANSLATE!! Could not find such
a claim on wikidata, this could be to the user entering the wrong data",
"wikibase-api-no-such-entity": "!!DO NOT TRANSLATE!! Could not find
such an entity, this could be to the user entering the wrong data",
- "wikibase-api-no-such-entity-id": "!!DO NOT TRANSLATE!! Could not find
such an entity id, this could be to the user entering the wrong data",
+ "wikibase-api-no-such-entity-id": "!!DO NOT TRANSLATE!! Could not find
such an entity ID, this could be to the user entering the wrong data",
"wikibase-api-no-such-entity-link": "!!DO NOT TRANSLATE!! Could not
find such an entity link, this could be to the user entering the wrong data",
"wikibase-api-no-such-reference": "!!DO NOT TRANSLATE!! Could not find
such a reference, this could be to the user entering the wrong data",
"wikibase-api-no-such-site": "!!DO NOT TRANSLATE!! Could not find such
a site, this could be to the user entering the wrong data",
diff --git
a/extensions/Wikibase/repo/includes/Interactors/ItemMergeInteractor.php
b/extensions/Wikibase/repo/includes/Interactors/ItemMergeInteractor.php
index 4267a4b..4674656 100644
--- a/extensions/Wikibase/repo/includes/Interactors/ItemMergeInteractor.php
+++ b/extensions/Wikibase/repo/includes/Interactors/ItemMergeInteractor.php
@@ -7,7 +7,6 @@
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\ChangeOpsMerge;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
-use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
@@ -16,8 +15,8 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
+use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Summary;
use Wikibase\SummaryFormatter;
@@ -286,15 +285,15 @@
*/
private function attemptSaveMerge( Item $fromItem, Item $toItem,
$summary, $bot ) {
$toSummary = $this->getSummary( 'to', $toItem->getId(),
$summary );
- $fromRev = $this->saveEntity( $fromItem, $toSummary, $bot );
+ $fromRev = $this->saveItem( $fromItem, $toSummary, $bot );
$fromSummary = $this->getSummary( 'from', $fromItem->getId(),
$summary );
- $toRev = $this->saveEntity( $toItem, $fromSummary, $bot );
+ $toRev = $this->saveItem( $toItem, $fromSummary, $bot );
return array( $fromRev, $toRev );
}
- private function saveEntity( Entity $entity, Summary $summary, $bot ) {
+ private function saveItem( Item $item, Summary $summary, $bot ) {
// Given we already check all constraints in ChangeOpsMerge,
it's
// fine to ignore them here. This is also needed to not run into
// the constraints we're supposed to ignore (see
ChangeOpsMerge::removeConflictsWithEntity
@@ -306,7 +305,7 @@
try {
return $this->entityStore->saveEntity(
- $entity,
+ $item,
$this->summaryFormatter->formatSummary(
$summary ),
$this->user,
$flags
diff --git
a/extensions/Wikibase/repo/includes/ParserOutput/ParserOutputJsConfigBuilder.php
b/extensions/Wikibase/repo/includes/ParserOutput/ParserOutputJsConfigBuilder.php
index 5a74391..2806844 100644
---
a/extensions/Wikibase/repo/includes/ParserOutput/ParserOutputJsConfigBuilder.php
+++
b/extensions/Wikibase/repo/includes/ParserOutput/ParserOutputJsConfigBuilder.php
@@ -4,7 +4,7 @@
use DataValues\Serializers\DataValueSerializer;
use FormatJson;
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\SerializerFactory;
/**
@@ -34,11 +34,11 @@
}
/**
- * @param Entity $entity
+ * @param EntityDocument $entity
*
* @return array
*/
- public function build( Entity $entity ) {
+ public function build( EntityDocument $entity ) {
$entityId = $entity->getId();
if ( !$entityId ) {
@@ -56,11 +56,11 @@
}
/**
- * @param Entity $entity
+ * @param EntityDocument $entity
*
* @return string
*/
- private function getSerializedEntity( Entity $entity ) {
+ private function getSerializedEntity( EntityDocument $entity ) {
$serializer = $this->serializerFactory->newEntitySerializer();
$serialization = $serializer->serialize( $entity );
diff --git a/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
b/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
index bfc53d2..9689409 100644
--- a/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
+++ b/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
@@ -212,6 +212,7 @@
*
* @param EntityDocument &$entity
*
+ * @throws InvalidArgumentException
* @return Status
*/
protected function modifyEntity( EntityDocument &$entity ) {
@@ -219,12 +220,16 @@
throw new InvalidArgumentException( '$entity must be a
FingerprintHolder' );
}
- $contentLanguageCode = $this->contentLanguage->getCode();
$fingerprint = $entity->getFingerprint();
+ $languageCode = $this->contentLanguage->getCode();
- $fingerprint->setLabel( $contentLanguageCode, $this->label );
- $fingerprint->setDescription( $contentLanguageCode,
$this->description );
- $fingerprint->setAliasGroup( $contentLanguageCode,
$this->aliases );
+ if ( $this->label !== '' ) {
+ $fingerprint->setLabel( $languageCode, $this->label );
+ }
+ if ( $this->description !== '' ) {
+ $fingerprint->setDescription( $languageCode,
$this->description );
+ }
+ $fingerprint->setAliasGroup( $languageCode, $this->aliases );
return Status::newGood();
}
diff --git a/extensions/Wikibase/repo/resources/wikibase.EntityInitializer.js
b/extensions/Wikibase/repo/resources/wikibase.EntityInitializer.js
index 3fd3de9..54e5922 100644
--- a/extensions/Wikibase/repo/resources/wikibase.EntityInitializer.js
+++ b/extensions/Wikibase/repo/resources/wikibase.EntityInitializer.js
@@ -2,7 +2,7 @@
* @licence GNU GPL v2+
*
* @author Adrian Lang <[email protected]>
- * @author: H. Snater < [email protected] >
+ * @author H. Snater < [email protected] >
*/
( function( $, mw, wb ) {
'use strict';
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index 0b5b2b4..336bb8f 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -367,14 +367,16 @@
if ( canEdit ) {
$entityview
.on( 'entitytermsviewchange
entitytermsviewafterstopediting', function( event, lang ) {
- if ( lang !== mw.config.get( 'wgUserLanguage' )
) {
+ var userLanguage = mw.config.get(
'wgUserLanguage' );
+
+ if ( typeof lang === 'string' && lang !==
userLanguage ) {
return;
}
var $entitytermsview = $( event.target ),
entitytermsview =
$entitytermsview.data( 'entitytermsview' ),
fingerprint = entitytermsview.value(),
- label = fingerprint.getLabelFor( lang ),
+ label = fingerprint.getLabelFor(
userLanguage ),
isEmpty = !label || label.getText() ===
'';
$( 'title' ).text(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
index 60c0656..0556204 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
@@ -170,7 +170,7 @@
'e' => array( 'exception' => array(
'type' => 'UsageException',
'code' => 'no-such-entity-id',
- 'message' => 'Could not find such an
entity id'
+ 'message' => 'Could not find such an
entity ID.'
) )
),
array( //5
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
index 73696c9..9539bad 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
@@ -174,7 +174,7 @@
'e' => array( 'exception' => array(
'type' => 'UsageException',
'code' => 'no-such-entity-id',
- 'message' => 'Could not find such an
entity id'
+ 'message' => 'Could not find such an
entity ID.'
) )
),
array( //5
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
index 909acc5..34ea433 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
@@ -109,8 +109,9 @@
$this->assertTrue( is_numeric( $row['change_id'] ) );
$this->assertEquals(
- wfTimestamp( TS_UNIX, $expected['change_time'] ),
- wfTimestamp( TS_UNIX, $row['change_time'] ),
+ // wfTimestamp returns string, assertEquals/$delta
requires int
+ (int) wfTimestamp( TS_UNIX, $expected['change_time'] ),
+ (int) wfTimestamp( TS_UNIX, $row['change_time'] ),
'Change time',
60 * 60 // 1 hour
);
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
index 4bfcbe2..5f1ade2 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
@@ -101,13 +101,15 @@
this.widgetEventPrefix + 'change.' + this.widgetName +
' ' +
this.widgetEventPrefix + 'afterstopediting.' +
this.widgetName,
function( event, lang ) {
- if ( lang !== self.options.userLanguages[0] ) {
+ var firstLanguage =
self.options.userLanguages[0];
+
+ if ( typeof lang === 'string' && lang !==
firstLanguage ) {
return;
}
var fingerprint = self.value(),
- description =
fingerprint.getDescriptionFor( lang ),
- aliases = fingerprint.getAliasesFor(
lang ),
+ description =
fingerprint.getDescriptionFor( firstLanguage ),
+ aliases = fingerprint.getAliasesFor(
firstLanguage ),
isDescriptionEmpty = !description ||
description.getText() === '',
isAliasesEmpty = !aliases ||
aliases.isEmpty();
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/entitytermsview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/entitytermsview.js
index 74066ee..7a2672d 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/entitytermsview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/entitytermsview.js
@@ -68,8 +68,9 @@
showEntitytermslistviewValue = mw.user.isAnon()
? $.cookie(
'wikibase-entitytermsview-showEntitytermslistview' )
: mw.user.options.get(
'wikibase-entitytermsview-showEntitytermslistview' ),
- showEntitytermslistview =
showEntitytermslistviewValue === 'true'
- || showEntitytermslistviewValue === '1';
+ showEntitytermslistview = (
showEntitytermslistviewValue === 'true'
+ || showEntitytermslistviewValue === '1'
+ || showEntitytermslistviewValue ===
null );
if (
entitytermsview.$entitytermsforlanguagelistviewContainer.is( ':visible' )
&& !showEntitytermslistview
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f2da3eb..f734368 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1271,12 +1271,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "20484df503871fed349b7d097b79b44aba5466b3"
+ "reference": "0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/20484df503871fed349b7d097b79b44aba5466b3";,
- "reference": "20484df503871fed349b7d097b79b44aba5466b3",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4";,
+ "reference": "0af6dba3ee72548ae4247d97c664b7b8ff9e8ec4",
"shasum": ""
},
"require": {
@@ -1308,7 +1308,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-02-14 20:32:08",
+ "time": "2016-02-16 00:08:50",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/270907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic086a095908e4c3e3b53c66f155071c2d7e0bf3d
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
