Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261363
Change subject: Drop obsolete ApiErrorReporter::forceMessageLanguage
......................................................................
Drop obsolete ApiErrorReporter::forceMessageLanguage
I think this is not needed any more. I may be wrong since I am not
sure how to test this.
Change-Id: Ieb496cfbf032c3330be101a47e33b526722be998
---
M repo/includes/api/ApiErrorReporter.php
1 file changed, 3 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/63/261363/1
diff --git a/repo/includes/api/ApiErrorReporter.php
b/repo/includes/api/ApiErrorReporter.php
index 9ac818e..3d81597 100644
--- a/repo/includes/api/ApiErrorReporter.php
+++ b/repo/includes/api/ApiErrorReporter.php
@@ -54,29 +54,6 @@
}
/**
- * @note This is a workaround for the fact that Message caches the
message text and
- * doesn't reset it when the language changes. This can be removed once
- * https://gerrit.wikimedia.org/r/125388 or an equivalent is merged.
- *
- * @param Message $message
- * @param Language|string $language
- *
- * @return Message
- */
- private function forceMessageLanguage( Message $message, $language ) {
- if ( is_string( $language ) ) {
- $language = Language::factory( $language );
- }
-
- if ( $message->getLanguage()->getCode() !==
$language->getCode() ) {
- // Create a new message object to bypass any caching
issues
- $message = new Message( $message->getKey(),
$message->getParams(), $language );
- }
-
- return $message;
- }
-
- /**
* Reports any warnings in the Status object on the warnings section
* of the result.
*
@@ -222,7 +199,7 @@
* @throws LogicException
*/
private function dieMessageObject( Message $message, $errorCode,
$httpRespCode = 0, $extradata = array() ) {
- $description = $this->forceMessageLanguage( $message, 'en'
)->useDatabase( false )->plain();
+ $description = $message->inLanguage( 'en' )->useDatabase( false
)->plain();
$this->addMessageToResult( $message, $extradata );
@@ -257,7 +234,7 @@
if ( $message->exists() ) {
$this->addMessageToResult( $message, $extradata );
- $text = $this->forceMessageLanguage( $message, 'en'
)->useDatabase( false )->plain();
+ $text = $message->inLanguage( 'en' )->useDatabase(
false )->plain();
if ( $description == '' ) {
$description = $text;
@@ -439,7 +416,7 @@
ApiResult::setValue( $row, 'parameters', $params );
ApiResult::setIndexedTagName( $row['parameters'], 'parameter' );
- $html = $this->forceMessageLanguage( $message, $this->language
)->useDatabase( true )->parse();
+ $html = $message->inLanguage( $this->language )->useDatabase(
true )->parse();
ApiResult::setValue( $row, 'html', $html );
$row[ApiResult::META_BC_SUBELEMENTS][] = 'html';
--
To view, visit https://gerrit.wikimedia.org/r/261363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb496cfbf032c3330be101a47e33b526722be998
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
