WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380946 )
Change subject: New Wikidata Build - 2017-09-27T10:00:02+0000
......................................................................
New Wikidata Build - 2017-09-27T10:00:02+0000
Change-Id: I2b19fe3b10fade2cb586fb9befa285ad99fb0b6e
---
M composer.lock
M extensions/Constraints/i18n/gl.json
M extensions/Constraints/i18n/pt.json
M extensions/Constraints/modules/gadget.js
M extensions/Wikibase/client/i18n/bn.json
M extensions/Wikibase/client/i18n/en-gb.json
M extensions/Wikibase/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
M
extensions/Wikibase/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
M vendor/composer/installed.json
11 files changed, 60 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/46/380946/1
diff --git a/composer.lock b/composer.lock
index 910eb9d..2723a40 100644
--- a/composer.lock
+++ b/composer.lock
@@ -977,7 +977,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "9d0ae3d38579ab73d4b532db545cc95147cdf398"
+ "reference": "bf1a7903c5e54357f9d8cc553eec1bf1ef5909dc"
},
"require": {
"php": ">=5.5.9",
@@ -1037,7 +1037,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2017-09-25 22:50:15"
+ "time": "2017-09-27 07:12:04"
},
{
"name": "wikibase/data-model",
@@ -1548,12 +1548,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "77b06a0d18d60f88df93942dc88a4dcb36fb9303"
+ "reference": "e862429e978c36701d5533abbe13833bfa8fa797"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/77b06a0d18d60f88df93942dc88a4dcb36fb9303";,
- "reference": "77b06a0d18d60f88df93942dc88a4dcb36fb9303",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e862429e978c36701d5533abbe13833bfa8fa797";,
+ "reference": "e862429e978c36701d5533abbe13833bfa8fa797",
"shasum": ""
},
"require": {
@@ -1631,7 +1631,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-09-26 06:53:27"
+ "time": "2017-09-26 20:55:34"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/gl.json
b/extensions/Constraints/i18n/gl.json
index ce7d07f..4ce0e70 100644
--- a/extensions/Constraints/i18n/gl.json
+++ b/extensions/Constraints/i18n/gl.json
@@ -43,6 +43,8 @@
"apihelp-wbcheckconstraints-example-1": "Verificar tódalas constantes
sobre os elementos Q5 e Q42.",
"apihelp-wbcheckconstraints-example-2": "Verificar tódalas constantes
nunha soa instrucción.",
"apihelp-wbcheckconstraints-example-3": "Verificar unha restrición en
particular sobre o obxecto Q2.",
+ "apihelp-wbcheckconstraintparameters-example-propertyid-1": "Verificar
os parámetros de restrición de tódalas restricións dunha propiedade.",
+ "apihelp-wbcheckconstraintparameters-example-constraintid-2":
"Verificar os parámetros de restrición de dúas restricións en particular.",
"wbq-subextension-name-wbqc": "Restricións",
"wbqc-violation-header-parameters": "Parámetros:",
"wbqc-violations-group": "Restricións",
@@ -55,10 +57,14 @@
"wbqc-violation-message-parameters-needed-3": "As propiedades con
constante \"$1\" precisan os parámetros \"$2\", \"$3\" e \"$4\".",
"wbqc-violation-message-target-entity-must-exist": "A entidade
obxectivo debe existir.",
"wbqc-violation-message-value-entity-must-exist": "O valor entidade
debe existir.",
+ "wbqc-violation-message-parameter-value": "O parámetro \"$1\" debe ter
un valor propio, non pode conter \"no value\" (sen valor) nin \"unknown value\"
(valor descoñecido).",
+ "wbqc-violation-message-parameter-value-or-novalue": "O parámetro
\"$1\" debe ter un valor propio ou \"no value\" (sen valor), pero nunca
\"unknown value\" (valor descoñecido).",
"wbqc-violation-message-parameter-entity": "O valor para o parámetro
\"$1\" debe ser unha entidade, non \"$2\".",
"wbqc-violation-message-parameter-item": "O valor para o parámetro
\"$1\" debe ser un obxecto, non \"$2\".",
"wbqc-violation-message-parameter-property": "O valor para o parámetro
\"$1\" debe ser unha propiedade, non \"$2\".",
"wbqc-violation-message-parameter-string": "O valor para o parámetro
\"$1\" debe ser unha cadea de texto, non \"$2\".",
+ "wbqc-violation-message-parameter-monolingualtext": "O valor do
parámetro «$1» debe ser un texto monolingüe, non «$2».",
+ "wbqc-violation-message-parameter-single": "O parámetro \"$1\" debe ter
só un valor.",
"wbqc-violation-message-sparql-error": "A consulta SPARQL produciu un
erro.",
"wbqc-violation-message-commons-link-no-existent": "A ligazón a Commons
debería existir.",
"wbqc-violation-message-commons-link-not-well-formed": "A ligazón a
Commons debería estar ben formada.",
diff --git a/extensions/Constraints/i18n/pt.json
b/extensions/Constraints/i18n/pt.json
index 0574966..6bc48b5 100644
--- a/extensions/Constraints/i18n/pt.json
+++ b/extensions/Constraints/i18n/pt.json
@@ -24,6 +24,7 @@
"wbqc-constraintreport-status-bad-parameters": "Parâmetros incorretos",
"wbqc-constraintreport-status-deprecated": "Descontinuada",
"wbqc-constraintreport-status-warning": "Aviso",
+ "wbqc-constraintreport-status-not-main-snak": "Não é a asserção
principal",
"wbqc-constraintreport-result-table-header-status": "Estado",
"wbqc-constraintreport-result-table-header-claim": "Alegação",
"wbqc-constraintreport-result-table-header-constraint": "Restrição",
diff --git a/extensions/Constraints/modules/gadget.js
b/extensions/Constraints/modules/gadget.js
index 375a23f..483a71c 100644
--- a/extensions/Constraints/modules/gadget.js
+++ b/extensions/Constraints/modules/gadget.js
@@ -243,7 +243,7 @@
claimid: statementId
} ).then( function( data ) {
var statementClass = 'wikibase-statement-' +
statementId.replace( /\$/, '\\$$' );
- $( '.wikibase-statementgroupview .' +
statementClass + ' .wikibase-statementview-mainsnak .wikibase-snakview-value' )
+ $( '.wikibase-statementgroupview
.wikibase-statementview.' + statementClass )
.each( function () {
addReportsToStatement( data.wbcheckconstraints[ entityId ], $( this ) ); } );
} );
} );
diff --git a/extensions/Wikibase/client/i18n/bn.json
b/extensions/Wikibase/client/i18n/bn.json
index b37f761..5b47ee6 100644
--- a/extensions/Wikibase/client/i18n/bn.json
+++ b/extensions/Wikibase/client/i18n/bn.json
@@ -57,6 +57,7 @@
"wikibase-rc-wikibase-edit-letter": "উ",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} সম্পাদনা",
"wikibase-rcfilters-hide-wikibase-label": "{{WBREPONAME}} সম্পাদনা",
+ "wikibase-rcfilters-hide-wikibase-description": "সম্পাদনা যার উৎপত্তি
{{WBREPONAME}}-এ।",
"wikibase-replicationnote": "দয়া করে লক্ষ্য করুন যে এই পরিবর্তনগুলি
সকল উইকিতে দৃশ্যমান হতে কয়েক মিনিট পর্যন্ত সময় লাগতে পারে।",
"wikibase-watchlist-show-changes-pref": "{{WBREPONAME}}ের সম্পাদনাগুলো
নজরতালিকায় দেখাও",
"wikibase-error-invalid-entity-id": "\"$2\" আইডিটি সিস্টেমের অজানা।
দয়া করে একটি বৈধ ভুক্তি আইডি ব্যবহার করুন।",
@@ -85,8 +86,9 @@
"wikibase-otherprojects": "অন্যান্য প্রকল্পে",
"wikibase-otherprojects-beta-message": "অন্যান্য প্রকল্পের পার্শ্বদণ্ড",
"wikibase-otherprojects-beta-description": "পার্শ্বদণ্ডে
\"{{int:wikibase-otherprojects}}\" অনুচ্ছেদ যোগ করে যা {{WBREPONAME}}ে থাকা
উপাত্তের উপর ভিত্তি করে অন্যান্য উইকিমিডিয়া প্রকল্পের লিঙ্ক প্রদান করে।",
+ "echo-category-title-wikibase-action": "{{WBREPONAME}}-এর সাথে
{{PLURAL:$1|সংযোগ}}",
"echo-pref-tooltip-wikibase-action": "কেউ {{GENDER:|আমার তৈরি}} করা
পাতা {{WBREPONAME}} আইটেমে সংযুক্ত করলে আমাকে বিজ্ঞপ্তি দাও।",
- "notification-header-page-connection": "<strong>$3</strong> পাতাটি একটি
{{WBREPONAME}} আইটেমের সাথে {{GENDER:$2|সংযুক্ত হয়েছে}}।",
+ "notification-header-page-connection": "<strong>$3</strong> পাতাটি
{{PLURAL:$4|-1=একটি {{WBREPONAME}} আইটেমের|{{WBREPONAME}} আইটেম নং $4 এর}} সাথে
{{GENDER:$2|সংযুক্ত হয়েছে}}, যাতে প্রসঙ্গটি সম্পর্কিত উপাত্ত রয়েছে।",
"notification-bundle-header-page-connection": "<strong>$3</strong> ও
{{PLURAL:$4|আরেকটি পাতা|আরও $4টি পাতা|100=আরও ৯৯+টি পাতা}} {{WBREPONAME}}
উপাদানের সাথে {{GENDER:$2|সংযুক্ত হয়েছে}}।",
"notification-link-text-view-item": "আইটেম {{GENDER:$1|দেখুন}}",
"notification-subject-page-connection": "{{SITENAME}}-এ আপনার
{{GENDER:$3|তৈরি করা}} একটি পাতা {{WBREPONAME}} আইটেমের সাথে
{{GENDER:$2|সংযুক্ত হয়েছে}}।",
diff --git a/extensions/Wikibase/client/i18n/en-gb.json
b/extensions/Wikibase/client/i18n/en-gb.json
index c64116c..48044c2 100644
--- a/extensions/Wikibase/client/i18n/en-gb.json
+++ b/extensions/Wikibase/client/i18n/en-gb.json
@@ -3,7 +3,8 @@
"authors": [
"Felicilijonas",
"Shirayuki",
- "Chase me ladies, I'm the Cavalry"
+ "Chase me ladies, I'm the Cavalry",
+ "Pierpao"
]
},
"tooltip-t-wikibase": "Link to connected data repository item",
@@ -11,6 +12,7 @@
"wikibase-dataitem": "{{WBREPONAME}} item",
"wikibase-editlinks": "Edit links",
"wikibase-editlinkstitle": "Edit interlanguage links",
+ "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-wikibase-edit-letter": "WD",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} edit",
"wikibase-error-serialize-error": "Failed to serialise data"
diff --git
a/extensions/Wikibase/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
b/extensions/Wikibase/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
index 5c846a3..2377f1b 100644
--- a/extensions/Wikibase/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
+++ b/extensions/Wikibase/lib/includes/Formatters/EntityIdHtmlLinkFormatter.php
@@ -57,9 +57,10 @@
$term = $this->lookupEntityLabel( $entityId );
$url = $title->isLocal() ? $title->getLocalURL() :
$title->getFullURL();
+ $isRedirect = $title->isLocal() && $title->isRedirect();
if ( $term ) {
- return $this->getHtmlForTerm( $url, $term,
$title->getPrefixedText() );
+ return $this->getHtmlForTerm( $url, $term,
$title->getPrefixedText(), $isRedirect );
} elseif ( $title->isLocal() && !$title->exists() ) {
return $this->getHtmlForNonExistent( $entityId );
}
@@ -68,6 +69,9 @@
'title' => $title->getPrefixedText(),
'href' => $url
];
+ if ( $isRedirect ) {
+ $attributes['class'] = 'mw-redirect';
+ }
$html = Html::element( 'a', $attributes,
$entityId->getSerialization() );
@@ -78,10 +82,11 @@
* @param string $targetUrl
* @param Term $term
* @param string $titleText
+ * @param bool $isRedirect
*
* @return string HTML
*/
- private function getHtmlForTerm( $targetUrl, Term $term, $titleText =
'' ) {
+ private function getHtmlForTerm( $targetUrl, Term $term, $titleText =
'', $isRedirect = false ) {
$fallbackIndicatorHtml = '';
$attributes = [
@@ -98,6 +103,10 @@
}
}
+ if ( $isRedirect ) {
+ $attributes['class'] = 'mw-redirect';
+ }
+
$html = Html::element( 'a', $attributes, $term->getText() );
return $html . $fallbackIndicatorHtml;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
b/extensions/Wikibase/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
index 86df3c1..912a96f 100644
---
a/extensions/Wikibase/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/Formatters/EntityIdHtmlLinkFormatterTest.php
@@ -57,16 +57,18 @@
/**
* @param bool $exists
+ * @param bool $isRedirect
*
* @return EntityTitleLookup
*/
- private function newEntityTitleLookup( $exists = true ) {
+ private function newEntityTitleLookup( $exists = true, $isRedirect =
false ) {
$entityTitleLookup = $this->getMock( EntityTitleLookup::class );
$entityTitleLookup->expects( $this->any() )
->method( 'getTitleForId' )
- ->will( $this->returnCallback( function ( EntityId $id
) use ( $exists ) {
+ ->will( $this->returnCallback( function ( EntityId $id
) use ( $exists, $isRedirect ) {
$title = Title::newFromText(
$id->getSerialization() );
$title->resetArticleID( $exists ?
$id->getNumericId() : 0 );
+ $title->mRedirect = $isRedirect;
return $title;
} )
@@ -108,7 +110,7 @@
$languageNameLookup = $this->getMock( LanguageNameLookup::class
);
$languageNameLookup->expects( $this->any() )
->method( 'getName' )
- ->will( $this->returnCallback( function( $languageCode
) {
+ ->will( $this->returnCallback( function ( $languageCode
) {
$names = [
'de' => 'Deutsch',
'de-at' => 'Österreichisches
Deutsch',
@@ -258,4 +260,19 @@
$this->assertRegExp( '|"/wiki/Q42".*>Something<|',
$formatter->formatEntityId( new ItemId( 'Q42' ) ) );
}
+ public function testFormat_redirectHasClass() {
+ $exists = true;
+ $isRedirect = true;
+ $entityTitleLookup = $this->newEntityTitleLookup( $exists,
$isRedirect );
+ $formatter = new EntityIdHtmlLinkFormatter(
+ $this->getLabelDescriptionLookup(),
+ $entityTitleLookup,
+ $this->getMock( LanguageNameLookup::class )
+ );
+
+ $formattedEntityId = $formatter->formatEntityId( new ItemId(
'Q42' ) );
+
+ assertThat( $formattedEntityId, htmlPiece( havingChild(
withClass( 'mw-redirect' ) ) ) );
+ }
+
}
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 87e6f64..b2edacb 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -728,13 +728,13 @@
this._mainSnakSnakView.option(
key, value.getClaim().getMainSnak() );
}
if ( this._qualifiers ) {
- this._qualifiers.option( key,
value.getClaim().getQualifiers() );
+ this._qualifiers.option( key,
value.getClaim().getQualifiers().getGroupedSnakLists() );
}
if ( this._rankSelector ) {
this._rankSelector.option( key,
value.getRank() );
}
if ( this._referencesListview ) {
-
this._referencesListview.option( key, value.getReferences() );
+
this._referencesListview.option( key, value.getReferences().toArray() );
}
}
}
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
index 500b6f9..961d666 100644
--- a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
+++ b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
@@ -137,6 +137,7 @@
this._cachedValues = {};
this.updateVariation();
+ this.updateHash();
// Re-render on previously generated DOM should be
avoided. However, when regenerating the
// whole snakview, every component needs to be drawn.
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ace8ea8..5878a99 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1389,12 +1389,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "77b06a0d18d60f88df93942dc88a4dcb36fb9303"
+ "reference": "e862429e978c36701d5533abbe13833bfa8fa797"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/77b06a0d18d60f88df93942dc88a4dcb36fb9303";,
- "reference": "77b06a0d18d60f88df93942dc88a4dcb36fb9303",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e862429e978c36701d5533abbe13833bfa8fa797";,
+ "reference": "e862429e978c36701d5533abbe13833bfa8fa797",
"shasum": ""
},
"require": {
@@ -1429,7 +1429,7 @@
"mediawiki/minus-x": "0.1.0",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-09-26 06:53:27",
+ "time": "2017-09-26 20:55:34",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1780,7 +1780,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "9d0ae3d38579ab73d4b532db545cc95147cdf398"
+ "reference": "bf1a7903c5e54357f9d8cc553eec1bf1ef5909dc"
},
"require": {
"php": ">=5.5.9",
@@ -1796,7 +1796,7 @@
"satooshi/php-coveralls": "master-dev",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-09-25 22:50:15",
+ "time": "2017-09-27 07:12:04",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/380946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b19fe3b10fade2cb586fb9befa285ad99fb0b6e
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
