Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190415
Change subject: WIP: Use UI language where appropriate
......................................................................
WIP: Use UI language where appropriate
Also, remove one wgContLang instance that was just dead code.
Change-Id: I18f583d201b61bc734a27ba558ff3d8612a87a34
---
M container.php
M includes/Log/Formatter.php
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/15/190415/1
diff --git a/container.php b/container.php
index 6d81652..e3120d1 100644
--- a/container.php
+++ b/container.php
@@ -209,7 +209,6 @@
);
} );
$c['listener.recentchanges'] = $c->share( function( $c ) {
- global $wgContLang;
// Recent change listeners go out to external services and
// as such must only be run after the transaction is commited.
return new Flow\Data\Listener\DeferredInsertLifecycleHandler(
diff --git a/includes/Log/Formatter.php b/includes/Log/Formatter.php
index b4e8461..067d1b3 100644
--- a/includes/Log/Formatter.php
+++ b/includes/Log/Formatter.php
@@ -13,8 +13,6 @@
* @return string The log entry
*/
protected function getActionMessage() {
- global $wgContLang;
-
$type = $this->entry->getType();
$action = $this->entry->getSubtype();
$title = $this->entry->getTarget();
@@ -55,15 +53,13 @@
// logentry-suppress-flow-restore-post,
logentry-suppress-flow-suppress-post,
// logentry-delete-flow-delete-topic,
logentry-delete-flow-restore-topic,
// logentry-suppress-flow-restore-topic,
logentry-suppress-flow-suppress-topic,
- $language = $skin === null ? $wgContLang : $skin->getLanguage();
- $message = wfMessage( "logentry-$type-$action" )
+ $message = $this->msg( "logentry-$type-$action" )
->params( array(
Message::rawParam( $this->getPerformerElement()
),
$this->entry->getPerformer()->getId(),
$title,
$title->getFullUrl( $params ),
) )
- ->inLanguage( $language )
->parse();
return \Html::rawElement(
--
To view, visit https://gerrit.wikimedia.org/r/190415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18f583d201b61bc734a27ba558ff3d8612a87a34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
