WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135409
Change subject: New Wikidata Build - 26/05/2014 10:00
......................................................................
New Wikidata Build - 26/05/2014 10:00
Change-Id: I65f8377453c1addaa2e99a232cd8c27b953c830c
---
M composer.lock
M extensions/Wikibase/client/i18n/az.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/repo/i18n/diq.json
M extensions/Wikibase/repo/includes/api/EditEntity.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
9 files changed, 33 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/09/135409/1
diff --git a/composer.lock b/composer.lock
index f53a528..c7d599f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -869,12 +869,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "638a54480d2f5eb3396170732e0e12609c87f147"
+ "reference": "1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/638a54480d2f5eb3396170732e0e12609c87f147";,
- "reference": "638a54480d2f5eb3396170732e0e12609c87f147",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c";,
+ "reference": "1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c",
"shasum": ""
},
"require": {
@@ -937,7 +937,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-05-24 20:14:29"
+ "time": "2014-05-26 08:51:48"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/client/i18n/az.json
b/extensions/Wikibase/client/i18n/az.json
index 6d23989..9cde512 100644
--- a/extensions/Wikibase/client/i18n/az.json
+++ b/extensions/Wikibase/client/i18n/az.json
@@ -5,6 +5,7 @@
"Wertuose"
]
},
+ "wikibase-after-page-move-queued": "Bu səhifə ilə əlaqəli olan [$1
{{WBREPONAME}} qeydi] tezliklə avtomatik dəyişdiriləcək.",
"wikibase-dataitem": "Verilənlərin elementi",
"wikibase-editlinks": "Keçidlərin redaktəsi",
"wikibase-editlinkstitle": "Dillərarası keçidləri redaktə et",
diff --git a/extensions/Wikibase/client/i18n/nl.json
b/extensions/Wikibase/client/i18n/nl.json
index 68b5836..b8479f7 100644
--- a/extensions/Wikibase/client/i18n/nl.json
+++ b/extensions/Wikibase/client/i18n/nl.json
@@ -6,7 +6,8 @@
"Multichill",
"Servien",
"Siebrand",
- "Sjoerddebruin"
+ "Sjoerddebruin",
+ "Mar(c)"
]
},
"wikibase-client-desc": "Client voor de uitbreiding Wikibase",
@@ -49,7 +50,7 @@
"wikibase-rc-show-wikidata-pref": "Bewerkingen van {{WBREPONAME}}
weergeven in recente wijzigingen",
"wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "Bewerking van {{WBREPONAME}}",
- "wikibase-watchlist-show-changes-pref": "Bewerkingen van {{WBREPONAME}}
weergeven in uw volglijst",
+ "wikibase-watchlist-show-changes-pref": "Bewerkingen van {{WBREPONAME}}
op mijn volglijst weergeven",
"wikibase-error-serialize-error": "De gegevens konden niet
geserialiseerd worden",
"wikibase-error-invalid-entity-id": "Het opgegeven ID is niet bekend in
het systeem. Gebruik een geldig entiteits-ID.",
"special-unconnectedpages": "Pagina's die niet gekoppeld zijn aan
items",
diff --git a/extensions/Wikibase/repo/i18n/diq.json
b/extensions/Wikibase/repo/i18n/diq.json
index fac93a2..c2261ba 100644
--- a/extensions/Wikibase/repo/i18n/diq.json
+++ b/extensions/Wikibase/repo/i18n/diq.json
@@ -10,7 +10,7 @@
"wikibase-edit": "bıvurne",
"wikibase-save": "qeyd ke",
"wikibase-cancel": "bıtexelne",
- "wikibase-add": "Deke",
+ "wikibase-add": "cı ke",
"wikibase-addreference": "referans cı ke",
"wikibase-save-inprogress": "Starêno...",
"wikibase-remove-inprogress": "Wedarêno",
diff --git a/extensions/Wikibase/repo/includes/api/EditEntity.php
b/extensions/Wikibase/repo/includes/api/EditEntity.php
index 55e2790..316e3fd 100644
--- a/extensions/Wikibase/repo/includes/api/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/api/EditEntity.php
@@ -276,9 +276,10 @@
$this->validateMultilangArgs( $arg, $langCode );
$language = $arg['language'];
- $newLabel = $this->stringNormalizer->trimToNFC(
$arg['value'] );
+ $newLabel = ( array_key_exists( 'remove', $arg ) ? '' :
+ $this->stringNormalizer->trimToNFC(
$arg['value'] ) );
- if ( array_key_exists( 'remove', $arg ) || $newLabel
=== "" ) {
+ if ( $newLabel === "" ) {
$labelChangeOps[] =
$this->termChangeOpFactory->newRemoveLabelOp( $language );
}
else {
@@ -305,9 +306,10 @@
$this->validateMultilangArgs( $arg, $langCode );
$language = $arg['language'];
- $newDescription = $this->stringNormalizer->trimToNFC(
$arg['value'] );
+ $newDescription = ( array_key_exists( 'remove', $arg )
? '' :
+ $this->stringNormalizer->trimToNFC(
$arg['value'] ) );
- if ( array_key_exists( 'remove', $arg ) ||
$newDescription === "" ) {
+ if ( $newDescription === "" ) {
$descriptionChangeOps[] =
$this->termChangeOpFactory->newRemoveDescriptionOp( $language );
}
else {
@@ -847,7 +849,7 @@
"unknown language: {$arg['language']}",
'not-recognized-language' );
}
- if ( !is_string( $arg['value'] ) ) {
+ if ( !array_key_exists( 'remove', $arg ) && !is_string(
$arg['value'] ) ) {
$this->dieUsage(
"A string was expected, but not found in the
json for the langCode {$langCode} and argument 'value'" ,
'not-recognized-string' );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
index 77a3632..a0060b9 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -156,10 +156,16 @@
'add 2 labels' => array( // add 2 labels
'p' => array( 'data' =>
'{"labels":{"en":{"language":"en","value":"A
Label"},"sv":{"language":"sv","value":"SVLabel"}}}' ),
'e' => array( 'labels' => array( 'en' => 'A
Label', 'sv' => 'SVLabel' ) ) ),
+ 'remove a label with remove' => array( // remove a
label with remove
+ 'p' => array( 'data' =>
'{"labels":{"en":{"language":"en","remove":true}}}' ),
+ 'e' => array( 'labels' => array( 'sv' =>
'SVLabel' ) ) ),
'override and add 2 descriptions' => array( // override
and add 2 descriptions
'p' => array( 'clear' => '', 'data' =>
'{"descriptions":{"en":{"language":"en","value":"DESC1"},"de":{"language":"de","value":"DESC2"}}}'
),
'e' => array( 'descriptions' => array( 'en' =>
'DESC1', 'de' => 'DESC2' ) ) ),
- 'override and add a 2 sitelinks..' => array( //
override and add a 2 sitelinks..
+ 'remove a description with remove' => array( // remove
a description with remove
+ 'p' => array( 'data' =>
'{"descriptions":{"en":{"language":"en","remove":true}}}' ),
+ 'e' => array( 'descriptions' => array( 'de' =>
'DESC2' ) ) ),
+ 'override and add 2 sitelinks..' => array( // override
and add 2 sitelinks..
'p' => array( 'data' =>
'{"sitelinks":{"dewiki":{"site":"dewiki","title":"BAA"},"svwiki":{"site":"svwiki","title":"FOO"}}}'
),
'e' => array(
'type' => 'item',
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 962ab9c..e48f969 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInited53dd1214d61d7e59cb8eddf8e6d92a::getLoader();
+return ComposerAutoloaderInit44183b17f5507a42d3c2407efe79b872::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index d4a56f6..c14e3bc 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInited53dd1214d61d7e59cb8eddf8e6d92a
+class ComposerAutoloaderInit44183b17f5507a42d3c2407efe79b872
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInited53dd1214d61d7e59cb8eddf8e6d92a',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit44183b17f5507a42d3c2407efe79b872',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInited53dd1214d61d7e59cb8eddf8e6d92a',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit44183b17f5507a42d3c2407efe79b872',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireed53dd1214d61d7e59cb8eddf8e6d92a($file);
+ composerRequire44183b17f5507a42d3c2407efe79b872($file);
}
return $loader;
}
}
-function composerRequireed53dd1214d61d7e59cb8eddf8e6d92a($file)
+function composerRequire44183b17f5507a42d3c2407efe79b872($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 539b174..e9ef4d2 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -896,12 +896,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "638a54480d2f5eb3396170732e0e12609c87f147"
+ "reference": "1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/638a54480d2f5eb3396170732e0e12609c87f147";,
- "reference": "638a54480d2f5eb3396170732e0e12609c87f147",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c";,
+ "reference": "1e3aaf008a50c566ff9ebecbed90a7a5bdbd721c",
"shasum": ""
},
"require": {
@@ -924,7 +924,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-05-24 20:14:29",
+ "time": "2014-05-26 08:51:48",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/135409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65f8377453c1addaa2e99a232cd8c27b953c830c
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
