Use local context to get message instead of relying on global variables

[lhc/web/wiklou.git] / includes / specials / SpecialJavaScriptTest.php
diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php

index c971949..d7e1655 100644 (file)
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -37,16 +37,16 @@ class SpecialJavaScriptTest extends SpecialPage {
  
                 // No framework specified
                 if ( $par == '' ) {
-                       $out->setPagetitle( wfMsg( 'javascripttest' ) );
+                       $out->setPagetitle( wfMsgHtml( 'javascripttest' ) );
                         $summary = $this->wrapSummaryHtml(
-                               wfMsg( 'javascripttest-pagetext-noframework' ) . $this->getFrameworkListHtml(),
+                               wfMsgHtml( 'javascripttest-pagetext-noframework' ) . $this->getFrameworkListHtml(),
                                 'noframework'
                         );
                         $out->addHtml( $summary );
  
                 // Matched! Display proper title and initialize the framework
                 } elseif ( isset( self::$frameworks[$framework] ) ) {
-                       $out->setPagetitle( wfMsg( 'javascripttest-title', wfMsg( "javascripttest-$framework-name" ) ) );
+                       $out->setPagetitle( wfMsgHtml( 'javascripttest-title', wfMsgHtml( "javascripttest-$framework-name" ) ) );
                         $out->setSubtitle(
                                 wfMessage( 'javascripttest-backlink' )->rawParams( Linker::linkKnown( $this->getTitle() ) )->escaped()
                         );
@@ -54,9 +54,9 @@ class SpecialJavaScriptTest extends SpecialPage {
  
                 // Framework not found, display error
                 } else {
-                       $out->setPagetitle( wfMsg( 'javascripttest' ) );
+                       $out->setPagetitle( wfMsgHtml( 'javascripttest' ) );
                         $summary = $this->wrapSummaryHtml( '<p class="error">'
-                               . wfMsg( 'javascripttest-pagetext-unknownframework', $par )
+                               . wfMsgHtml( 'javascripttest-pagetext-unknownframework', $par )
                                 . '</p>'
                                 . $this->getFrameworkListHtml(),
                                 'unknownframework'
@@ -75,7 +75,7 @@ class SpecialJavaScriptTest extends SpecialPage {
                         $list .= Html::rawElement(
                                 'li',
                                 array(),
-                               Linker::link( $this->getTitle( $framework ), wfMsg( "javascripttest-$framework-name" ) )
+                               Linker::link( $this->getTitle( $framework ), wfMsgHtml( "javascripttest-$framework-name" ) )
                         );
                 }
                 $list .= '</ul>';
@@ -106,7 +106,7 @@ class SpecialJavaScriptTest extends SpecialPage {
          * Initialize the page for QUnit.
          */
         private function initQUnitTesting() {
-               global $wgJavaScriptTestConfig;
+               global $wgJavaScriptTestConfig, $wgLang;
  
                 $out = $this->getOutput();
  
@@ -118,13 +118,17 @@ class SpecialJavaScriptTest extends SpecialPage {
                         ->params( $wgJavaScriptTestConfig['qunit']['documentation'] )
                         ->parseAsBlock();
                 $header = wfMessage( 'javascripttest-qunit-heading' )->escaped();
+               $userDir = $wgLang->getDir();
  
                 $baseHtml = <<<HTML
-<div id="qunit-header">$header</div>
+<div class="mw-content-ltr">
+<div id="qunit-header"><span dir="$userDir">$header</span></div>
  <div id="qunit-banner"></div>
  <div id="qunit-testrunner-toolbar"></div>
  <div id="qunit-userAgent"></div>
  <ol id="qunit-tests"></ol>
+<div id="qunit-fixture">test markup, will be hidden</div>
+</div>
  HTML;
                 $out->addHtml( $this->wrapSummaryHtml( $summary, 'frameworkfound' ) . $baseHtml );