WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325521
Change subject: New Wikidata Build - 2016-12-06T10:00:01+0000
......................................................................
New Wikidata Build - 2016-12-06T10:00:01+0000
Change-Id: I3de70dc0e6a7cf2ad9f915392cddd69e8d32c2bb
---
M composer.lock
M extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
M
extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
M
extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
A extensions/Wikibase/.editorconfig
M extensions/Wikibase/client/i18n/sty.json
A extensions/Wikibase/repo/i18n/sty.json
M extensions/Wikibase/repo/includes/Rdf/Values/QuantityRdfBuilder.php
M extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Rdf/Values/QuantityRdfBuilderTest.php
M vendor/composer/installed.json
11 files changed, 122 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/21/325521/1
diff --git a/composer.lock b/composer.lock
index f55d5e1..51fe98f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -797,12 +797,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "a1885b4f47445d8a1b40d113b623f98c3005b08b"
+ "reference": "06e41fd8cb7d60799ffc019a3d8ca3e508102f32"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a1885b4f47445d8a1b40d113b623f98c3005b08b";,
- "reference": "a1885b4f47445d8a1b40d113b623f98c3005b08b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/06e41fd8cb7d60799ffc019a3d8ca3e508102f32";,
+ "reference": "06e41fd8cb7d60799ffc019a3d8ca3e508102f32",
"shasum": ""
},
"require-dev": {
@@ -827,7 +827,7 @@
],
"description": "Provides a special page with Wikibase information
about a certain topic, with invitation to create an article for the topic",
"homepage":
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
- "time": "2016-12-02 10:49:13"
+ "time": "2016-12-05 11:25:27"
},
{
"name": "propertysuggester/property-suggester",
@@ -1585,12 +1585,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b80daa060e9dc6e6d98920203a128362a9150517"
+ "reference": "c2478051da4d8c53bb1599cd537f9826bb6965e6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517";,
- "reference": "b80daa060e9dc6e6d98920203a128362a9150517",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2478051da4d8c53bb1599cd537f9826bb6965e6";,
+ "reference": "c2478051da4d8c53bb1599cd537f9826bb6965e6",
"shasum": ""
},
"require": {
@@ -1662,7 +1662,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-12-04 21:41:34"
+ "time": "2016-12-06 09:44:25"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
b/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
index 167bd83..2288a40 100644
--- a/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
+++ b/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
@@ -28,7 +28,7 @@
$this->setHeaders();
if ( $this->getRequest()->getVal( 'ref' ) === 'button' ) {
$statsd =
MediaWikiServices::getInstance()->getStatsdDataFactory();
- $statsd->increment(
'wikibase.articleplaceholder.button.create-article' );
+ $statsd->increment(
'wikibase.articleplaceholder.button.createArticle' );
}
$page = $this->getRequest()->getVal( 'wptitleinput', $par );
if ( $page === '' || $page === null ) {
diff --git
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
index bd8f55d..7ed4baa 100644
---
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
+++
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
@@ -41,7 +41,7 @@
return
CreateArticleTranslationDialog.super.prototype.onSubmit.apply( this );
}
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translate-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translateArticle' );
mw.loader.using( 'ext.cx.sitemapper' ).then( function () {
document.location.href =
mw.cx.SiteMapper.prototype.getCXUrl(
diff --git
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
index 4ea6b57..b0264d4 100644
---
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
+++
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
@@ -19,7 +19,7 @@
windowManager.addWindows( [ dialog ] );
OO.ui.infuse( 'new-article-button' ).on( 'click', function () {
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.create-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.createArticle' );
windowManager.openWindow( dialog );
} );
}
diff --git a/extensions/Wikibase/.editorconfig
b/extensions/Wikibase/.editorconfig
new file mode 100644
index 0000000..452169f
--- /dev/null
+++ b/extensions/Wikibase/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+max_line_length = 140
+quote_type = single
+spaces_around_operators = true
+spaces_around_brackets = inside
+indent_brace_style = K&R
diff --git a/extensions/Wikibase/client/i18n/sty.json
b/extensions/Wikibase/client/i18n/sty.json
index f3b6ea6..13256e9 100644
--- a/extensions/Wikibase/client/i18n/sty.json
+++ b/extensions/Wikibase/client/i18n/sty.json
@@ -5,6 +5,7 @@
]
},
"tooltip-t-wikibase": "Мәғлүмәтле репозиторийтағы пәйләнкән элементҡа
ссылка",
+ "wikibase-comment-update": "{{WBREPONAME}} элемент төсәтелгән",
"wikibase-dataitem": "{{WBREPONAME}}ның элементы",
"wikibase-editlinks": "Ссылкаларны төсәткәле",
"wikibase-editlinkstitle": "Пашҡа телләртәге ссылкаларны төсәткәле"
diff --git a/extensions/Wikibase/repo/i18n/sty.json
b/extensions/Wikibase/repo/i18n/sty.json
new file mode 100644
index 0000000..43da819
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/sty.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Khanmarat"
+ ]
+ },
+ "wikibase-edit": "төсәткәле"
+}
diff --git
a/extensions/Wikibase/repo/includes/Rdf/Values/QuantityRdfBuilder.php
b/extensions/Wikibase/repo/includes/Rdf/Values/QuantityRdfBuilder.php
index 33cc262..2d9cf6e 100644
--- a/extensions/Wikibase/repo/includes/Rdf/Values/QuantityRdfBuilder.php
+++ b/extensions/Wikibase/repo/includes/Rdf/Values/QuantityRdfBuilder.php
@@ -74,32 +74,22 @@
// Can we convert units? This condition may become more
complex in the future,
// but should keep checks for all prerequisites being
set.
// FIXME: make this depend on flavor
- if ( $valueLName && $this->unitConverter != null ) {
+ if ( $this->unitConverter ) {
$newValue =
$this->unitConverter->toStandardUnits( $value );
if ( $newValue ) {
+ $normLName = $this->addValueNode(
+ $writer,
+ $propertyValueNamespace,
+ $propertyValueLName,
+ $dataType,
+ $newValue,
+ true
+ );
if ( $newValue->equals( $value ) ) {
-
$this->complexValueHelper->attachValueNode(
- $writer,
- $propertyValueNamespace,
- $propertyValueLName,
- $dataType,
- $value,
- true
- );
-
- // The unnormalize value is
always its own normalization.
+ // The normalized value is
always its own normalization.
$this->linkNormalizedValue(
$valueLName, $valueLName );
} else {
- $normLName =
$this->addValueNode(
- $writer,
- $propertyValueNamespace,
- $propertyValueLName,
- $dataType,
- $newValue,
- true
- );
-
// The normalized value is
always its own normalization.
$this->linkNormalizedValue(
$normLName, $normLName );
@@ -114,10 +104,13 @@
/**
* Connects a normalized value node to its base node via the
quantityNormalized predicate.
*
- * @param string $valueLName
- * @param string $normLName
+ * @param string|null $valueLName
+ * @param string|null $normLName
*/
private function linkNormalizedValue( $valueLName, $normLName ) {
+ if ( is_null( $valueLName ) || is_null( $normLName ) ) {
+ return;
+ }
$valueWriter = $this->complexValueHelper->getValueNodeWriter();
$valueWriter->about( RdfVocabulary::NS_VALUE, $valueLName )
->say( RdfVocabulary::NS_ONTOLOGY, 'quantityNormalized'
)
diff --git
a/extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
b/extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
index 17814cc..39fb56c 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
@@ -170,7 +170,7 @@
)
);
- HTMLForm::factory( 'inline', $formDescriptor,
$this->getContext() )
+ HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext()
)
->setId( 'wb-listproperties-form' )
->setMethod( 'get' )
->setWrapperLegendMsg( 'wikibase-listproperties-legend'
)
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/Values/QuantityRdfBuilderTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/Values/QuantityRdfBuilderTest.php
index 25fc238..3ae16cf 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/Values/QuantityRdfBuilderTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Rdf/Values/QuantityRdfBuilderTest.php
@@ -330,4 +330,66 @@
$this->helper->assertNTriplesEquals( $expected, $result );
}
+ /**
+ * @ticket T150877
+ */
+ public function testWriteTwice() {
+ $unboundedValue = UnboundedQuantityValue::newFromNumber(
'-79.1', 'Q2' );
+ $unboundedSnak = new PropertyValueSnak( new PropertyId( 'P7' ),
$unboundedValue );
+ $unboundedSnak2 = new PropertyValueSnak( new PropertyId( 'P9'
), $unboundedValue );
+
+ $vocab = new RdfVocabulary( 'http://acme.com/item/',
'http://acme.com/data/' );
+ $snakWriter = $this->newSnakWriter();
+ $builder = $this->newQuantityRdfBuilder( $snakWriter->sub(),
$vocab, true,
+ [ 'factor' => 1, 'unit' => 'Q2' ] );
+
+ $snakWriter->start();
+ $snakWriter->about( 'www', 'Q1' );
+
+ $builder->addValue(
+ $snakWriter,
+ RdfVocabulary::NSP_CLAIM_STATEMENT,
+ $vocab->getEntityLName( $unboundedSnak->getPropertyId()
),
+ 'DUMMY',
+ $unboundedSnak
+ );
+ // And once more
+ $builder->addValue(
+ $snakWriter,
+ RdfVocabulary::NSP_CLAIM_STATEMENT,
+ $vocab->getEntityLName(
$unboundedSnak2->getPropertyId() ),
+ 'DUMMY',
+ $unboundedSnak2
+ );
+
+ $expected = [
+ '<http://www/Q1> ' . '<http://acme/statement/P7> ' .
+ '"-79.1"^^<http://www.w3.org/2001/XMLSchema#decimal> .',
+ '<http://www/Q1> ' . '<http://acme/statement/value/P7>
' .
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6>
.',
+ '<http://www/Q1> ' .
'<http://acme/statement/value-norm/P7> ' .
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6>
.',
+ '<http://www/Q1> ' . '<http://acme/statement/P9> ' .
+ '"-79.1"^^<http://www.w3.org/2001/XMLSchema#decimal> .',
+ '<http://www/Q1> ' . '<http://acme/statement/value/P9>
' .
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6>
.',
+ '<http://www/Q1> ' .
'<http://acme/statement/value-norm/P9> ' .
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6>
.',
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6> '
.
+ '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ' .
+ '<http://acme/onto/QuantityValue> .',
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6> '
.
+ '<http://acme/onto/quantityAmount> ' .
+ '"-79.1"^^<http://www.w3.org/2001/XMLSchema#decimal> .',
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6> '
.
+ '<http://acme/onto/quantityUnit> ' . '<Q2> .',
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6> '
.
+ '<http://acme/onto/quantityNormalized> ' .
+ '<http://acme/value/526c2826a6dfd29d460ea348b5d124a6>
.',
+ ];
+
+ $result = $snakWriter->drain();
+ $this->helper->assertNTriplesEquals( $expected, $result );
+ }
+
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 258bf72..0295d55 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -115,19 +115,19 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "a1885b4f47445d8a1b40d113b623f98c3005b08b"
+ "reference": "06e41fd8cb7d60799ffc019a3d8ca3e508102f32"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a1885b4f47445d8a1b40d113b623f98c3005b08b";,
- "reference": "a1885b4f47445d8a1b40d113b623f98c3005b08b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/06e41fd8cb7d60799ffc019a3d8ca3e508102f32";,
+ "reference": "06e41fd8cb7d60799ffc019a3d8ca3e508102f32",
"shasum": ""
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.7.2"
},
- "time": "2016-12-02 10:49:13",
+ "time": "2016-12-05 11:25:27",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1406,12 +1406,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b80daa060e9dc6e6d98920203a128362a9150517"
+ "reference": "c2478051da4d8c53bb1599cd537f9826bb6965e6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517";,
- "reference": "b80daa060e9dc6e6d98920203a128362a9150517",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2478051da4d8c53bb1599cd537f9826bb6965e6";,
+ "reference": "c2478051da4d8c53bb1599cd537f9826bb6965e6",
"shasum": ""
},
"require": {
@@ -1444,7 +1444,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-12-04 21:41:34",
+ "time": "2016-12-06 09:44:25",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/325521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3de70dc0e6a7cf2ad9f915392cddd69e8d32c2bb
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
