[MediaWiki-commits] [Gerrit] Use RL context language in MFResourceLoaderParsedMessageModule - change (mediawiki...MobileFrontend)

[Code Review]

Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/275683

Change subject: Use RL context language in MFResourceLoaderParsedMessageModule
......................................................................

Use RL context language in MFResourceLoaderParsedMessageModule

Bug: T127233
Change-Id: If160f659ee4fb7596b64ef8b449310b85d22b0fb
(cherry picked from commit 39c5d699aa2df419d0245c2e0cea2134f6d11796)
---
M includes/modules/MFResourceLoaderParsedMessageModule.php
M tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/83/275683/1

diff --git a/includes/modules/MFResourceLoaderParsedMessageModule.php 
b/includes/modules/MFResourceLoaderParsedMessageModule.php
index 7ae9f8c..c92de3a 100644
--- a/includes/modules/MFResourceLoaderParsedMessageModule.php
+++ b/includes/modules/MFResourceLoaderParsedMessageModule.php
@@ -35,12 +35,13 @@
        /**
         * Processes messages which have been marked as needing parsing
         *
+        * @param string $lang Language code to use
         * @return string JavaScript code
         */
-       public function addParsedMessages() {
+       public function addParsedMessages( $lang ) {
                $js = "\n";
                foreach ( $this->parsedMessages as $key ) {
-                       $value = wfMessage( $key )->parse();
+                       $value = wfMessage( $key )->inLanguage( $lang 
)->parse();
                        $js .= Xml::encodeJsCall( 'mw.messages.set', array( 
$key, $value ) );
                }
                return $js;
@@ -81,7 +82,7 @@
         */
        public function getScript( ResourceLoaderContext $context ) {
                $script = parent::getScript( $context );
-               return $this->addParsedMessages() . $script;
+               return $this->addParsedMessages( $context->getLanguage() ) . 
$script;
        }
 
        /**
diff --git a/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php 
b/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
index 4ee5b44..8500df6 100644
--- a/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
+++ b/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
@@ -74,7 +74,7 @@
         */
        public function testAddParsedMessages( $module, $expectedJavascript ) {
                $rl = new MFResourceLoaderParsedMessageModule( $module );
-               $js = $rl->addParsedMessages();
+               $js = $rl->addParsedMessages( 'en' );
 
                $this->assertEquals( $js, $expectedJavascript );
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/275683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If160f659ee4fb7596b64ef8b449310b85d22b0fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.27.0-wmf.15
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits