WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222090
Change subject: New Wikidata Build - 2015-07-01T10:00:01+0000
......................................................................
New Wikidata Build - 2015-07-01T10:00:01+0000
Change-Id: I4081c42adeb36bf901480ecd8c45741130cadaaf
---
M composer.lock
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/qqq.json
M
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Quality/WikibaseQuality.php
M extensions/Quality/WikibaseQualityHooks.php
D extensions/Quality/sql/create_wbq_evaluation.sql
D extensions/Quality/sql/create_wbq_violations.sql
M extensions/Wikibase/build/travis/install.sh
M extensions/Wikibase/client/i18n/fr.json
A extensions/Wikibase/client/i18n/hrx.json
M extensions/Wikibase/client/i18n/udm.json
M extensions/Wikibase/lib/i18n/el.json
M extensions/Wikibase/lib/i18n/fr.json
A extensions/Wikibase/lib/i18n/hrx.json
M extensions/Wikibase/lib/tests/phpunit/serializers/SerializerFactoryTest.php
M extensions/Wikibase/repo/i18n/en.json
A extensions/Wikibase/repo/i18n/hrx.json
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
M extensions/Wikibase/view/resources/wikibase/wikibase.css
M vendor/composer/installed.json
25 files changed, 120 insertions(+), 82 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/90/222090/1
diff --git a/composer.lock b/composer.lock
index 10afbaf..e2b8b3b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -909,7 +909,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "4d28f74a8d0076446b6071753fada9ac78ad9d29"
+ "reference": "144850d3908dc400301c6faab743369d424ba032"
},
"require": {
"php": ">=5.3.0",
@@ -954,7 +954,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2015-06-23 22:59:54"
+ "time": "2015-07-01 08:44:17"
},
{
"name": "wikibase/data-model",
@@ -1234,7 +1234,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "6c877b930d068c0c11e2ee82907ca7409b6dd4ef"
+ "reference": "0e6c3c95ab49c449d35b3228691c885062f766bb"
},
"require": {
"php": ">=5.3.0",
@@ -1277,7 +1277,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-06-22 08:36:36"
+ "time": "2015-06-30 17:53:04"
},
{
"name": "wikibase/serialization-javascript",
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374"
+ "reference": "52dd6ef614b4d64727482ea2eecd68aef436ff70"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8a4445f67012a5b55e26a5f66a3e1e80d309d374";,
- "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/52dd6ef614b4d64727482ea2eecd68aef436ff70";,
+ "reference": "52dd6ef614b4d64727482ea2eecd68aef436ff70",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-06-30 01:17:52"
+ "time": "2015-06-30 22:40:38"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/en.json
b/extensions/Constraints/i18n/en.json
index 0bc8341..ff8927c 100644
--- a/extensions/Constraints/i18n/en.json
+++ b/extensions/Constraints/i18n/en.json
@@ -3,6 +3,7 @@
"authors": "BP2014N1"
},
"wbqc-constraintreport": "Constraint report",
+ "wbqc-desc": "Checks constraints on both items and properties and
displays the results on a special page",
"wbqc-constraintreport-explanation-part-one": "This special page
performs constraint checks on every entity you want. The entities are fetched
from the live system so every constraint violation you fix there will be
instantly removed from this list.",
"wbqc-constraintreport-explanation-part-two": "The constraints are
parsed from the property talk pages once a week, so if you add/delete/modify a
constraint it might take up to a week until this gets taken into account by
this constraint report. There is currently work in progress to migrate the
constraints to statements on properties, enabling this special page to do
live-checks.",
"wbqc-constraintreport-form-section": "Check constraints for entity",
diff --git a/extensions/Constraints/i18n/qqq.json
b/extensions/Constraints/i18n/qqq.json
index a9bb93f..64ac154 100644
--- a/extensions/Constraints/i18n/qqq.json
+++ b/extensions/Constraints/i18n/qqq.json
@@ -6,6 +6,7 @@
]
},
"wbqc-constraintreport": "{{doc-special|ConstraintReport}}",
+ "wbqc-desc": "{{desc|name=Wikibase Quality
Constraints|url=https://www.mediawiki.org/wiki/Extension:WikibaseQualityConstraints}}";,
"wbqc-constraintreport-explanation-part-one": "Explanation (part one),
what this special page does and how it gets its data.",
"wbqc-constraintreport-explanation-part-two": "Explanation (part two),
what this special page does and how it gets its data.",
"wbqc-constraintreport-form-section": "Header of the section of the
entity id form.",
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index ec5f1cd..7ff899f 100755
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -82,8 +82,8 @@
if ( $property && array_key_exists( 'minimum_quantity',
$constraintParameters ) && array_key_exists( 'maximum_quantity',
$constraintParameters ) ) {
$min =
$constraintParameters['minimum_quantity'];
$max =
$constraintParameters['maximum_quantity'];
- $parameters['minimum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_quantity'] );
- $parameters['maximum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_quantity'] );
+ $parameters['minimum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_quantity'], true );
+ $parameters['maximum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_quantity'], true );
} else {
$message = wfMessage(
"wbqc-violation-message-parameter-needed" )->params(
$constraint->getConstraintTypeName(), 'property", "minimum_quantity" and
"maximum_quantity' )->escaped();
}
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
index a2bc7e5..1d4d9e1 100755
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
@@ -77,8 +77,8 @@
if ( array_key_exists( 'minimum_quantity',
$constraintParameters ) && array_key_exists( 'maximum_quantity',
$constraintParameters ) && !array_key_exists( 'minimum_date',
$constraintParameters ) && !array_key_exists( 'maximum_date',
$constraintParameters ) ) {
$min =
$constraintParameters['minimum_quantity'];
$max =
$constraintParameters['maximum_quantity'];
- $parameters['minimum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_quantity'] );
- $parameters['maximum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_quantity'] );
+ $parameters['minimum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_quantity'], true );
+ $parameters['maximum_quantity'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_quantity'], true );
} else {
$message = wfMessage(
"wbqc-violation-message-range-parameters-needed" )->params( 'quantity',
'minimum_quantity" and "maximum_quantity' )->escaped();
}
@@ -86,8 +86,8 @@
if ( !array_key_exists( 'minimum_quantity',
$constraintParameters ) && !array_key_exists( 'maximum_quantity',
$constraintParameters ) && array_key_exists( 'minimum_date',
$constraintParameters ) && array_key_exists( 'maximum_date',
$constraintParameters ) ) {
$min = $constraintParameters['minimum_date'];
$max = $constraintParameters['maximum_date'];
- $parameters['minimum_date'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_date'] );
- $parameters['maximum_date'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_date'] );
+ $parameters['minimum_date'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['minimum_date'], true );
+ $parameters['maximum_date'] =
$this->constraintParameterParser->parseSingleParameter(
$constraintParameters['maximum_date'], true );
} else {
$message = wfMessage(
"wbqc-violation-message-range-parameters-needed" )->params( 'time',
'minimum_date" and "maximum_date' )->escaped();
}
diff --git a/extensions/Quality/WikibaseQuality.php
b/extensions/Quality/WikibaseQuality.php
index f368a47..302eadb 100755
--- a/extensions/Quality/WikibaseQuality.php
+++ b/extensions/Quality/WikibaseQuality.php
@@ -18,9 +18,6 @@
$GLOBALS['wgMessagesDirs']['WikibaseQuality'] = __DIR__ . '/i18n';
$GLOBALS['wgExtensionMessagesFiles']['WikibaseQualityAlias'] = __DIR__
. '/WikibaseQuality.alias.php';
- // Initalize hooks for creating database tables
- $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
'WikibaseQualityHooks::onCreateSchema';
-
// Register hooks for Unit Tests
$GLOBALS['wgHooks']['UnitTestsList'][] =
'WikibaseQualityHooks::onUnitTestsList';
diff --git a/extensions/Quality/WikibaseQualityHooks.php
b/extensions/Quality/WikibaseQualityHooks.php
index 486f410..680f635 100755
--- a/extensions/Quality/WikibaseQualityHooks.php
+++ b/extensions/Quality/WikibaseQualityHooks.php
@@ -2,16 +2,6 @@
final class WikibaseQualityHooks {
- /**
- * @param DatabaseUpdater $updater
- *
- * @return bool
- */
- public static function onCreateSchema( DatabaseUpdater $updater ) {
- $updater->addExtensionTable( 'wbq_violations', __DIR__ .
'/sql/create_wbq_violations.sql' );
- return true;
- }
-
public static function onUnitTestsList( &$paths ) {
$paths[] = __DIR__ . '/tests/phpunit';
return true;
diff --git a/extensions/Quality/sql/create_wbq_evaluation.sql
b/extensions/Quality/sql/create_wbq_evaluation.sql
deleted file mode 100755
index fbd6c84..0000000
--- a/extensions/Quality/sql/create_wbq_evaluation.sql
+++ /dev/null
@@ -1,7 +0,0 @@
- CREATE TABLE IF NOT EXISTS /*_*/wbq_evaluation (
- special_page_id int NOT
NULL,
- entity_id VARCHAR(15) NOT
NULL,
- insertion_timestamp int NOT
NULL,
- reference_timestamp int
DEFAULT NULL,
- result_string TEXT
DEFAULT NULL
- ) /*$wgDBTableOptions*/;
\ No newline at end of file
diff --git a/extensions/Quality/sql/create_wbq_violations.sql
b/extensions/Quality/sql/create_wbq_violations.sql
deleted file mode 100755
index 90f6414..0000000
--- a/extensions/Quality/sql/create_wbq_violations.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE IF NOT EXISTS /*_*/wbq_violations (
- entity_id VARBINARY(15) NOT NULL,
- pid VARBINARY(15) NOT NULL,
- claim_guid VARBINARY(63) NOT NULL,
- constraint_id VARBINARY(63) NOT NULL,
- constraint_type_entity_id VARBINARY(15) NOT NULL,
- additional_info TEXT DEFAULT NULL,
- updated_at VARBINARY(31) NOT NULL,
- revision_id INT(10) UNSIGNED NOT NULL,
- status VARBINARY(31) NOT NULL,
- PRIMARY KEY (claim_guid, constraint_id)
-) /*$wgDBTableOptions*/;
-
-CREATE INDEX /*i*/claim_guid ON /*_*/wbq_violations (claim_guid);
-CREATE INDEX /*i*/constraint_id ON /*_*/wbq_violations (constraint_id);
\ No newline at end of file
diff --git a/extensions/Wikibase/build/travis/install.sh
b/extensions/Wikibase/build/travis/install.sh
index 2ab6361..495d345 100644
--- a/extensions/Wikibase/build/travis/install.sh
+++ b/extensions/Wikibase/build/travis/install.sh
@@ -21,6 +21,7 @@
cd phase3
composer self-update
composer install
+composer dump-autoload -o # Workaround
https://github.com/wikimedia/composer-merge-plugin/issues/41
mysql -e 'create database its_a_mw;'
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
diff --git a/extensions/Wikibase/client/i18n/fr.json
b/extensions/Wikibase/client/i18n/fr.json
index 0e61870..0cb4eff 100644
--- a/extensions/Wikibase/client/i18n/fr.json
+++ b/extensions/Wikibase/client/i18n/fr.json
@@ -19,8 +19,17 @@
},
"wikibase-client-desc": "Client pour l’extension Wikibase",
"tooltip-t-wikibase": "Lien vers l’élément de référentiel des données
connectées",
+ "apihelp-query+pageterms-description": "Obtenir les termes associés
avec une page via un élément de donnée associé.",
+ "apihelp-query+pageterms-example-simple": "Obtenir tous les termes
associés avec la page 'London', dans la langue de l’utilisateur.",
+ "apihelp-query+pageterms-example-label-en": "Obtenir les libellés et
les alias associés avec la page 'London', en anglais.",
+ "apihelp-query+pageterms-param-terms": "Les types de termes à obtenir,
par ex. 'description'. Si non spécifié, tous les types sont renvoyés.",
+ "apihelp-query+wikibase-description": "Obtenir des informations sur le
client Wikibase et le référentiel Wikibase associé.",
+ "apihelp-query+wikibase-example": "Obtenir le chemin de l’URL et
d’autres informations sur le client et le référentiel Wikibase.",
+ "apihelp-query+wikibase-param-prop": "Quelles propriétés obtenir
:\n;<kbd>url</kbd>: URL de base, chemin du script et chemin de l’article du
référentiel Wikibase.\n;<kbd>siteid</kbd>: Le siteid de ce site.",
"wikibase-after-page-move": "Vous pouvez aussi [$1 mettre à jour]
l’élément {{WBREPONAME}} associé pour conserver les liens de langue sur la page
déplacée.",
"wikibase-after-page-move-queued": "L’[$1 élément {{WBREPONAME}}]
associé avec cette page sera bientôt mis à jour automatiquement.",
+ "wikibase-after-page-delete": "Vous pouvez aussi supprimer le lien vers
cette page depuis l’[$1 {{WBREPONAME}} élément] associé pour maintenir les
liens de langue.",
+ "wikibase-after-page-delete-queued": "L’[$1 élément {{WBREPONAME}}]
associé avec cette page sera automatiquement mis à jour bientôt.",
"wikibase-comment-add": "Un élément {{WBREPONAME}} a été créé.",
"wikibase-comment-remove": "Élément {{WBREPONAME}} associé supprimé.
Liens de langue supprimés.",
"wikibase-comment-linked": "Un élément {{WBREPONAME}} a été lié à cette
page.",
@@ -58,10 +67,11 @@
"wikibase-rc-wikibase-edit-title": "Modification de {{WBREPONAME}}.",
"wikibase-replicationnote": "Veuillez noter que cela peut prendre
plusieurs minutes avant que les modifications soient visibles sur tous les
wikis.",
"wikibase-watchlist-show-changes-pref": "Voir les modifications de
{{WBREPONAME}} dans votre liste de suivi",
+ "wikibase-error-deserialize-error": "Échec à la désérialisation des
données.",
"wikibase-error-serialize-error": "Échec à la sérialisation des
données",
"wikibase-error-invalid-entity-id": "L’ID saisi est inconnu du système.
Veuillez utiliser un ID d’entité valide.",
"unconnectedpages": "Pages non reliées à un élément",
- "unconnectedpages-summary": "Cette page répertorie les pages non
reliées à un élément. La liste est limitée aux espaces de noms qui prennent en
charge les éléments connectés.",
+ "unconnectedpages-summary": "Cette page répertorie les pages non
reliées à un élément de données (dans les espaces de noms qui prennent en
charge les éléments connectés). La liste est triée par ID de page décroissant,
afin que les nouvelles pages apparaissent en premier.",
"wikibase-unconnectedpages-page": "Début de la liste des résultats avec
la page :",
"wikibase-unconnectedpages-submit": "Démarrer",
"wikibase-unconnectedpages-invalid-language": "« $1 » n’est pas un code
de langue valide.",
diff --git a/extensions/Wikibase/client/i18n/hrx.json
b/extensions/Wikibase/client/i18n/hrx.json
new file mode 100644
index 0000000..49cafde
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/hrx.json
@@ -0,0 +1,13 @@
+{
+ "@metadata": {
+ "authors": [
+ "Midnight Gambler"
+ ]
+ },
+ "wikibase-editlinks": "Links beoorbeite",
+ "wikibase-rc-hide-wikidata": "{{WBREPONAME}} $1",
+ "wikibase-rc-hide-wikidata-hide": "Ausblenne",
+ "wikibase-rc-hide-wikidata-show": "Zeich",
+ "wikibase-rc-wikibase-edit-letter": "D",
+ "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}}-eoorbeite"
+}
diff --git a/extensions/Wikibase/client/i18n/udm.json
b/extensions/Wikibase/client/i18n/udm.json
index 77a4ff7..959cfbd 100644
--- a/extensions/Wikibase/client/i18n/udm.json
+++ b/extensions/Wikibase/client/i18n/udm.json
@@ -5,6 +5,7 @@
"AlnashPiyash2"
]
},
+ "wikibase-editlinks": "Чӧлсконъёсыз тупатыны",
"wikibase-rc-wikibase-edit-title": "Тупатон
{{grammar:genitive|{{WBREPONAME}}}}",
"wikibase-otherprojects": "Мукет проектъёсын"
}
diff --git a/extensions/Wikibase/lib/i18n/el.json
b/extensions/Wikibase/lib/i18n/el.json
index c5da018..3db1f9f 100644
--- a/extensions/Wikibase/lib/i18n/el.json
+++ b/extensions/Wikibase/lib/i18n/el.json
@@ -5,13 +5,14 @@
"Indoril",
"Xaris333",
"FocalPoint",
- "Fitoschido"
+ "Fitoschido",
+ "Protnet"
]
},
"specialpages-group-wikibase": "Wikibase αποθετήριο",
- "wikibase-deletedentity-item": "Διαγραμμένο αντικείμενο",
- "wikibase-deletedentity-property": "Διαγραμμένη ιδιότητα",
- "wikibase-deletedentity-query": "Διαγραμμένο ερώτημα",
+ "wikibase-deletedentity-item": "Διαγεγραμμένο αντικείμενο",
+ "wikibase-deletedentity-property": "Διαγεγραμμένη ιδιότητα",
+ "wikibase-deletedentity-query": "Διαγεγραμμένο ερώτημα",
"wikibase-error-unexpected": "Παρουσιάστηκε ένα απροσδόκητο σφάλμα.",
"wikibase-error-save-generic": "Παρουσιάστηκε σφάλμα κατά την
προσπάθειά σας να αποθηκεύσετε και εξαιτίας αυτού, οι αλλαγές σας μπορεί να μην
ολοκληρώθηκαν.",
"wikibase-error-remove-generic": "Παρουσιάστηκε σφάλμα κατά την
προσπάθεια να προβείτε στην αφαίρεση και εξαιτίας αυτού, οι αλλαγές σας μπορεί
να μην έχουν ολοκληρωθεί.",
diff --git a/extensions/Wikibase/lib/i18n/fr.json
b/extensions/Wikibase/lib/i18n/fr.json
index 0ed6f5b..60303d5 100644
--- a/extensions/Wikibase/lib/i18n/fr.json
+++ b/extensions/Wikibase/lib/i18n/fr.json
@@ -88,7 +88,7 @@
"datatypes-type-wikibase-property": "Propriété",
"datatypes-type-commonsMedia": "Fichier multimédia de Commons",
"version-wikibase": "Wikibase",
- "wikibase-time-precision-Gannum": "dans $1 milliards d’années",
+ "wikibase-time-precision-Gannum": "$1 milliards d’années EC",
"wikibase-time-precision-Mannum": "dans $1 millions d’années",
"wikibase-time-precision-annum": "dans $1 années",
"wikibase-time-precision-millennium": "$1. millénaire",
diff --git a/extensions/Wikibase/lib/i18n/hrx.json
b/extensions/Wikibase/lib/i18n/hrx.json
new file mode 100644
index 0000000..a5d54a9
--- /dev/null
+++ b/extensions/Wikibase/lib/i18n/hrx.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Midnight Gambler"
+ ]
+ },
+ "wikibase-sitelinks-wikipedia": "Wikipedia"
+}
diff --git
a/extensions/Wikibase/lib/tests/phpunit/serializers/SerializerFactoryTest.php
b/extensions/Wikibase/lib/tests/phpunit/serializers/SerializerFactoryTest.php
index 0f727ed..c800342 100644
---
a/extensions/Wikibase/lib/tests/phpunit/serializers/SerializerFactoryTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/serializers/SerializerFactoryTest.php
@@ -2,11 +2,11 @@
namespace Wikibase\Lib\Test\Serializers;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Statement\Statement;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
@@ -33,7 +33,7 @@
$argLists[] = array( new PropertyNoValueSnak( 42 ) );
$argLists[] = array( new Reference() );
- $argLists[] = array( new Claim( new PropertyNoValueSnak( 42 ) )
);
+ $argLists[] = array( new Statement( new PropertyNoValueSnak( 42
) ) );
$argLists[] = array( new Item(), new SerializationOptions() );
diff --git a/extensions/Wikibase/repo/i18n/en.json
b/extensions/Wikibase/repo/i18n/en.json
index 8a8067e..7bdd3d7 100644
--- a/extensions/Wikibase/repo/i18n/en.json
+++ b/extensions/Wikibase/repo/i18n/en.json
@@ -59,8 +59,8 @@
"wikibase-entitytermsforlanguageview-input-help-message": "Enter the
label of this entity, a short description and aliases in $1.",
"wikibase-statements": "Statements",
"wikibase-terms": "In other languages",
- "wikibase-sitelinks": "Site links",
- "wikibase-sitelinkgroupview-input-help-message": "Add a site link by
specifying a site and a page of that site, edit or remove existing site links.",
+ "wikibase-sitelinks": "Sitelinks",
+ "wikibase-sitelinkgroupview-input-help-message": "Add a sitelink by
specifying a site and a page of that site, edit or remove existing sitelinks.",
"wikibase-sitelinks-empty": "No page is linked to this item.",
"wikibase-sitelinks-input-help-message": "Set a link to a page related
to this item.",
"wikibase-sitelinks-special": "Other sites",
@@ -193,7 +193,7 @@
"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-label": "Site link:",
+ "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\".",
diff --git a/extensions/Wikibase/repo/i18n/hrx.json
b/extensions/Wikibase/repo/i18n/hrx.json
new file mode 100644
index 0000000..4eef480
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/hrx.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Midnight Gambler"
+ ]
+ },
+ "wikibase-edit": "beoorbeite"
+}
diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
+++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index 08a4d2d..d181a7a 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -7,7 +7,6 @@
use ValueValidators\Result;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\ChangeOp\ChangeOpsMerge;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -319,11 +318,11 @@
$itemWithQualifiedStatement->copy()
);
- $anotherQualifiedClaim = new Claim(
+ $anotherQualifiedStatement = new Statement(
new PropertyNoValueSnak( new PropertyId( 'P88' ) ),
new SnakList( array( new PropertyNoValueSnak( new
PropertyId( 'P88' ) ) ) )
);
- $anotherQualifiedClaim->setGuid(
'Q111$D8404CDA-25E4-4334-AF88-A3290BCD9C0F' );
+ $anotherQualifiedStatement->setGuid(
'Q111$D8404CDA-25E4-4334-AF88-A3290BCD9C0F' );
$bigItem = new Item();
$bigItem->getFingerprint()->setLabel( 'en', 'foo' );
@@ -333,7 +332,7 @@
$bigItem->getFingerprint()->setAliasGroup( 'en', array( 'foo',
'bar' ) );
$bigItem->getFingerprint()->setAliasGroup( 'de', array(
'defoo', 'debar' ) );
$bigItem->getSiteLinkList()->addNewSiteLink( 'dewiki', 'foo' );
- $bigItem->getStatements()->addStatement( $anotherQualifiedClaim
);
+ $bigItem->getStatements()->addStatement(
$anotherQualifiedStatement );
$testCases['itemMerge'] = array(
$bigItem->copy(),
@@ -343,7 +342,6 @@
);
$bigItem->getSiteLinkList()->addNewSiteLink( 'nlwiki', 'bar' );
-
$smallerItem = new Item();
$smallerItem->getFingerprint()->setLabel( 'en', 'toLabel' );
@@ -364,7 +362,7 @@
$bigMergedItem->getSiteLinkList()->addNewSiteLink( 'dewiki',
'foo' );
$bigMergedItem->getSiteLinkList()->addNewSiteLink( 'nlwiki',
'toLink' );
- $bigMergedItem->setStatements( new StatementList(
$anotherQualifiedClaim ) );
+ $bigMergedItem->setStatements( new StatementList(
$anotherQualifiedStatement ) );
$testCases['ignoreConflictItemMerge'] = array(
$bigItem->copy(),
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
index 2c236a9..cf764db 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -538,6 +538,31 @@
$this->doTestQueryExceptions( $params, $expected['exception'] );
}
+ public function testLabelDescriptionConflict() {
+ // FIXME: MySQL doesn't support self-joins on temporary tables,
+ // so skip this check during unit tests on MySQL!
+ // There is a similar check to this in TermSqlIndex
+ if ( $this->db->getType() == 'mysql' ) {
+ $this->markTestSkipped( 'MySQL doesn\'t support
self-joins on temporary tables' );
+ }
+
+ $params = array(
+ 'action' => 'wbeditentity',
+ 'new' => 'item',
+ 'data' => '{
+ "labels": { "de": { "language": "de", "value":
"LabelWithDescriptionConflict" } },
+ "descriptions": { "de": { "language": "de",
"value": "LabelWithDescriptionConflict" } }
+ }',
+ );
+ $this->doApiRequestWithToken( $params );
+
+ $expectedException = array(
+ 'type' => 'UsageException',
+ 'code' => 'modification-failed',
+ );
+ $this->doTestQueryExceptions( $params, $expectedException );
+ }
+
public function testClearFromBadRevId() {
$params = array(
'action' => 'wbeditentity',
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 8cea391..0eb8289 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -5,7 +5,6 @@
use ApiResult;
use DataValues\StringValue;
use Wikibase\Api\ResultBuilder;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -15,6 +14,7 @@
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\SnakList;
+use Wikibase\DataModel\Statement\Statement;
use Wikibase\EntityRevision;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
@@ -593,9 +593,9 @@
public function testAddClaims() {
$result = $this->getDefaultResult();
- $claim1 = new Claim( new PropertyValueSnak( new PropertyId(
'P12' ), new StringValue( 'stringVal' ) ) );
- $claim1->setGuid( 'fooguidbar' );
- $claims = array( $claim1 );
+ $statement = new Statement( new PropertyValueSnak( new
PropertyId( 'P12' ), new StringValue( 'stringVal' ) ) );
+ $statement->setGuid( 'fooguidbar' );
+ $claims = array( $statement );
$path = array( 'entities', 'Q1' );
$expected = array(
'entities' => array(
@@ -635,8 +635,8 @@
public function testAddClaim() {
$result = $this->getDefaultResult();
- $claim = new Claim( new PropertyValueSnak( new PropertyId(
'P12' ), new StringValue( 'stringVal' ) ) );
- $claim->setGuid( 'fooguidbar' );
+ $statement = new Statement( new PropertyValueSnak( new
PropertyId( 'P12' ), new StringValue( 'stringVal' ) ) );
+ $statement->setGuid( 'fooguidbar' );
$expected = array(
'claim' => array(
'id' => 'fooguidbar',
@@ -655,7 +655,7 @@
);
$resultBuilder = $this->getResultBuilder( $result );
- $resultBuilder->addClaim( $claim );
+ $resultBuilder->addClaim( $statement );
$data = $result->getResultData( null, array(
'BC' => array(),
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.css
b/extensions/Wikibase/view/resources/wikibase/wikibase.css
index e59e1dd..8c8ffd7 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.css
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.css
@@ -440,6 +440,8 @@
.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview {
position: relative;
+ line-height: 1.2;
+ margin: .2em 0 .4em;
min-height: 1.8em;
padding-top: 4px;
padding-bottom: 2px;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d302cf4..0988252 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1212,12 +1212,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374"
+ "reference": "52dd6ef614b4d64727482ea2eecd68aef436ff70"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8a4445f67012a5b55e26a5f66a3e1e80d309d374";,
- "reference": "8a4445f67012a5b55e26a5f66a3e1e80d309d374",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/52dd6ef614b4d64727482ea2eecd68aef436ff70";,
+ "reference": "52dd6ef614b4d64727482ea2eecd68aef436ff70",
"shasum": ""
},
"require": {
@@ -1247,7 +1247,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-06-30 01:17:52",
+ "time": "2015-06-30 22:40:38",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1395,7 +1395,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "6c877b930d068c0c11e2ee82907ca7409b6dd4ef"
+ "reference": "0e6c3c95ab49c449d35b3228691c885062f766bb"
},
"require": {
"php": ">=5.3.0",
@@ -1406,7 +1406,7 @@
"phpunit/phpunit": "~3.7,>=3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-06-22 08:31:58",
+ "time": "2015-06-30 13:02:17",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
@@ -1448,7 +1448,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "4d28f74a8d0076446b6071753fada9ac78ad9d29"
+ "reference": "144850d3908dc400301c6faab743369d424ba032"
},
"require": {
"php": ">=5.3.0",
@@ -1459,7 +1459,7 @@
"phpunit/phpunit": "~3.7,>=3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-06-23 22:13:00",
+ "time": "2015-07-01 08:44:17",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/222090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4081c42adeb36bf901480ecd8c45741130cadaaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
