jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2016-08-30T10:00:02+0000
......................................................................
New Wikidata Build - 2016-08-30T10:00:02+0000
Change-Id: Ia9296c3ec671927dbc9e2e61b682e8fb8be01eaa
---
M composer.lock
M extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
M
extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
M extensions/Wikibase/client/i18n/ar.json
M extensions/Wikibase/lib/i18n/bn.json
M extensions/Wikibase/repo/i18n/ar.json
M extensions/Wikibase/repo/i18n/bg.json
M extensions/Wikibase/repo/includes/Specials/SpecialItemByTitle.php
M extensions/Wikibase/repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
M extensions/Wikibase/tests/browser/environments.yml
M extensions/Wikibase/view/resources/wikibase/wikibase.css
M vendor/composer/installed.json
13 files changed, 90 insertions(+), 36 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index f1a88b3..d9c63e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -782,12 +782,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "fec88156435e6e288c3ea56397760e5b96f0e048"
+ "reference": "0a0a6c57d7a7160bab498468f33a744a908b3dce"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/fec88156435e6e288c3ea56397760e5b96f0e048";,
- "reference": "fec88156435e6e288c3ea56397760e5b96f0e048",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/0a0a6c57d7a7160bab498468f33a744a908b3dce";,
+ "reference": "0a0a6c57d7a7160bab498468f33a744a908b3dce",
"shasum": ""
},
"require-dev": {
@@ -812,7 +812,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-08-28 20:33:39"
+ "time": "2016-08-29 13:36:53"
},
{
"name": "propertysuggester/property-suggester",
@@ -1568,12 +1568,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "416dd657301560f4fec33226d9c138ca16f4af41"
+ "reference": "840071e8a4553fd2ad6c22f3ad0f31a8c19613e4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/416dd657301560f4fec33226d9c138ca16f4af41";,
- "reference": "416dd657301560f4fec33226d9c138ca16f4af41",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/840071e8a4553fd2ad6c22f3ad0f31a8c19613e4";,
+ "reference": "840071e8a4553fd2ad6c22f3ad0f31a8c19613e4",
"shasum": ""
},
"require": {
@@ -1645,7 +1645,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-08-28 23:20:30"
+ "time": "2016-08-29 20:41:45"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
b/extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
index b3dd674..c87a35e 100644
--- a/extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
+++ b/extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
@@ -2,17 +2,18 @@
namespace ArticlePlaceholder;
+use Language;
use OOUI;
+use SiteLookup;
use SpecialPage;
use Title;
-use Wikibase\Client\Store\TitleFactory;
+use User;
+use OutputPage;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Client\Store\TitleFactory;
+use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Lib\Store\SiteLinkLookup;
-use OutputPage;
-use SiteLookup;
-use Language;
-use User;
/**
* The AboutTopic SpecialPage for the ArticlePlaceholder extension
@@ -49,24 +50,32 @@
private $titleFactory;
/**
+ * @var OtherProjectsSidebarGeneratorFactory
+ */
+ private $otherProjectsSidebarGeneratorFactory;
+
+ /**
* @param LanguageFallbackLabelDescriptionLookupFactory
$termLookupFactory
* @param SiteLinkLookup $siteLinkLookup
* @param SiteLookup $siteLookup
* @param string $langLinkSiteGroup
* @param TitleFactory $titleFactory
+ * @param OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory
*/
public function __construct(
LanguageFallbackLabelDescriptionLookupFactory
$termLookupFactory,
SiteLinkLookup $siteLinkLookup,
SiteLookup $siteLookup,
$langLinkSiteGroup,
- TitleFactory $titleFactory
+ TitleFactory $titleFactory,
+ OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory
) {
$this->termLookupFactory = $termLookupFactory;
$this->siteLinkLookup = $siteLinkLookup;
$this->siteLookup = $siteLookup;
$this->langLinkSiteGroup = $langLinkSiteGroup;
$this->titleFactory = $titleFactory;
+ $this->otherProjectsSidebarGeneratorFactory =
$otherProjectsSidebarGeneratorFactory;
}
/**
@@ -93,6 +102,7 @@
$this->showCreateArticle( $labelTitle, $output );
}
$this->showLanguageLinks( $entityId, $output );
+ $this->setOtherProjectsLinks( $entityId, $output );
}
/**
@@ -164,4 +174,18 @@
$output->setLanguageLinks( $languageLinks );
}
+ /**
+ * Set other projects links
+ * @param ItemId $itemId
+ * @param OutputPage $output
+ */
+ private function setOtherProjectsLinks( ItemId $itemId, OutputPage
$output ) {
+ $otherProjectsSidebarGenerator =
$this->otherProjectsSidebarGeneratorFactory
+ ->getOtherProjectsSidebarGenerator();
+
+ $otherProjects =
$otherProjectsSidebarGenerator->buildProjectLinkSidebarFromItemId( $itemId );
+ $output->setProperty( 'wikibase-otherprojects-sidebar',
$otherProjects );
+ $output->setProperty( 'wikibase_item',
$itemId->getSerialization() );
+ }
+
}
diff --git
a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
index bea94fc..e0d8176 100644
--- a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
+++ b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
@@ -30,7 +30,8 @@
$wikibaseClient->getStore()->getSiteLinkLookup(),
$wikibaseClient->getSiteStore(),
$wikibaseClient->getLangLinkSiteGroup(),
- new TitleFactory()
+ new TitleFactory(),
+
$wikibaseClient->getOtherProjectsSidebarGeneratorFactory()
),
$wikibaseClient->getEntityIdParser(),
$wikibaseClient->getStore()->getSiteLinkLookup(),
diff --git
a/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
b/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
index 34f6d26..4f3f004 100644
---
a/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
+++
b/extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
@@ -13,6 +13,8 @@
use User;
use OutputPage;
use Wikibase\Client\Store\TitleFactory;
+use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
+use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
@@ -40,12 +42,26 @@
$title = SpecialPage::getTitleFor( 'AboutTopic' );
$context->getOutput()->setTitle( $title );
+ $otherProjectsSidebarGenerator = $this->getMockBuilder(
OtherProjectsSidebarGenerator::class )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $otherProjectsSidebarGeneratorFactory = $this->getMockBuilder(
+ OtherProjectsSidebarGeneratorFactory::class
+ )->disableOriginalConstructor()
+ ->getMock();
+
+ $otherProjectsSidebarGeneratorFactory->expects( $this->any() )
+ ->method( 'getOtherProjectsSidebarGenerator' )
+ ->will( $this->returnValue(
$otherProjectsSidebarGenerator ) );
+
$instance = new AboutTopicRenderer(
$this->getTermLookupFactory(),
$this->getSiteLinkLookup(),
$this->getSiteLookup(),
'wikipedia',
- new TitleFactory()
+ new TitleFactory(),
+ $otherProjectsSidebarGeneratorFactory
);
$instance->showPlaceholder(
diff --git a/extensions/Wikibase/client/i18n/ar.json
b/extensions/Wikibase/client/i18n/ar.json
index 8ddb6e8..8230b31 100644
--- a/extensions/Wikibase/client/i18n/ar.json
+++ b/extensions/Wikibase/client/i18n/ar.json
@@ -22,6 +22,7 @@
"tooltip-t-wikibase": "الربط بعنصر مرتبط في مستودع البيانات",
"wikibase-after-page-move": "يمكنك أيضا تحديث [$1 بند {{WBREPONAME}}
المصاحب] للحفاظ على وصلات اللغة على الصفحة المنقولة.",
"wikibase-after-page-move-queued": "[$1 عنصر {{WBREPONAME}}] المرتبط
بهذه الصفحة سيُحدّث تلقائيًا. كن على علمٍ بأن هذا قد لا يحدث فورًا.",
+ "wikibase-after-page-delete": "ينبغي أيضًا أن تُزيل الوصلة التي تقود
لهذه الصفحة من [$1 عنصر {{WBREPONAME}} المرتبط بها] للحفاظ على وصلات اللغات.",
"wikibase-after-page-delete-queued": "[$1 عنصر {{WBREPONAME}}] المرتبط
بهذه الصفحة سيُحدّث تلقائيًا. كن على علمٍ بأن هذا قد لا يحدث فورًا.",
"wikibase-comment-add": "تم إنشاء عنصر {{WBREPONAME}}.",
"wikibase-comment-remove": "تم حذف بند ويكيبيانات المرتبطة. و تم إزالة
ارتباطات اللغة.",
diff --git a/extensions/Wikibase/lib/i18n/bn.json
b/extensions/Wikibase/lib/i18n/bn.json
index 6c6779d..a62ab85 100644
--- a/extensions/Wikibase/lib/i18n/bn.json
+++ b/extensions/Wikibase/lib/i18n/bn.json
@@ -15,8 +15,8 @@
"wikibase-error-unexpected": "ত্রুটি: $1।",
"wikibase-error-save-generic": "একটি ত্রুটির কারণে সংরক্ষণ করা যায়নি।",
"wikibase-error-remove-generic": "একটি ত্রুটির কারণে সরানো যায়নি।",
- "wikibase-error-save-connection": "সংরক্ষণের সময় একটি যোগাযোগ ত্রুটি
দেখা দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি। অনুগ্রহ করে আপনার ইন্টারনেট
সংযোগটি পরীক্ষা করুন।",
- "wikibase-error-remove-connection": "অপসারণের সময় একটি যোগাযোগ ত্রুটি
দেখা দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি। অনুগ্রহ করে আপনার ইন্টারনেট
সংযোগটি পরীক্ষা করুন।",
+ "wikibase-error-save-connection": "একটি সংযোগ ত্রুটির কারণে সংরক্ষণ করা
যায়নি। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগটি পরীক্ষা করুন।",
+ "wikibase-error-remove-connection": "একটি সংযোগ ত্রুটির কারণে সরানো
যায়নি। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগটি পরীক্ষা করুন।",
"wikibase-error-autocomplete-response": "সার্ভারের প্রতিক্রিয়া: $1",
"wikibase-error-ui-no-external-page": "উল্লেখিত নিবন্ধ সংশ্লিষ্ট সাইটে
খুঁজে পাওয়া যায়নি।",
"wikibase-error-ui-edit-conflict": "এখানে একটি সম্পাদনা দ্বন্দ্ব
হয়েছে। দয়া করে স্থানীয়ভাবে আপনার পরিবর্তনগুলি সংরক্ষণ করুন, এই পাতা পুনঃলোড
করুন এবং আবার তাঁদের সংরক্ষণ করুন।",
diff --git a/extensions/Wikibase/repo/i18n/ar.json
b/extensions/Wikibase/repo/i18n/ar.json
index 9d5806f..098f06b 100644
--- a/extensions/Wikibase/repo/i18n/ar.json
+++ b/extensions/Wikibase/repo/i18n/ar.json
@@ -24,6 +24,7 @@
]
},
"wikibase-desc": "مستودع بيانات مهيكلة",
+ "wikibase-entity": "كيان",
"wikibase-entity-item": "عنصر",
"wikibase-entity-property": "خاصية",
"wikibase-entity-query": "استعلام",
diff --git a/extensions/Wikibase/repo/i18n/bg.json
b/extensions/Wikibase/repo/i18n/bg.json
index 3f6b494..e9ede3e 100644
--- a/extensions/Wikibase/repo/i18n/bg.json
+++ b/extensions/Wikibase/repo/i18n/bg.json
@@ -27,6 +27,7 @@
"wikibase-entitytermsforlanguagelistview-label": "Етикет",
"wikibase-entitytermsforlanguagelistview-language": "Език",
"wikibase-entitytermsforlanguagelistview-more": "Всички въведени езици",
+ "wikibase-entitytermsforlanguagelistview-less": "По-малко езици",
"wikibase-label-empty": "Не е зададен етикет",
"wikibase-label-edit-placeholder-language-aware": "въведете етикет на
$1",
"wikibase-description-empty": "Не е въведено описание",
diff --git a/extensions/Wikibase/repo/includes/Specials/SpecialItemByTitle.php
b/extensions/Wikibase/repo/includes/Specials/SpecialItemByTitle.php
index 3a4178f..f20a9e5 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialItemByTitle.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialItemByTitle.php
@@ -208,12 +208,8 @@
* @param string $page
*/
private function switchForm( $siteId, $page ) {
- if ( $this->sites->getSites()->hasSite( $siteId ) ) {
- $site = $this->sites->getSite( $siteId );
- $siteExists = in_array( $site->getGroup(),
$this->groups );
- } else {
- $siteExists = false;
- }
+ $siteExists = $siteId
+ && $this->siteLinkTargetProvider->getSiteList(
$this->groups )->hasSite( $siteId );
wfDebugLog( __CLASS__, __FUNCTION__ . ": Site $siteId exists: "
. var_export( $siteExists, true ) );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
index 7eb4587..45d154d 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
@@ -95,7 +95,7 @@
$this->assertInternalType( 'string',
$statement->getGuid() );
- if ( count( $references ) === 0 ) {
+ if ( $references->isEmpty() ) {
$this->makeInvalidRequest(
$statement->getGuid(),
array( '~=[,,_,,]:3' ),
diff --git a/extensions/Wikibase/tests/browser/environments.yml
b/extensions/Wikibase/tests/browser/environments.yml
index 561afd1..c42232c 100644
--- a/extensions/Wikibase/tests/browser/environments.yml
+++ b/extensions/Wikibase/tests/browser/environments.yml
@@ -51,4 +51,20 @@
user_factory: true
# mediawiki_url: JENKINS WILL SET THIS
+# Use this with "export MEDIAWIKI_ENVIRONMENT=custom" before running "bundle
exec cucumber".
+custom:
+ # language_code: en
+ browser: chrome
+ mediawiki_url: http://localhost/wiki/
+ # A sensible default for the "mediawiki_url_api" is derived from the
"mediawiki_url".
+ # mediawiki_url_api: http://localhost/w/api.php
+ mediawiki_user: …
+ mediawiki_password: …
+ user_factory: true
+ # Default for the "item_namespace" is an empty string, representing the main
namespace.
+ item_namespace: 'Item:'
+ # property_namespace: 'Property:'
+ # item_id_prefix: Q
+ # property_id_prefix : P
+
default: *default
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.css
b/extensions/Wikibase/view/resources/wikibase/wikibase.css
index c7c0619..62570d8 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.css
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.css
@@ -287,13 +287,11 @@
}
.wikibase-statementgrouplistview .wikibase-statementgroupview-property.wb-edit,
-.wikibase-statementlistview-listview .wb-edit
.wikibase-snakview-property-container,
.wikibase-statementgroupview-property.wb-edit + .wikibase-statementlistview >
.wikibase-toolbar-wrapper {
background-color: #C0DAE5;
}
-.wikibase-statementgrouplistview
.wikibase-statementgroupview-property.wb-error,
-.wb-error div.wb-claim-new .wikibase-snakview-property-container {
+.wikibase-statementgrouplistview
.wikibase-statementgroupview-property.wb-error {
background-color: #E5C8B5;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a603ede..c18d30a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -110,19 +110,19 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "fec88156435e6e288c3ea56397760e5b96f0e048"
+ "reference": "0a0a6c57d7a7160bab498468f33a744a908b3dce"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/fec88156435e6e288c3ea56397760e5b96f0e048";,
- "reference": "fec88156435e6e288c3ea56397760e5b96f0e048",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/0a0a6c57d7a7160bab498468f33a744a908b3dce";,
+ "reference": "0a0a6c57d7a7160bab498468f33a744a908b3dce",
"shasum": ""
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.7.2"
},
- "time": "2016-08-28 20:33:39",
+ "time": "2016-08-29 13:36:53",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1397,12 +1397,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "416dd657301560f4fec33226d9c138ca16f4af41"
+ "reference": "840071e8a4553fd2ad6c22f3ad0f31a8c19613e4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/416dd657301560f4fec33226d9c138ca16f4af41";,
- "reference": "416dd657301560f4fec33226d9c138ca16f4af41",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/840071e8a4553fd2ad6c22f3ad0f31a8c19613e4";,
+ "reference": "840071e8a4553fd2ad6c22f3ad0f31a8c19613e4",
"shasum": ""
},
"require": {
@@ -1435,7 +1435,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-08-28 23:20:30",
+ "time": "2016-08-29 20:41:45",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/307485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9296c3ec671927dbc9e2e61b682e8fb8be01eaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
