Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261366
Change subject: Use wfMessage() everywhere instead of new Message()
......................................................................
Use wfMessage() everywhere instead of new Message()
This is mostly for consistency accross out code base. There is no
functional difference.
Change-Id: Ia54b9f710ca0dc5e5e1183282cf2c2970918505a
---
M client/WikibaseClient.hooks.php
M lib/includes/formatters/MwTimeIsoFormatter.php
M repo/includes/CopyrightMessageBuilder.php
M repo/includes/Localizer/ParseExceptionLocalizer.php
M repo/includes/OutputPageJsConfigBuilder.php
M repo/includes/Parsers/MwTimeIsoParser.php
M repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
7 files changed, 16 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/66/261366/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index dae54c0..bab3d34 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -6,7 +6,6 @@
use BaseTemplate;
use ChangesList;
use IContextSource;
-use Message;
use OutputPage;
use Parser;
use QuickTemplate;
@@ -438,7 +437,7 @@
$settings = $wikibaseClient->getSettings();
$repoSiteName = $settings->getSetting( 'repoSiteName' );
- $message = new Message( $repoSiteName );
+ $message = wfMessage( $repoSiteName );
if ( $message->exists() ) {
$lang = $parser->getTargetLanguage();
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index f89e3b6..540c280 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -5,7 +5,6 @@
use DataValues\TimeValue;
use InvalidArgumentException;
use Language;
-use Message;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use ValueFormatters\ValueFormatterBase;
@@ -316,13 +315,12 @@
* @return string
*/
private function getMessage( $key, $param ) {
- $message = new Message( $key );
+ $message = wfMessage( $key, $param );
// FIXME: As the frontend cannot parse the translated
precisions we only want to
// present the English for now. Once the frontend is using
backend parsers we can
// turn the translation on. See the FIXME in
MwTimeIsoParser::reconvertOutputString.
// $message->inLanguage( $this->language );
$message->inLanguage( 'en' );
- $message->params( array( $param ) );
return $message->text();
}
diff --git a/repo/includes/CopyrightMessageBuilder.php
b/repo/includes/CopyrightMessageBuilder.php
index 89e79f7..856cee5 100644
--- a/repo/includes/CopyrightMessageBuilder.php
+++ b/repo/includes/CopyrightMessageBuilder.php
@@ -28,12 +28,12 @@
$renderedSaveMessage = $this->renderSaveMessage( $language,
$saveMessageKey );
$renderedCopyrightPageMessage =
$this->renderCopyrightPageMessage();
- $rightsWarningMessage = new Message(
+ return wfMessage(
'wikibase-shortcopyrightwarning',
- array( $renderedSaveMessage,
$renderedCopyrightPageMessage, "[$rightsUrl $rightsText]" )
+ $renderedSaveMessage,
+ $renderedCopyrightPageMessage,
+ "[$rightsUrl $rightsText]"
);
-
- return $rightsWarningMessage;
}
/**
@@ -43,16 +43,14 @@
* @return string
*/
private function renderSaveMessage( Language $language, $saveMessageKey
) {
- $saveMessage = new Message( $saveMessageKey );
- return $saveMessage->inLanguage( $language )->text();
+ return wfMessage( $saveMessageKey )->inLanguage( $language
)->text();
}
/**
* @return string
*/
private function renderCopyrightPageMessage() {
- $copyrightPageMessage = new Message( 'copyrightpage' );
- return $copyrightPageMessage->inContentLanguage()->text();
+ return wfMessage( 'copyrightpage'
)->inContentLanguage()->text();
}
}
diff --git a/repo/includes/Localizer/ParseExceptionLocalizer.php
b/repo/includes/Localizer/ParseExceptionLocalizer.php
index c470d1b..4b72dd4 100644
--- a/repo/includes/Localizer/ParseExceptionLocalizer.php
+++ b/repo/includes/Localizer/ParseExceptionLocalizer.php
@@ -39,11 +39,11 @@
// wikibase-parse-error-entity-id
// wikibase-parse-error-quantity
// wikibase-parse-error-time
- $msg = new Message( 'wikibase-parse-error-' .
$expectedFormat );
+ $msg = wfMessage( 'wikibase-parse-error-' .
$expectedFormat );
}
if ( !( $msg instanceof Message ) || !$msg->exists() ) {
- $msg = new Message( 'wikibase-parse-error' );
+ $msg = wfMessage( 'wikibase-parse-error' );
}
return $msg;
diff --git a/repo/includes/OutputPageJsConfigBuilder.php
b/repo/includes/OutputPageJsConfigBuilder.php
index 2ca2ecc..fcc390a 100644
--- a/repo/includes/OutputPageJsConfigBuilder.php
+++ b/repo/includes/OutputPageJsConfigBuilder.php
@@ -96,7 +96,7 @@
*/
private function getCopyrightVar( $copyrightMessage, $language ) {
// non-translated message
- $versionMessage = new Message(
'wikibase-shortcopyrightwarning-version' );
+ $versionMessage = wfMessage(
'wikibase-shortcopyrightwarning-version' );
return array(
'wbCopyright' => array(
diff --git a/repo/includes/Parsers/MwTimeIsoParser.php
b/repo/includes/Parsers/MwTimeIsoParser.php
index abbbb6f..bcb7827 100644
--- a/repo/includes/Parsers/MwTimeIsoParser.php
+++ b/repo/includes/Parsers/MwTimeIsoParser.php
@@ -4,7 +4,6 @@
use DataValues\TimeValue;
use Language;
-use Message;
use RuntimeException;
use ValueParsers\CalendarModelParser;
use ValueParsers\IsoTimestampParser;
@@ -118,7 +117,7 @@
private function reconvertOutputString( $value ) {
foreach ( self::$precisionMsgKeys as $precision =>
$msgKeysGroup ) {
foreach ( $msgKeysGroup as $msgKey ) {
- $msg = new Message( $msgKey );
+ $msg = wfMessage( $msgKey );
// FIXME: Use the language passed in options!
The only reason we are not currently
// doing this is due to the formatting not
currently localizing. See the fix me in
// MwTimeIsoFormatter::getMessage.
diff --git
a/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
b/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
index 3ba298a..ee97bd4 100644
--- a/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
@@ -44,9 +44,11 @@
}
public function getHtmlProvider() {
- $message = new Message(
+ $message = wfMessage(
'wikibase-shortcopyrightwarning',
- array( 'wikibase-submit', 'copyrightpage',
'copyrightlink' )
+ 'wikibase-submit',
+ 'copyrightpage',
+ 'copyrightlink'
);
return array(
--
To view, visit https://gerrit.wikimedia.org/r/261366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia54b9f710ca0dc5e5e1183282cf2c2970918505a
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
