http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89612
Revision: 89612
Author: platonides
Date: 2011-06-06 21:24:23 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Follow up r89585. Clean up after the test, expand inContentLanguage() comment.
Modified Paths:
--------------
trunk/phase3/includes/Message.php
trunk/phase3/tests/phpunit/includes/MessageTest.php
Modified: trunk/phase3/includes/Message.php
===================================================================
--- trunk/phase3/includes/Message.php 2011-06-06 21:22:31 UTC (rev 89611)
+++ trunk/phase3/includes/Message.php 2011-06-06 21:24:23 UTC (rev 89612)
@@ -224,7 +224,8 @@
}
/**
- * Request the message in the wiki's content language.
+ * Request the message in the wiki's content language,
+ * unless it is disabled for this message.
* @see $wgForceUIMsgAsContentMsg
* @return Message: $this
*/
Modified: trunk/phase3/tests/phpunit/includes/MessageTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/MessageTest.php 2011-06-06 21:22:31 UTC
(rev 89611)
+++ trunk/phase3/tests/phpunit/includes/MessageTest.php 2011-06-06 21:24:23 UTC
(rev 89612)
@@ -41,11 +41,16 @@
function testInContentLanguage() {
global $wgLang, $wgForceUIMsgAsContentMsg;
+ $oldLang = $wgLang;
$wgLang = Language::factory( 'fr' );
- $this->assertEquals( 'Main Page', wfMessage( 'mainpage'
)->inContentLanguage()->plain(), "ForceUIMsg disabled" );
- $wgForceUIMsgAsContentMsg[] = 'mainpage';
+ $this->assertEquals( 'Main Page', wfMessage( 'mainpage'
)->inContentLanguage()->plain(), 'ForceUIMsg disabled' );
+ $wgForceUIMsgAsContentMsg['testInContentLanguage'] = 'mainpage';
$this->assertEquals( 'Accueil', wfMessage( 'mainpage'
)->inContentLanguage()->plain(), 'ForceUIMsg enabled' );
+
+ /* Restore globals */
+ $wgLang = $oldLang;
+ unset( $wgForceUIMsgAsContentMsg['testInContentLanguage'] );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
