[MediaWiki-commits] [Gerrit] Use LanguageFallbackLabelDescriptionLookupFactory in Special... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use LanguageFallbackLabelDescriptionLookupFactory in
SpecialListProperties
..
Use LanguageFallbackLabelDescriptionLookupFactory in SpecialListProperties
Change-Id: Ie1c13bb27ed920b28d4b11734e500f69da96e91b
---
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
2 files changed, 25 insertions(+), 47 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialListProperties.php
b/repo/includes/specials/SpecialListProperties.php
index 403f669..8ce4177 100644
--- a/repo/includes/specials/SpecialListProperties.php
+++ b/repo/includes/specials/SpecialListProperties.php
@@ -6,12 +6,9 @@
use Html;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataTypeSelector;
-use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
-use Wikibase\Lib\Store\TermLookup;
use Wikibase\PropertyInfoStore;
+use Wikibase\Repo\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Store\TermBuffer;
use Wikibase\View\EntityIdFormatterFactory;
/**
@@ -41,24 +38,14 @@
private $propertyInfoStore;
/**
-* @var LanguageFallbackChainFactory
-*/
- private $languageFallbackChainFactory;
-
- /**
-* @var TermLookup
-*/
- private $termLookup;
-
- /**
-* @var TermBuffer
-*/
- private $termBuffer;
-
- /**
* @var EntityIdFormatterFactory
*/
private $entityIdFormatterFactory;
+
+ /**
+* @var LanguageFallbackLabelDescriptionLookupFactory
+*/
+ private $labelDescriptionLookupFactory;
/**
* @var string
@@ -68,13 +55,13 @@
public function __construct() {
parent::__construct( 'ListProperties' );
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+
$this->initServices(
-
WikibaseRepo::getDefaultInstance()->getDataTypeFactory(),
-
WikibaseRepo::getDefaultInstance()->getStore()->getPropertyInfoStore(),
-
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory(),
- WikibaseRepo::getDefaultInstance()->getTermLookup(),
- WikibaseRepo::getDefaultInstance()->getTermBuffer(),
-
WikibaseRepo::getDefaultInstance()->getEntityIdHtmlLinkFormatterFactory()
+ $wikibaseRepo->getDataTypeFactory(),
+ $wikibaseRepo->getStore()->getPropertyInfoStore(),
+ $wikibaseRepo->getEntityIdHtmlLinkFormatterFactory(),
+
$wikibaseRepo->getLanguageFallbackLabelDescriptionLookupFactory()
);
}
@@ -85,17 +72,13 @@
public function initServices(
DataTypeFactory $dataTypeFactory,
PropertyInfoStore $propertyInfoStore,
- LanguageFallbackChainFactory $languageFallbackChainFactory,
- TermLookup $termLookup,
- TermBuffer $termBuffer,
- EntityIdFormatterFactory $entityIdFormatterFactory
+ EntityIdFormatterFactory $entityIdFormatterFactory,
+ LanguageFallbackLabelDescriptionLookupFactory
$labelDescriptionLookupFactory
) {
$this->dataTypeFactory = $dataTypeFactory;
$this->propertyInfoStore = $propertyInfoStore;
- $this->languageFallbackChainFactory =
$languageFallbackChainFactory;
- $this->termLookup = $termLookup;
- $this->termBuffer = $termBuffer;
$this->entityIdFormatterFactory = $entityIdFormatterFactory;
+ $this->labelDescriptionLookupFactory =
$labelDescriptionLookupFactory;
}
/**
@@ -198,20 +181,12 @@
return;
}
- $languageFallbackChain =
$this->languageFallbackChainFactory->newFromLanguage(
+ $labelDescriptionLookup =
$this->labelDescriptionLookupFactory->newLabelDescriptionLookup(
$this->getLanguage(),
- LanguageFallbackChainFactory::FALLBACK_SELF
- |
LanguageFallbackChainFactory::FALLBACK_VARIANTS
- | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ $propertyIds
);
- $languages = $languageFallbackChain->getFetchLanguageCodes();
- $labelDescriptionLookup = new
LanguageFallbackLabelDescriptionLookup(
- $this->termLookup,
- $languageFallbackChain
- );
- $formatter
[MediaWiki-commits] [Gerrit] Use LanguageFallbackLabelDescriptionLookupFactory in Special... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use LanguageFallbackLabelDescriptionLookupFactory in
SpecialSetSiteLink
..
Use LanguageFallbackLabelDescriptionLookupFactory in SpecialSetSiteLink
Change-Id: Iba45addf3a92fb24d02b82fa852f2a47e6fce6d8
---
M repo/includes/specials/SpecialSetSiteLink.php
1 file changed, 21 insertions(+), 23 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 57ccd83..b1bbc26 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -11,9 +11,8 @@
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
-use Wikibase\Lib\Store\TermLookup;
+use Wikibase\Repo\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Repo\SiteLinkTargetProvider;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
@@ -69,14 +68,9 @@
private $siteLinkTargetProvider;
/**
-* @var TermLookup
+* @var LanguageFallbackLabelDescriptionLookupFactory
*/
- private $termLookup;
-
- /**
-* @var LanguageFallbackChainFactory
-*/
- private $fallbackChainFactory;
+ private $labelDescriptionLookupFactory;
/**
* @since 0.4
@@ -96,8 +90,7 @@
$settings->getSetting( 'specialSiteLinkGroups' )
);
- $this->fallbackChainFactory =
$wikibaseRepo->getLanguageFallbackChainFactory();
- $this->termLookup = $wikibaseRepo->getTermLookup();
+ $this->labelDescriptionLookupFactory =
$wikibaseRepo->getLanguageFallbackLabelDescriptionLookupFactory();
}
/**
@@ -307,23 +300,28 @@
private function getHtmlForBadges() {
$options = '';
- $fallbackChain = $this->fallbackChainFactory->newFromLanguage(
- $this->getLanguage(),
- LanguageFallbackChainFactory::FALLBACK_SELF
- |
LanguageFallbackChainFactory::FALLBACK_VARIANTS
- | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ /** @var ItemId[] $badgeItemIds */
+ $badgeItemIds = array_map(
+ function( $badgeId ) {
+ return new ItemId( $badgeId );
+ },
+ array_keys( $this->badgeItems )
);
- $labelLookup = new LanguageFallbackLabelDescriptionLookup(
$this->termLookup, $fallbackChain );
+ $labelLookup =
$this->labelDescriptionLookupFactory->newLabelDescriptionLookup(
+ $this->getLanguage(),
+ $badgeItemIds
+ );
- foreach ( $this->badgeItems as $badgeId => $value ) {
- $name = 'badge-' . $badgeId;
+ foreach ( $badgeItemIds as $badgeId ) {
+ $idSerialization = $badgeId->getSerialization();
+ $name = 'badge-' . $idSerialization;
try {
- $term = $labelLookup->getLabel( new ItemId(
$badgeId ) );
- $label = $term->getText();
+ $label = $labelLookup->getLabel( $badgeId
)->getText();
} catch ( OutOfBoundsException $ex ) {
- $label = $badgeId;
+ // show plain id if no label has been found
+ $label = $idSerialization;
}
$options .= Html::rawElement(
@@ -333,7 +331,7 @@
),
Html::check(
$name,
- in_array( $badgeId, $this->badges ),
+ in_array( $idSerialization,
$this->badges ),
array(
'id' => $name
)
--
To view, visit https://gerrit.wikimedia.org/r/217240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba45addf3a92fb24d02b82fa852f2a47e6fce6d8
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Bene
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWi
[MediaWiki-commits] [Gerrit] Use LanguageFallbackLabelDescriptionLookupFactory in Special... - change (mediawiki...Wikibase)
Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/217241
Change subject: Use LanguageFallbackLabelDescriptionLookupFactory in
SpecialListProperties
..
Use LanguageFallbackLabelDescriptionLookupFactory in SpecialListProperties
Change-Id: Ie1c13bb27ed920b28d4b11734e500f69da96e91b
---
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
2 files changed, 25 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/41/217241/1
diff --git a/repo/includes/specials/SpecialListProperties.php
b/repo/includes/specials/SpecialListProperties.php
index 403f669..ae3591b 100644
--- a/repo/includes/specials/SpecialListProperties.php
+++ b/repo/includes/specials/SpecialListProperties.php
@@ -6,12 +6,9 @@
use Html;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataTypeSelector;
-use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
-use Wikibase\Lib\Store\TermLookup;
use Wikibase\PropertyInfoStore;
+use Wikibase\Repo\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Store\TermBuffer;
use Wikibase\View\EntityIdFormatterFactory;
/**
@@ -41,24 +38,14 @@
private $propertyInfoStore;
/**
-* @var LanguageFallbackChainFactory
-*/
- private $languageFallbackChainFactory;
-
- /**
-* @var TermLookup
-*/
- private $termLookup;
-
- /**
-* @var TermBuffer
-*/
- private $termBuffer;
-
- /**
* @var EntityIdFormatterFactory
*/
private $entityIdFormatterFactory;
+
+ /**
+* @var LanguageFallbackLabelDescriptionLookupFactory
+*/
+ private $labelDescriptionLookupFactory;
/**
* @var string
@@ -71,10 +58,12 @@
$this->initServices(
WikibaseRepo::getDefaultInstance()->getDataTypeFactory(),
WikibaseRepo::getDefaultInstance()->getStore()->getPropertyInfoStore(),
-
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory(),
- WikibaseRepo::getDefaultInstance()->getTermLookup(),
- WikibaseRepo::getDefaultInstance()->getTermBuffer(),
-
WikibaseRepo::getDefaultInstance()->getEntityIdHtmlLinkFormatterFactory()
+
WikibaseRepo::getDefaultInstance()->getEntityIdHtmlLinkFormatterFactory(),
+ new LanguageFallbackLabelDescriptionLookupFactory(
+
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory(),
+
WikibaseRepo::getDefaultInstance()->getTermLookup(),
+
WikibaseRepo::getDefaultInstance()->getTermBuffer()
+ )
);
}
@@ -85,17 +74,13 @@
public function initServices(
DataTypeFactory $dataTypeFactory,
PropertyInfoStore $propertyInfoStore,
- LanguageFallbackChainFactory $languageFallbackChainFactory,
- TermLookup $termLookup,
- TermBuffer $termBuffer,
- EntityIdFormatterFactory $entityIdFormatterFactory
+ EntityIdFormatterFactory $entityIdFormatterFactory,
+ LanguageFallbackLabelDescriptionLookupFactory
$labelDescriptionLookupFactory
) {
$this->dataTypeFactory = $dataTypeFactory;
$this->propertyInfoStore = $propertyInfoStore;
- $this->languageFallbackChainFactory =
$languageFallbackChainFactory;
- $this->termLookup = $termLookup;
- $this->termBuffer = $termBuffer;
$this->entityIdFormatterFactory = $entityIdFormatterFactory;
+ $this->labelDescriptionLookupFactory =
$labelDescriptionLookupFactory;
}
/**
@@ -198,20 +183,12 @@
return;
}
- $languageFallbackChain =
$this->languageFallbackChainFactory->newFromLanguage(
+ $labelDescriptionLookup =
$this->labelDescriptionLookupFactory->newLabelDescriptionLookup(
$this->getLanguage(),
- LanguageFallbackChainFactory::FALLBACK_SELF
- |
LanguageFallbackChainFactory::FALLBACK_VARIANTS
- | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ $propertyIds
);
- $languages = $languageFallbackChain->getFetchLanguageCodes();
- $labelDescriptionLookup = new
LanguageFallbackLabelDescriptionLookup(
- $this->termLookup,
- $languageFallba
