jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376491 )
Change subject: New Wikidata Build - 2017-09-07T10:00:02+0000
......................................................................
New Wikidata Build - 2017-09-07T10:00:02+0000
Change-Id: I716f01e4f9261c3fa4552d5c69eb237533378a24
---
M composer.lock
M extensions/Constraints/extension.json
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/modules/gadget.css
M extensions/Constraints/modules/ui/ConstraintReportGroup.css
A extensions/Constraints/modules/ui/ConstraintReportPanel.css
M extensions/Constraints/modules/ui/ConstraintReportPanel.js
M extensions/Constraints/tests/phpunit/Context/ReferenceContextTest.php
M extensions/Wikibase/.eslintrc.json
M extensions/Wikibase/client/i18n/ce.json
M extensions/Wikibase/client/i18n/tay.json
M extensions/Wikibase/lib/i18n/ais.json
M extensions/Wikibase/lib/i18n/tay.json
M extensions/Wikibase/repo/i18n/ais.json
M extensions/Wikibase/repo/i18n/tay.json
M
extensions/Wikibase/repo/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializer.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
M extensions/Wikibase/view/resources/wikibase/templates.js
M
extensions/Wikibase/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
M vendor/composer/installed.json
21 files changed, 194 insertions(+), 131 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 7bdae26..4306687 100644
--- a/composer.lock
+++ b/composer.lock
@@ -973,7 +973,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "b9d3c11f70bbcc3bdc16d29214adaeda8324ee64"
+ "reference": "7e5e3a8c67e89d81f47bfa363aaa7b42c555159c"
},
"require": {
"php": ">=5.5.9",
@@ -1033,7 +1033,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2017-09-05 10:50:52"
+ "time": "2017-09-07 08:21:20"
},
{
"name": "wikibase/data-model",
@@ -1544,12 +1544,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "237f4945afbd3edcc617cc72399f327560caa74b"
+ "reference": "8883357a857bed55109ddc32dd9112fb3dacce8d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/237f4945afbd3edcc617cc72399f327560caa74b";,
- "reference": "237f4945afbd3edcc617cc72399f327560caa74b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8883357a857bed55109ddc32dd9112fb3dacce8d";,
+ "reference": "8883357a857bed55109ddc32dd9112fb3dacce8d",
"shasum": ""
},
"require": {
@@ -1626,7 +1626,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-09-05 21:04:50"
+ "time": "2017-09-07 08:18:22"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/extension.json
b/extensions/Constraints/extension.json
index f1a125f..e955e4a 100644
--- a/extensions/Constraints/extension.json
+++ b/extensions/Constraints/extension.json
@@ -64,6 +64,7 @@
"wbqc-badparameters-long",
"wbqc-parameterissues-short",
"wbqc-parameterissues-long",
+ "wbqc-constrainttypehelp-short",
"wbqc-constrainttypehelp-long"
],
"scripts": [
@@ -73,6 +74,7 @@
"modules/ui/ConstraintReportList.js"
],
"styles": [
+ "modules/ui/ConstraintReportPanel.css",
"modules/ui/ConstraintReportGroup.css"
]
},
diff --git a/extensions/Constraints/i18n/en.json
b/extensions/Constraints/i18n/en.json
index fa74a61..7939b0e 100644
--- a/extensions/Constraints/i18n/en.json
+++ b/extensions/Constraints/i18n/en.json
@@ -39,6 +39,7 @@
"wbqc-badparameters-long": "This constraint statement has some invalid
parameters.",
"wbqc-parameterissues-short": "Advanced issues",
"wbqc-parameterissues-long": "These issues are problems with the
constraint definition on the property, not with this statement.",
+ "wbqc-constrainttypehelp-short": "Help",
"wbqc-constrainttypehelp-long": "Help page for this constraint type",
"apihelp-wbcheckconstraints-description": "Performs constraint checks
on any entity you want and returns the result.",
diff --git a/extensions/Constraints/i18n/qqq.json
b/extensions/Constraints/i18n/qqq.json
index 7a45cb1..8575536 100644
--- a/extensions/Constraints/i18n/qqq.json
+++ b/extensions/Constraints/i18n/qqq.json
@@ -41,7 +41,8 @@
"wbqc-badparameters-long": "Title for the icon shown on constraint
statements with invalid constraint parameters, usually displayed by the browser
when the user hovers over the icon with the mouse
cursor.\n{{Related|wbqc-badparameters-short}}",
"wbqc-parameterissues-short": "Headline of the section of the
constraint parameter report popup that contains problems about the constraint
parameters. The section is collapsed by default, since these problems are
harder to understand and fix than normal constraint violations. The headline
should convey that normal users are not expected to deal with these
problems.\n\nThese problems are also displayed on property pages in a separate
popup: see {{msg-mw|wbqc-badparameters-short}} /
{{msg-mw|wbqc-badparameters-long}}.",
"wbqc-parameterissues-long": "Longer explanation of the section of the
constraint parameter report popup that contains problems about the constraint
parameters.\n{{Related|wbqc-parameterissues-short}}",
- "wbqc-constrainttypehelp-long": "Title for the help icon shown next to
the constraint type in a constraint violation report. Clicking the icon leads
to a help page on Wikidata about the constraint type.",
+ "wbqc-constrainttypehelp-short": "Text for the help link shown next to
the constraint type in a constraint violation report. The link leads to a help
page on Wikidata about the constraint type.\n{{Identical|Help}}",
+ "wbqc-constrainttypehelp-long": "Title for the help link shown next to
the constraint type in a constraint violation report. The link leads to a help
page on Wikidata about the constraint
type.\n{{Related|wbqc-constrainttypehelp-short}}",
"apihelp-wbcheckconstraints-description":
"{{doc-apihelp-description|wbcheckconstraints}}",
"apihelp-wbcheckconstraints-summary":
"{{doc-apihelp-summary|wbcheckconstraints}}",
"apihelp-wbcheckconstraints-param-id":
"{{doc-apihelp-param|wbcheckconstraints|id}}",
diff --git a/extensions/Constraints/modules/gadget.css
b/extensions/Constraints/modules/gadget.css
index 8e26c50..b52c354 100644
--- a/extensions/Constraints/modules/gadget.css
+++ b/extensions/Constraints/modules/gadget.css
@@ -7,6 +7,3 @@
.wbqc-parameter-report {
border-top: 1px solid #eaecf0; /* Base80 */
}
-.wbqc-constraint-type-help {
- transform: scale( 0.75 );
-}
diff --git a/extensions/Constraints/modules/ui/ConstraintReportGroup.css
b/extensions/Constraints/modules/ui/ConstraintReportGroup.css
index f3aac60..9820407 100644
--- a/extensions/Constraints/modules/ui/ConstraintReportGroup.css
+++ b/extensions/Constraints/modules/ui/ConstraintReportGroup.css
@@ -7,8 +7,3 @@
/* add some space between groups in a list */
margin-top: 1em;
}
-
-.wbqc-reports-all .wbqc-reports:not( :last-child ) {
- /* add a border between groups in a list */
- border-bottom: 1px solid #a2a9b1; /* Base50 */
-}
diff --git a/extensions/Constraints/modules/ui/ConstraintReportPanel.css
b/extensions/Constraints/modules/ui/ConstraintReportPanel.css
new file mode 100644
index 0000000..dceb661
--- /dev/null
+++ b/extensions/Constraints/modules/ui/ConstraintReportPanel.css
@@ -0,0 +1,9 @@
+.wbqc-report h4:first-child + p {
+ margin-top: 0;
+}
+
+.wbqc-report .wbqc-constraint-type-help {
+ font-weight: normal;
+ float: right;
+ margin-right: 0.5em;
+}
diff --git a/extensions/Constraints/modules/ui/ConstraintReportPanel.js
b/extensions/Constraints/modules/ui/ConstraintReportPanel.js
index b5eaaff..36fc9ba 100644
--- a/extensions/Constraints/modules/ui/ConstraintReportPanel.js
+++ b/extensions/Constraints/modules/ui/ConstraintReportPanel.js
@@ -26,8 +26,8 @@
* @cfg {string} status The status of the report, e.g. 'violation' or
'compliance'.
* @cfg {Object} constraint The constraint of the report, as returned
by the wbcheckconstraints API.
* @cfg {string} [message=''] The message (HTML) of the report, if
present.
- * @cfg {jQuery} [$heading] The heading element of the panel. Should
not contain the help button.
- * @cfg {OO.ui.ButtonWidget} [helpButton] The help button for the
heading.
+ * @cfg {jQuery} [$heading] The heading element of the panel. Should
not contain the help link.
+ * @cfg {jQuery} [$helpLink] The help link for the heading.
* @cfg {jQuery} [$message] The message paragraph of the panel.
*/
wb.quality.constraints.ui.ConstraintReportPanel = function
WBQCConstraintReportPanel( config ) {
@@ -52,14 +52,13 @@
.attr( 'href', this.constraint.link )
.attr( 'target', '_blank' )
);
- this.helpButton = config.helpButton || new OO.ui.ButtonWidget( {
- icon: 'help',
- title: mw.message( 'wbqc-constrainttypehelp-long'
).text(),
- framed: false,
- classes: [ 'wbqc-constraint-type-help' ],
- href:
'https://www.wikidata.org/wiki/Help:Property_constraints_portal/' +
this.constraint.type,
- target: '_blank'
- } );
+ this.$helpLink = config.$helpLink || $( '<small
class="wbqc-constraint-type-help">' ).append(
+ $( '<a>' )
+ .text( mw.message(
'wbqc-constrainttypehelp-short' ).text() )
+ .attr( 'title', mw.message(
'wbqc-constrainttypehelp-long' ).text() )
+ .attr( 'href',
'https://www.wikidata.org/wiki/Help:Property_constraints_portal/' +
this.constraint.type )
+ .attr( 'target', '_blank' )
+ );
this.message = config.message;
this.$message = config.$message || $( '<p>' ).html(
this.message );
@@ -70,7 +69,7 @@
this.$element
.addClass( 'wbqc-report' )
.addClass( 'wbqc-report-status-' + this.status );
- this.$heading.append( this.helpButton.$element );
+ this.$heading.append( this.$helpLink );
this.$element.append( this.$heading );
this.$element.append( this.$message );
};
diff --git
a/extensions/Constraints/tests/phpunit/Context/ReferenceContextTest.php
b/extensions/Constraints/tests/phpunit/Context/ReferenceContextTest.php
index e2491d5..1ba883c 100644
--- a/extensions/Constraints/tests/phpunit/Context/ReferenceContextTest.php
+++ b/extensions/Constraints/tests/phpunit/Context/ReferenceContextTest.php
@@ -127,106 +127,104 @@
$context7->storeCheckResultInArray( $result5, $actual );
$expected = [
- 'Q1' => [
- 'claims' => [
- 'P1' => [
+ 'P1' => [
+ [
+ 'id' =>
'P1$13ea0742-0190-4d88-b7b0-baee67573818',
+ 'references' => [
[
- 'id' =>
'P1$13ea0742-0190-4d88-b7b0-baee67573818',
- 'references' => [
- [
- 'hash'
=> $reference1->getHash(),
- 'snaks'
=> [
-
'P11' => [
-
[
-
'hash' => $snak1->getHash(),
-
'results' => [
-
$result1,
-
]
-
],
-
[
-
'hash' => $snak2->getHash(),
-
'results' => [
-
$result2,
-
]
-
]
-
],
-
'P12' => [
-
[
-
'hash' => $snak3->getHash(),
-
'results' => [
-
$result3,
-
$result4,
-
]
-
]
+ 'hash' =>
$reference1->getHash(),
+ 'snaks' => [
+ 'P11' => [
+ [
+
'hash' => $snak1->getHash(),
+
'results' => [
+
$result1,
+
]
+ ],
+ [
+
'hash' => $snak2->getHash(),
+
'results' => [
+
$result2,
]
]
],
- [
- 'hash'
=> $reference2->getHash(),
- 'snaks'
=> [
-
'P11' => [
-
[
-
'hash' => $snak2->getHash(),
-
'results' => [
-
$result4,
-
]
-
]
-
],
-
'P12' => [
-
[
-
'hash' => $snak3->getHash(),
-
'results' => [
-
$result5,
-
]
-
]
+ 'P12' => [
+ [
+
'hash' => $snak3->getHash(),
+
'results' => [
+
$result3,
+
$result4,
]
]
- ],
- ],
+ ]
+ ]
],
[
- 'id' =>
'P1$9fbfae7f-6f21-4967-8e2c-ec04ca16873d',
- 'references' => [
- [
- 'hash'
=> $reference1->getHash(),
- 'snaks'
=> [
-
'P11' => [
-
[
-
'hash' => $snak1->getHash(),
-
'results' => [
-
$result5,
-
]
-
],
-
],
+ 'hash' =>
$reference2->getHash(),
+ 'snaks' => [
+ 'P11' => [
+ [
+
'hash' => $snak2->getHash(),
+
'results' => [
+
$result4,
+
]
]
],
- ],
+ 'P12' => [
+ [
+
'hash' => $snak3->getHash(),
+
'results' => [
+
$result5,
+
]
+ ]
+ ]
+ ]
],
],
- 'P2' => [
+ ],
+ [
+ 'id' =>
'P1$9fbfae7f-6f21-4967-8e2c-ec04ca16873d',
+ 'references' => [
[
- 'id' =>
'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9',
- 'references' => [
- [
- 'hash'
=> $reference2->getHash(),
- 'snaks'
=> [
-
'P12' => [
-
[
-
'hash' => $snak3->getHash(),
-
'results' => [
-
$result5,
-
]
-
],
-
],
- ]
+ 'hash' =>
$reference1->getHash(),
+ 'snaks' => [
+ 'P11' => [
+ [
+
'hash' => $snak1->getHash(),
+
'results' => [
+
$result5,
+
]
+ ],
],
- ],
+ ]
+ ],
+ ],
+ ],
+ ],
+ 'P2' => [
+ [
+ 'id' =>
'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9',
+ 'references' => [
+ [
+ 'hash' =>
$reference2->getHash(),
+ 'snaks' => [
+ 'P12' => [
+ [
+
'hash' => $snak3->getHash(),
+
'results' => [
+
$result5,
+
]
+ ],
+ ],
+ ]
],
],
],
],
];
- $this->assertSame( $expected, $actual );
+ $this->assertSame( [ 'Q1' ], array_keys( $actual ) );
+ $this->assertSame( [ 'claims' ], array_keys( $actual['Q1'] ) );
+ $this->assertSame( $expected, $actual['Q1']['claims'] );
}
}
diff --git a/extensions/Wikibase/.eslintrc.json
b/extensions/Wikibase/.eslintrc.json
index de4c388..d6169cb 100644
--- a/extensions/Wikibase/.eslintrc.json
+++ b/extensions/Wikibase/.eslintrc.json
@@ -21,7 +21,7 @@
"new-cap": "off",
"no-underscore-dangle": "off",
"no-use-before-define": [ "error", "nofunc" ],
- "no-unused-vars": "off",
+ "no-unused-vars": [ "error", { "args": "none" } ],
"no-useless-concat": "off",
"one-var": "off",
"operator-linebreak": "off",
diff --git a/extensions/Wikibase/client/i18n/ce.json
b/extensions/Wikibase/client/i18n/ce.json
index ccf39c1..9213297 100644
--- a/extensions/Wikibase/client/i18n/ce.json
+++ b/extensions/Wikibase/client/i18n/ce.json
@@ -47,6 +47,7 @@
"wikibase-rc-wikibase-edit-letter": "д",
"wikibase-rc-wikibase-edit-title": "Викихаамашкахь бина хийцам",
"wikibase-rcfilters-hide-wikibase-label": "{{WBREPONAME}} нисдарш",
+ "wikibase-rcfilters-hide-wikibase-description": "{{WBREPONAME}} чохь
бина хийцамаш.",
"wikibase-replicationnote": "Дехар до, тидам бар бина хийцам гучу ца
болуш маситта минот яла там бу массо вики-проекташкахь.",
"wikibase-watchlist-show-changes-pref": "Викихаамаш чохь хийла хийцамаш
гайта тергаме могӀам чохь",
"wikibase-error-deserialize-error": "Хаамашна десериализаци ян
цаделира.",
@@ -79,6 +80,7 @@
"wikibase-otherprojects": "Кхин проекташкахь",
"wikibase-otherprojects-beta-message": "Кхечу проектийн агӀонгара
панель",
"wikibase-otherprojects-beta-description": "АгӀорар панель тӀетуху
дакъа «{{int:wikibase-otherprojects}}», цуна тӀехь хьулу Викимедиа фондан кхечу
проекташка хьажоргаш {{WBREPONAME}}кара.",
+ "echo-category-title-wikibase-action":
"{{grammar:genitive|{{WBREPONAME}}}} {{PLURAL:$1|тӀетасадалар}}",
"notification-link-text-view-item": "{{GENDER:$1|Хьажа}} элемент",
"unresolved-property-category": "Мегаш йоцу билгалонаш йолу агӀонаш"
}
diff --git a/extensions/Wikibase/client/i18n/tay.json
b/extensions/Wikibase/client/i18n/tay.json
index a6ab184..770f1d2 100644
--- a/extensions/Wikibase/client/i18n/tay.json
+++ b/extensions/Wikibase/client/i18n/tay.json
@@ -11,10 +11,14 @@
"wikibase-dataitem": "{{WBREPONAME}} binkgan lmlamu’",
"wikibase-editlinks": "Smr’zyut miru’ sa ’ubuy",
"wikibase-editlinkstitle": "’Ubuy sa smr’zyut ini’ ptnaq na kay’",
+ "wikibase-linkitem-addlinks": "Misan tnwang na ’ubuy",
+ "wikibase-linkitem-not-loggedin-title": "Siga mzyup su’ han",
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "smbbaq",
"wikibase-rc-hide-wikidata-show": "Show",
"wikibase-rc-wikibase-edit-letter": "Suwe",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} Smr’zyut miru’",
+ "entityusage": "Zyuwaw na spzyuang balay sptzyuwaw",
+ "wikibase-pageinfo-entity-usage-X": "Kwara’ qu spzyang qbuci’ na snli’
kwara’ biru’ na ana nanu’",
"wikibase-otherprojects": "Bzinah Cwan’an"
}
diff --git a/extensions/Wikibase/lib/i18n/ais.json
b/extensions/Wikibase/lib/i18n/ais.json
index c9e496c..94ad96b 100644
--- a/extensions/Wikibase/lib/i18n/ais.json
+++ b/extensions/Wikibase/lib/i18n/ais.json
@@ -1,7 +1,8 @@
{
"@metadata": {
"authors": [
- "Bunukwiki"
+ "Bunukwiki",
+ "Benel"
]
},
"wikibase-quantitydetails-amount": "pulung",
@@ -16,6 +17,7 @@
"wikibase-globedetails-latitude": "wyitu",
"wikibase-sitelinks-wikipedia": "Wyici-payke",
"wikibase-sitelinks-sitename-columnheading": "kamu",
+ "wikibase-snakview-snaktypeselector-novalue": "inayi’ ku sulyang",
"wikibase-validator-no-validators": "satezep",
"datatypes-type-wikibase-item": "kasacacay"
}
diff --git a/extensions/Wikibase/lib/i18n/tay.json
b/extensions/Wikibase/lib/i18n/tay.json
index b28bdd3..71faca3 100644
--- a/extensions/Wikibase/lib/i18n/tay.json
+++ b/extensions/Wikibase/lib/i18n/tay.json
@@ -2,10 +2,18 @@
"@metadata": {
"authors": [
"Akamycoco",
- "Translatealcd"
+ "Translatealcd",
+ "Hitaypayan"
]
},
"wikibase-globedetails-longitude": "Cingtu’",
"wikibase-sitelinks-wikipedia": "Wikipidia",
- "datatypes-type-wikibase-item": "Binkgan lmlamu’"
+ "wikibase-sitelinks-link-columnheading": "Wal p’ubuy na zzngayan",
+ "datatypes-type-wikibase-item": "Binkgan lmlamu’",
+ "datatypes-type-external-id": "Biru’ na sinbbaq sa cyux mtzyuwaw squw
taylnglingay",
+ "wikibase-entity-summary-wbsetitem": "Wal ps’rux giqas na binkgan
lmlamu’",
+ "wikibase-entity-summary-wbsetreference": "Syaniy qutux sa kkita’ su’
sa bunkeng",
+ "wikibase-item-summary-wbcreate-new": "Wal ps’rux giqas na binkgan
lmlamu’",
+ "wikibase-item-summary-wbeditentity-create": "Wal ps’rux giqas na
binkgan lmlamu’",
+ "wikibase-property-summary-wbcreate-new": "Wal ps’rux giqas na ubuy
gluw na"
}
diff --git a/extensions/Wikibase/repo/i18n/ais.json
b/extensions/Wikibase/repo/i18n/ais.json
index 9289b01..9e4b93c 100644
--- a/extensions/Wikibase/repo/i18n/ais.json
+++ b/extensions/Wikibase/repo/i18n/ais.json
@@ -34,6 +34,7 @@
"wikibase-sitelinks-special": "zuma wangcan",
"wikibase-remove": "milimad",
"wikibase-statementview-rank-normal": "habutud kasaselel",
+ "wikibase-snakview-variations-novalue-label": "inayi’ ku sulyang",
"wikibase-entityselector-more": "yadah",
"wikibase-itembytitle-lookup-page": "kasabelih:",
"wikibase-itembytitle-submit": "kilim",
@@ -55,6 +56,7 @@
"wikibase-dispatchstats-oldest-change": "sakasumamadan",
"wikibase-dispatchstats-newest-change": "sabaluhay",
"wikibase-dispatchstats-pos": "kakitizaan",
+ "wikibase-dispatchstats-lag-num": "mihalhal henay ayza",
"wikibase-dispatchstats-lag-time": "mautang",
"wikibase-dispatchstats-stalest": "samalumanay",
"wikibase-dispatchstats-median": "myiti",
diff --git a/extensions/Wikibase/repo/i18n/tay.json
b/extensions/Wikibase/repo/i18n/tay.json
index bbca4bf..ee8b64c 100644
--- a/extensions/Wikibase/repo/i18n/tay.json
+++ b/extensions/Wikibase/repo/i18n/tay.json
@@ -3,18 +3,38 @@
"authors": [
"Corainn",
"Translatealcd",
- "Akamycoco"
+ "Akamycoco",
+ "Hitaypayan"
]
},
"wikibase-entity-item": "binkgan lmlamu’",
"wikibase-edit": "Smr’zyut miru’",
"wikibase-save": "cucun",
"wikibase-add": "tnwang",
- "wikibase-label-empty": "Ini’ srhgiy smi na’ qinlaq lalu’",
- "wikibase-description-empty": "Ini’ naha’ inblayqiy pinqzyu’ smi’ kay’
na’",
+ "wikibase-addqualifier": "misan tnwang na llpgan sa pira’ nanu’",
+ "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler":
"Pzyux na’ quw bzinah na kay’",
+ "wikibase-label-empty": "Ini’ syaniy na’ imi’ na ’ lalu’ na qinlah",
+ "wikibase-description-empty": "Ini’ syaniy na’ imi’ na pinqzyuwan’",
+ "wikibase-diffview-rank-normal": "Kinblayqan kwara’ na",
"wikibase-sitelinks-special": "Bzinah na wangcan",
"wikibase-statementview-rank-normal": "Mtnaq kwara’ iyat spzyang krahu’
na kinkrahu’ na sinpngan niya’",
"wikibase-itembytitle-submit": "Hhkangi’",
"wikibase-gotolinkedpage-lookup-item": "Binkgan lmlamu’ ID:",
- "wikibase-itemdisambiguation-submit": "Hhkangi’"
+ "wikibase-itemdisambiguation-submit": "Hhkangi’",
+ "special-setdescription": "Syaniy qutux musa’ minblaq kmayal sa
pinqzyuwan",
+ "special-setsitelink": "Syaniy qutux ’ubuy sa wancan",
+ "wikibase-setsitelink-site": "Wangcan ID：",
+ "wikibase-setsitelink-submit": "Syaniy qutux ’ubuy sa wancan",
+ "special-mergeitems": "Psqunun sazing binkgan lmlamu’",
+ "wikibase-dispatchstats-stats": "Kaylaniy kwara’ squliq quw pinsqun
pllpuw na ggalan kinbaq zayzyuwaw",
+ "wikibase-listproperties-all": "Zyuwaw na kwara’ qu snli’ kwara’ biru’
ana nanu’",
+ "special-entitieswithoutdescription": "Ungat quw spzuang balay qbuci’
na pinqzyuwan",
+ "special-entitieswithoutlabel": "Ungat quw qbuci’ balay na qinlah na
lalu’",
+ "special-redirectentity": "T’ringun pglaing spzyang qbuci’ na nnanu’",
+ "wikibase-listdatatypes-external-id-head": "Biru’ na sinbbaq sa cyux
mtzyuwaw squw taylnglingay",
+ "wikibase-concept-uri": "Kinbaq na zyuwaw URI",
+ "apihelp-wbeditentity-example-12": "Laxan qutux lalu’ na qinlah",
+ "apihelp-wbsearchentities-param-search": "Hkangi’ biru’ qaniy.",
+ "apihelp-wbsearchentities-param-language": "Hkangi’ kay’ qaniy.",
+ "apihelp-query+wbsearch-param-language": "Hkangi’ kay’ qaniy."
}
diff --git
a/extensions/Wikibase/repo/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializer.php
b/extensions/Wikibase/repo/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializer.php
index 0800f6b..adc9156 100644
---
a/extensions/Wikibase/repo/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializer.php
+++
b/extensions/Wikibase/repo/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializer.php
@@ -69,18 +69,28 @@
}
/**
- * @param array[] $aliases
+ * @param array[] $aliasGroups
*
* @return array[]
*/
- private function getIndexedAliases( array $aliases ) {
+ private function getIndexedAliases( array $aliasGroups ) {
$indexedAliases = [];
- foreach ( $aliases as $langCode => $serialization ) {
- if ( !is_string( $langCode ) ) {
- $indexedAliases[] = ( array_values(
$serialization ) === $serialization ) ? $serialization : [ $serialization ];
+ foreach ( $aliasGroups as $languageCode => $aliases ) {
+ if ( $aliases === null ) {
+ continue;
+ }
+
+ $this->assertIsArray( $aliases );
+
+ if ( array_values( $aliases ) !== $aliases ) {
+ $aliases = [ $aliases ];
+ }
+
+ if ( is_string( $languageCode ) ) {
+ $indexedAliases[$languageCode] = $aliases;
} else {
- $indexedAliases[$langCode] = ( array_values(
$serialization ) === $serialization ) ? $serialization : [ $serialization ];
+ $indexedAliases[] = $aliases;
}
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
index 8932573..f5b504e 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Repo\Tests\ChangeOp\Deserialization;
+use Wikibase\Repo\ChangeOp\ChangeOps;
use Wikibase\Repo\ChangeOp\FingerprintChangeOpFactory;
use Wikibase\DataModel\Entity\Item;
use Wikibase\Lib\StaticContentLanguages;
@@ -32,6 +33,22 @@
);
}
+ public function testGivenAliasesAsNull_isIgnored() {
+ $deserializer = $this->newAliasesChangeOpDeserializer(
$this->getTermChangeOpValidator() );
+ $changeOp = $deserializer->createEntityChangeOp( [ 'aliases' =>
[ 'en' => null ] ] );
+ $this->assertEquals( new ChangeOps(), $changeOp );
+ }
+
+ public function
testGivenAliasesNotAsArray_createEntityChangeOpThrowsError() {
+
ChangeOpDeserializationAssert::assertThrowsChangeOpDeserializationException(
+ function() {
+ $deserializer =
$this->newAliasesChangeOpDeserializer( $this->getTermChangeOpValidator() );
+ $deserializer->createEntityChangeOp( [
'aliases' => [ 'en' => 'alias1|alias2' ] ] );
+ },
+ 'not-recognized-array'
+ );
+ }
+
public function
testGivenInvalidLanguage_createEntityChangeOpThrowsError() {
ChangeOpDeserializationAssert::assertThrowsChangeOpDeserializationException(
function() {
diff --git a/extensions/Wikibase/view/resources/wikibase/templates.js
b/extensions/Wikibase/view/resources/wikibase/templates.js
index 25e8ebf..a52bdaa 100644
--- a/extensions/Wikibase/view/resources/wikibase/templates.js
+++ b/extensions/Wikibase/view/resources/wikibase/templates.js
@@ -60,7 +60,6 @@
function stripAutoGeneratedHtml( string ) {
var inTag = false,
readTag = false,
- tag = '',
outTag = false,
filteredString = '',
character = '';
@@ -85,7 +84,6 @@
for ( var i = 0; i < string.length; i++ ) {
character = string[ i ];
if ( !inTag && !readTag && character === '<' ) {
- tag = '';
inTag = true;
readTag = true;
filteredString += character;
diff --git
a/extensions/Wikibase/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
b/extensions/Wikibase/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
index b6ff8bb..30cdbbe 100644
---
a/extensions/Wikibase/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
+++
b/extensions/Wikibase/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
@@ -5,8 +5,6 @@
( function ( $, QUnit ) {
'use strict';
- var htmlDir = null;
-
QUnit.module( 'jquery.util.getDirectionality' );
QUnit.test( 'Basic tests', function ( assert ) {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0bc00f0..4e73e8f 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1385,12 +1385,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "237f4945afbd3edcc617cc72399f327560caa74b"
+ "reference": "8883357a857bed55109ddc32dd9112fb3dacce8d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/237f4945afbd3edcc617cc72399f327560caa74b";,
- "reference": "237f4945afbd3edcc617cc72399f327560caa74b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8883357a857bed55109ddc32dd9112fb3dacce8d";,
+ "reference": "8883357a857bed55109ddc32dd9112fb3dacce8d",
"shasum": ""
},
"require": {
@@ -1424,7 +1424,7 @@
"jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-09-05 21:04:50",
+ "time": "2017-09-07 08:18:22",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1775,7 +1775,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "b9d3c11f70bbcc3bdc16d29214adaeda8324ee64"
+ "reference": "7e5e3a8c67e89d81f47bfa363aaa7b42c555159c"
},
"require": {
"php": ">=5.5.9",
@@ -1791,7 +1791,7 @@
"satooshi/php-coveralls": "master-dev",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-09-05 10:50:52",
+ "time": "2017-09-07 08:21:20",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/376491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I716f01e4f9261c3fa4552d5c69eb237533378a24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
