Matěj Suchánek has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315291
Change subject: Use single EntityIdFormatter when undoing edits
......................................................................
Use single EntityIdFormatter when undoing edits
Finishing attempt from Iefb7c8d4b, code again stolen from I22f40951d.
Change-Id: If991f566659690807570b5966fa30df51c3785b3
---
M repo/includes/Actions/EditEntityAction.php
1 file changed, 14 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/315291/4
diff --git a/repo/includes/Actions/EditEntityAction.php
b/repo/includes/Actions/EditEntityAction.php
index 03c1904..16d26c0 100644
--- a/repo/includes/Actions/EditEntityAction.php
+++ b/repo/includes/Actions/EditEntityAction.php
@@ -15,10 +15,8 @@
use ValueFormatters\ValueFormatter;
use WebRequest;
use Wikibase\DataModel\Services\Lookup\EntityRetrievingTermLookup;
-use Wikibase\DataModel\Services\Lookup\LanguageLabelDescriptionLookup;
-use Wikibase\Lib\EntityIdHtmlLinkFormatter;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Repo\Content\EntityContentDiff;
use Wikibase\Repo\Diff\ClaimDiffer;
use Wikibase\Repo\Diff\ClaimDifferenceVisualizer;
@@ -63,10 +61,19 @@
) );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
+
$termLookup = new EntityRetrievingTermLookup(
$wikibaseRepo->getEntityLookup() );
- $labelDescriptionLookup = new LanguageLabelDescriptionLookup(
$termLookup, $languageCode );
+ $labelDescriptionLookupFactory = new
LanguageFallbackLabelDescriptionLookupFactory(
+ $wikibaseRepo->getLanguageFallbackChainFactory(),
+ $termLookup
+ );
+ $labelDescriptionLookup =
$labelDescriptionLookupFactory->newLabelDescriptionLookup(
+ $this->getContext()->getLanguage(),
+ array() // TODO: populate ids of entities to prefetch
+ );
+
$htmlFormatterFactory =
$wikibaseRepo->getEntityIdHtmlLinkFormatterFactory();
- $propertyIdFormatter =
$htmlFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
+ $entityIdFormatter =
$htmlFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
$formatterFactory = $wikibaseRepo->getSnakFormatterFactory();
$snakDetailsFormatter = $formatterFactory->getSnakFormatter(
SnakFormatter::FORMAT_HTML_DIFF, $options );
@@ -77,7 +84,7 @@
new ClaimDiffer( new OrderedListDiffer( new
ComparableComparer() ) ),
new ClaimDifferenceVisualizer(
new DifferencesSnakVisualizer(
- $propertyIdFormatter,
+ $entityIdFormatter,
$snakDetailsFormatter,
$snakBreadCrumbFormatter,
$languageCode
@@ -85,11 +92,7 @@
$languageCode
),
$wikibaseRepo->getSiteStore(),
- new EntityIdHtmlLinkFormatter(
- $labelDescriptionLookup,
- $wikibaseRepo->getEntityTitleLookup(),
- new LanguageNameLookup( $languageCode )
- )
+ $entityIdFormatter
);
}
--
To view, visit https://gerrit.wikimedia.org/r/315291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If991f566659690807570b5966fa30df51c3785b3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchane...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
