Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 130 insertions, 0 deletions

diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
new file mode 100644
index 00000000..baf28b07
--- /dev/null
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -0,0 +1,130 @@
+<?php
+
+class LanguageConverterTest extends MediaWikiLangTestCase {
+	protected $lang = null;
+	protected $lc = null;
+
+	function setUp() {
+		parent::setUp();
+		global $wgMemc, $wgRequest, $wgUser, $wgContLang;
+
+		$wgUser = new User;
+		$wgRequest = new FauxRequest( array() );
+		$wgMemc = new EmptyBagOStuff;
+		$wgContLang = Language::factory( 'tg' );
+		$this->lang = new LanguageToTest();
+		$this->lc = new TestConverter( $this->lang, 'tg',
+									   array( 'tg', 'tg-latn' ) );
+	}
+
+	function tearDown() {
+		global $wgMemc;
+		unset( $wgMemc );
+		unset( $this->lc );
+		unset( $this->lang );
+		parent::tearDown();
+	}
+
+	function testGetPreferredVariantDefaults() {
+		$this->assertEquals( 'tg', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantHeaders() {
+		global $wgRequest;
+		$wgRequest->setHeader( 'Accept-Language', 'tg-latn' );
+
+		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantHeaderWeight() {
+		global $wgRequest;
+		$wgRequest->setHeader( 'Accept-Language', 'tg;q=1' );
+
+		$this->assertEquals( 'tg', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantHeaderWeight2() {
+		global $wgRequest;
+		$wgRequest->setHeader( 'Accept-Language', 'tg-latn;q=1' );
+
+		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantHeaderMulti() {
+		global $wgRequest;
+		$wgRequest->setHeader( 'Accept-Language', 'en, tg-latn;q=1' );
+
+		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantUserOption() {
+		global $wgUser;
+
+		$wgUser = new User;
+		$wgUser->load(); // from 'defaults'
+		$wgUser->mId = 1;
+		$wgUser->mDataLoaded = true;
+		$wgUser->mOptionsLoaded = true;
+		$wgUser->setOption( 'variant', 'tg-latn' );
+
+		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantHeaderUserVsUrl() {
+		global $wgRequest, $wgUser, $wgContLang;
+
+		$wgContLang = Language::factory( 'tg-latn' );
+		$wgRequest->setVal( 'variant', 'tg' );
+		$wgUser = User::newFromId( "admin" );
+		$wgUser->setId( 1 );
+		$wgUser->mFrom = 'defaults';
+		$wgUser->mOptionsLoaded = true;
+		$wgUser->setOption( 'variant', 'tg-latn' ); // The user's data is ignored
+												  // because the variant is set in the URL.
+		$this->assertEquals( 'tg', $this->lc->getPreferredVariant() );
+	}
+
+
+	function testGetPreferredVariantDefaultLanguageVariant() {
+		global $wgDefaultLanguageVariant;
+
+		$wgDefaultLanguageVariant = 'tg-latn';
+		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
+	}
+
+	function testGetPreferredVariantDefaultLanguageVsUrlVariant() {
+		global $wgDefaultLanguageVariant, $wgRequest, $wgContLang;
+
+		$wgContLang = Language::factory( 'tg-latn' );
+		$wgDefaultLanguageVariant = 'tg';
+		$wgRequest->setVal( 'variant', null );
+		$this->assertEquals( 'tg', $this->lc->getPreferredVariant() );
+	}
+}
+
+/**
+ * Test converter (from Tajiki to latin orthography)
+ */
+class TestConverter extends LanguageConverter {
+	private $table = array(
+		'б' => 'b',
+		'в' => 'v',
+		'г' => 'g',
+	);
+
+	function loadDefaultTables() {
+		$this->mTables = array(
+			'tg-latn' => new ReplacementArray( $this->table ),
+			'tg'      => new ReplacementArray()
+		);
+	}
+
+}
+
+class LanguageToTest extends Language {
+	function __construct() {
+		parent::__construct();
+		$variants = array( 'tg', 'tg-latn' );
+		$this->mConverter = new TestConverter( $this, 'tg', $variants );
+	}
+}