Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 685 insertions, 68 deletions

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index b8193a92..be362e22 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -1,97 +1,714 @@
-QUnit.module( 'mediawiki.jqueryMsg' );
+( function ( mw, $ ) {
+	var mwLanguageCache = {}, formatText, formatParse, formatnumTests, specialCharactersPageName,
+		expectedListUsers, expectedEntrypoints;
 
-QUnit.test( 'mw.jqueryMsg Plural', 3, function ( assert ) {
-	var parser = mw.jqueryMsg.getMessageFunction();
+	// When the expected result is the same in both modes
+	function assertBothModes( assert, parserArguments, expectedResult, assertMessage ) {
+		assert.equal( formatText.apply( null, parserArguments ), expectedResult, assertMessage + ' when format is \'text\'' );
+		assert.equal( formatParse.apply( null, parserArguments ), expectedResult, assertMessage + ' when format is \'parse\'' );
+	}
 
-	mw.messages.set( 'plural-msg', 'Found $1 {{PLURAL:$1|item|items}}' );
-	assert.equal( parser( 'plural-msg', 0 ), 'Found 0 items', 'Plural test for english with zero as count' );
-	assert.equal( parser( 'plural-msg', 1 ), 'Found 1 item', 'Singular test for english' );
-	assert.equal( parser( 'plural-msg', 2 ), 'Found 2 items', 'Plural test for english' );
+	QUnit.module( 'mediawiki.jqueryMsg', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.orgMwLangauge = mw.language;
+			mw.language = $.extend( true, {}, this.orgMwLangauge );
+
+			// Messages that are reused in multiple tests
+			mw.messages.set( {
+				// The values for gender are not significant,
+				// what matters is which of the values is choosen by the parser
+				'gender-msg': '$1: {{GENDER:$2|blue|pink|green}}',
+
+				'plural-msg': 'Found $1 {{PLURAL:$1|item|items}}',
+
+				// Assume the grammar form grammar_case_foo is not valid in any language
+				'grammar-msg': 'Przeszukaj {{GRAMMAR:grammar_case_foo|{{SITENAME}}}}',
+
+				'formatnum-msg': '{{formatnum:$1}}',
+
+				'portal-url': 'Project:Community portal',
+				'see-portal-url': '{{Int:portal-url}} is an important community page.',
+
+				'jquerymsg-test-statistics-users': '注册[[Special:ListUsers|用户]]',
+
+				'jquerymsg-test-version-entrypoints-index-php': '[https://www.mediawiki.org/wiki/Manual:index.php index.php]',
+
+				'external-link-replace': 'Foo [$1 bar]'
+			} );
+
+			mw.config.set( {
+				wgArticlePath: '/wiki/$1'
+			} );
+
+			specialCharactersPageName = '"Who" wants to be a millionaire & live on \'Exotic Island\'?';
+
+			expectedListUsers = '注册<a title="Special:ListUsers" href="/wiki/Special:ListUsers">用户</a>';
+
+			expectedEntrypoints = '<a href="https://www.mediawiki.org/wiki/Manual:index.php">index.php</a>';
+
+			formatText = mw.jqueryMsg.getMessageFunction( {
+				format: 'text'
+			} );
+
+			formatParse = mw.jqueryMsg.getMessageFunction( {
+				format: 'parse'
+			} );
+		},
+		teardown: function () {
+			mw.language = this.orgMwLangauge;
+		}
+	} ) );
+
+	function getMwLanguage( langCode, cb ) {
+		if ( mwLanguageCache[langCode] !== undefined ) {
+			mwLanguageCache[langCode].add( cb );
+			return;
+		}
+		mwLanguageCache[langCode] = $.Callbacks( 'once memory' );
+		mwLanguageCache[langCode].add( cb );
+		$.ajax( {
+			url: mw.util.wikiScript( 'load' ),
+			data: {
+				skin: mw.config.get( 'skin' ),
+				lang: langCode,
+				debug: mw.config.get( 'debug' ),
+				modules: [
+					'mediawiki.language.data',
+					'mediawiki.language'
+				].join( '|' ),
+				only: 'scripts'
+			},
+			dataType: 'script'
+		} ).done(function () {
+				mwLanguageCache[langCode].fire( mw.language );
+			} ).fail( function () {
+				mwLanguageCache[langCode].fire( false );
+			} );
+	}
+
+	QUnit.test( 'Replace', 9, function ( assert ) {
+		mw.messages.set( 'simple', 'Foo $1 baz $2' );
+
+		assert.equal( formatParse( 'simple' ), 'Foo $1 baz $2', 'Replacements with no substitutes' );
+		assert.equal( formatParse( 'simple', 'bar' ), 'Foo bar baz $2', 'Replacements with less substitutes' );
+		assert.equal( formatParse( 'simple', 'bar', 'quux' ), 'Foo bar baz quux', 'Replacements with all substitutes' );
+
+		mw.messages.set( 'plain-input', '<foo foo="foo">x$1y&lt;</foo>z' );
+
+		assert.equal(
+			formatParse( 'plain-input', 'bar' ),
+			'&lt;foo foo="foo"&gt;xbary&amp;lt;&lt;/foo&gt;z',
+			'Input is not considered html'
+		);
+
+		mw.messages.set( 'plain-replace', 'Foo $1' );
+
+		assert.equal(
+			formatParse( 'plain-replace', '<bar bar="bar">&gt;</bar>' ),
+			'Foo &lt;bar bar="bar"&gt;&amp;gt;&lt;/bar&gt;',
+			'Replacement is not considered html'
+		);
+
+		mw.messages.set( 'object-replace', 'Foo $1' );
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ) ),
+			'Foo <div class="bar">&gt;</div>',
+			'jQuery objects are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ).get( 0 ) ),
+			'Foo <div class="bar">&gt;</div>',
+			'HTMLElement objects are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ).toArray() ),
+			'Foo <div class="bar">&gt;</div>',
+			'HTMLElement[] arrays are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'external-link-replace', 'http://example.org/?x=y&z' ),
+			'Foo <a href="http://example.org/?x=y&amp;z">bar</a>',
+			'Href is not double-escaped in wikilink function'
+		);
+	} );
+
+	QUnit.test( 'Plural', 3, function ( assert ) {
+		assert.equal( formatParse( 'plural-msg', 0 ), 'Found 0 items', 'Plural test for english with zero as count' );
+		assert.equal( formatParse( 'plural-msg', 1 ), 'Found 1 item', 'Singular test for english' );
+		assert.equal( formatParse( 'plural-msg', 2 ), 'Found 2 items', 'Plural test for english' );
+	} );
+
+	QUnit.test( 'Gender', 11, function ( assert ) {
+		// TODO: These tests should be for mw.msg once mw.msg integrated with mw.jqueryMsg
+		// TODO: English may not be the best language for these tests. Use a language like Arabic or Russian
+		var user = mw.user;
+
+		user.options.set( 'gender', 'male' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Bob', 'male' ),
+			'Bob: blue',
+			'Masculine from string "male"'
+		);
+		assert.equal(
+			formatParse( 'gender-msg', 'Bob', user ),
+			'Bob: blue',
+			'Masculine from mw.user object'
+		);
+
+		user.options.set( 'gender', 'unknown' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Foo', user ),
+			'Foo: green',
+			'Neutral from mw.user object' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Alice', 'female' ),
+			'Alice: pink',
+			'Feminine from string "female"' );
+		assert.equal(
+			formatParse( 'gender-msg', 'User' ),
+			'User: green',
+			'Neutral when no parameter given' );
+		assert.equal(
+			formatParse( 'gender-msg', 'User', 'unknown' ),
+			'User: green',
+			'Neutral from string "unknown"'
+		);
+
+		mw.messages.set( 'gender-msg-one-form', '{{GENDER:$1|User}}: $2 {{PLURAL:$2|edit|edits}}' );
+
+		assert.equal(
+			formatParse( 'gender-msg-one-form', 'male', 10 ),
+			'User: 10 edits',
+			'Gender neutral and plural form'
+		);
+		assert.equal(
+			formatParse( 'gender-msg-one-form', 'female', 1 ),
+			'User: 1 edit',
+			'Gender neutral and singular form'
+		);
+
+		mw.messages.set( 'gender-msg-lowercase', '{{gender:$1|he|she}} is awesome' );
+		assert.equal(
+			formatParse( 'gender-msg-lowercase', 'male' ),
+			'he is awesome',
+			'Gender masculine'
+		);
+		assert.equal(
+			formatParse( 'gender-msg-lowercase', 'female' ),
+			'she is awesome',
+			'Gender feminine'
+		);
+
+		mw.messages.set( 'gender-msg-wrong', '{{gender}} test' );
+		assert.equal(
+			formatParse( 'gender-msg-wrong', 'female' ),
+			' test',
+			'Invalid syntax should result in {{gender}} simply being stripped away'
+		);
+	} );
+
+	QUnit.test( 'Grammar', 2, function ( assert ) {
+		assert.equal( formatParse( 'grammar-msg' ), 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'Grammar Test with sitename' );
+
+		mw.messages.set( 'grammar-msg-wrong-syntax', 'Przeszukaj {{GRAMMAR:grammar_case_xyz}}' );
+		assert.equal( formatParse( 'grammar-msg-wrong-syntax' ), 'Przeszukaj ', 'Grammar Test with wrong grammar template syntax' );
+	} );
+
+	QUnit.test( 'Match PHP parser', mw.libs.phpParserData.tests.length, function ( assert ) {
+		mw.messages.set( mw.libs.phpParserData.messages );
+		$.each( mw.libs.phpParserData.tests, function ( i, test ) {
+			QUnit.stop();
+			getMwLanguage( test.lang, function ( langClass ) {
+				QUnit.start();
+				if ( !langClass ) {
+					assert.ok( false, 'Language "' + test.lang + '" failed to load' );
+					return;
+				}
+				mw.config.set( 'wgUserLanguage', test.lang );
+				var parser = new mw.jqueryMsg.parser( { language: langClass } );
+				assert.equal(
+					parser.parse( test.key, test.args ).html(),
+					test.result,
+					test.name
+				);
+			} );
+		} );
+	} );
+
+	QUnit.test( 'Links', 6, function ( assert ) {
+		var expectedDisambiguationsText,
+			expectedMultipleBars,
+			expectedSpecialCharacters;
+
+		/*
+		 The below three are all identical to or based on real messages.  For disambiguations-text,
+		 the bold was removed because it is not yet implemented.
+		 */
+
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-statistics-users' ),
+			expectedListUsers,
+			'Piped wikilink'
+		);
+
+		expectedDisambiguationsText = 'The following pages contain at least one link to a disambiguation page.\nThey may have to link to a more appropriate page instead.\nA page is treated as a disambiguation page if it uses a template that is linked from ' +
+			'<a title="MediaWiki:Disambiguationspage" href="/wiki/MediaWiki:Disambiguationspage">MediaWiki:Disambiguationspage</a>.';
+
+		mw.messages.set( 'disambiguations-text', 'The following pages contain at least one link to a disambiguation page.\nThey may have to link to a more appropriate page instead.\nA page is treated as a disambiguation page if it uses a template that is linked from [[MediaWiki:Disambiguationspage]].' );
+		assert.htmlEqual(
+			formatParse( 'disambiguations-text' ),
+			expectedDisambiguationsText,
+			'Wikilink without pipe'
+		);
+
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-version-entrypoints-index-php' ),
+			expectedEntrypoints,
+			'External link'
+		);
+
+		// Pipe trick is not supported currently, but should not parse as text either.
+		mw.messages.set( 'pipe-trick', '[[Tampa, Florida|]]' );
+		assert.equal(
+			formatParse( 'pipe-trick' ),
+			'pipe-trick: Parse error at position 0 in input: [[Tampa, Florida|]]',
+			'Pipe trick should return error string.'
+		);
+
+		expectedMultipleBars = '<a title="Main Page" href="/wiki/Main_Page">Main|Page</a>';
+		mw.messages.set( 'multiple-bars', '[[Main Page|Main|Page]]' );
+		assert.htmlEqual(
+			formatParse( 'multiple-bars' ),
+			expectedMultipleBars,
+			'Bar in anchor'
+		);
+
+		expectedSpecialCharacters = '<a title="&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?" href="/wiki/%22Who%22_wants_to_be_a_millionaire_%26_live_on_%27Exotic_Island%27%3F">&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?</a>';
+
+		mw.messages.set( 'special-characters', '[[' + specialCharactersPageName + ']]' );
+		assert.htmlEqual(
+			formatParse( 'special-characters' ),
+			expectedSpecialCharacters,
+			'Special characters'
+		);
+	} );
+
+// Tests that {{-transformation vs. general parsing are done as requested
+	QUnit.test( 'Curly brace transformation', 14, function ( assert ) {
+		var oldUserLang = mw.config.get( 'wgUserLanguage' );
+
+		assertBothModes( assert, ['gender-msg', 'Bob', 'male'], 'Bob: blue', 'gender is resolved' );
+
+		assertBothModes( assert, ['plural-msg', 5], 'Found 5 items', 'plural is resolved' );
+
+		assertBothModes( assert, ['grammar-msg'], 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'grammar is resolved' );
+
+		mw.config.set( 'wgUserLanguage', 'en' );
+		assertBothModes( assert, ['formatnum-msg', '987654321.654321'], '987,654,321.654', 'formatnum is resolved' );
+
+		// Test non-{{ wikitext, where behavior differs
+
+		// Wikilink
+		assert.equal(
+			formatText( 'jquerymsg-test-statistics-users' ),
+			mw.messages.get( 'jquerymsg-test-statistics-users' ),
+			'Internal link message unchanged when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-statistics-users' ),
+			expectedListUsers,
+			'Internal link message parsed when format is \'parse\''
+		);
+
+		// External link
+		assert.equal(
+			formatText( 'jquerymsg-test-version-entrypoints-index-php' ),
+			mw.messages.get( 'jquerymsg-test-version-entrypoints-index-php' ),
+			'External link message unchanged when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-version-entrypoints-index-php' ),
+			expectedEntrypoints,
+			'External link message processed when format is \'parse\''
+		);
+
+		// External link with parameter
+		assert.equal(
+			formatText( 'external-link-replace', 'http://example.com' ),
+			'Foo [http://example.com bar]',
+			'External link message only substitutes parameter when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'external-link-replace', 'http://example.com' ),
+			'Foo <a href="http://example.com">bar</a>',
+			'External link message processed when format is \'parse\''
+		);
+
+		mw.config.set( 'wgUserLanguage', oldUserLang );
+	} );
+
+	QUnit.test( 'Int', 4, function ( assert ) {
+		var newarticletextSource = 'You have followed a link to a page that does not exist yet. To create the page, start typing in the box below (see the [[{{Int:Helppage}}|help page]] for more info). If you are here by mistake, click your browser\'s back button.',
+			expectedNewarticletext,
+			helpPageTitle = 'Help:Contents';
+
+		mw.messages.set( 'helppage', helpPageTitle );
+
+		expectedNewarticletext = 'You have followed a link to a page that does not exist yet. To create the page, start typing in the box below (see the ' +
+			'<a title="Help:Contents" href="/wiki/Help:Contents">help page</a> for more info). If you are here by mistake, click your browser\'s back button.';
+
+		mw.messages.set( 'newarticletext', newarticletextSource );
+
+		assert.htmlEqual(
+			formatParse( 'newarticletext' ),
+			expectedNewarticletext,
+			'Link with nested message'
+		);
+
+		assert.equal(
+			formatParse( 'see-portal-url' ),
+			'Project:Community portal is an important community page.',
+			'Nested message'
+		);
+
+		mw.messages.set( 'newarticletext-lowercase',
+			newarticletextSource.replace( 'Int:Helppage', 'int:helppage' ) );
+
+		assert.htmlEqual(
+			formatParse( 'newarticletext-lowercase' ),
+			expectedNewarticletext,
+			'Link with nested message, lowercase include'
+		);
+
+		mw.messages.set( 'uses-missing-int', '{{int:doesnt-exist}}' );
+
+		assert.equal(
+			formatParse( 'uses-missing-int' ),
+			'[doesnt-exist]',
+			'int: where nested message does not exist'
+		);
+	} );
+
+// Tests that getMessageFunction is used for non-plain messages with curly braces or
+// square brackets, but not otherwise.
+	QUnit.test( 'mw.Message.prototype.parser monkey-patch', 22, function ( assert ) {
+		var oldGMF, outerCalled, innerCalled;
+
+		mw.messages.set( {
+			'curly-brace': '{{int:message}}',
+			'single-square-bracket': '[https://www.mediawiki.org/ MediaWiki]',
+			'double-square-bracket': '[[Some page]]',
+			'regular': 'Other message'
+		} );
+
+		oldGMF = mw.jqueryMsg.getMessageFunction;
+
+		mw.jqueryMsg.getMessageFunction = function () {
+			outerCalled = true;
+			return function () {
+				innerCalled = true;
+			};
+		};
+
+		function verifyGetMessageFunction( key, format, shouldCall ) {
+			var message;
+			outerCalled = false;
+			innerCalled = false;
+			message = mw.message( key );
+			message[format]();
+			assert.strictEqual( outerCalled, shouldCall, 'Outer function called for ' + key );
+			assert.strictEqual( innerCalled, shouldCall, 'Inner function called for ' + key );
+		}
+
+		verifyGetMessageFunction( 'curly-brace', 'parse', true );
+		verifyGetMessageFunction( 'curly-brace', 'plain', false );
+
+		verifyGetMessageFunction( 'single-square-bracket', 'parse', true );
+		verifyGetMessageFunction( 'single-square-bracket', 'plain', false );
+
+		verifyGetMessageFunction( 'double-square-bracket', 'parse', true );
+		verifyGetMessageFunction( 'double-square-bracket', 'plain', false );
+
+		verifyGetMessageFunction( 'regular', 'parse', false );
+		verifyGetMessageFunction( 'regular', 'plain', false );
+
+		verifyGetMessageFunction( 'jquerymsg-test-pagetriage-del-talk-page-notify-summary', 'plain', false );
+		verifyGetMessageFunction( 'jquerymsg-test-categorytree-collapse-bullet', 'plain', false );
+		verifyGetMessageFunction( 'jquerymsg-test-wikieditor-toolbar-help-content-signature-result', 'plain', false );
+
+		mw.jqueryMsg.getMessageFunction = oldGMF;
+	} );
+
+formatnumTests = [
+	{
+		lang: 'en',
+		number: 987654321.654321,
+		result: '987,654,321.654',
+		description: 'formatnum test for English, decimal seperator'
+	},
+	{
+		lang: 'ar',
+		number: 987654321.654321,
+		result: '٩٨٧٬٦٥٤٬٣٢١٫٦٥٤',
+		description: 'formatnum test for Arabic, with decimal seperator'
+	},
+	{
+		lang: 'ar',
+		number: '٩٨٧٦٥٤٣٢١٫٦٥٤٣٢١',
+		result: 987654321,
+		integer: true,
+		description: 'formatnum test for Arabic, with decimal seperator, reverse'
+	},
+	{
+		lang: 'ar',
+		number: -12.89,
+		result: '-١٢٫٨٩',
+		description: 'formatnum test for Arabic, negative number'
+	},
+	{
+		lang: 'ar',
+		number: '-١٢٫٨٩',
+		result: -12,
+		integer: true,
+		description: 'formatnum test for Arabic, negative number, reverse'
+	},
+	{
+		lang: 'nl',
+		number: 987654321.654321,
+		result: '987.654.321,654',
+		description: 'formatnum test for Nederlands, decimal seperator'
+	},
+	{
+		lang: 'nl',
+		number: -12.89,
+		result: '-12,89',
+		description: 'formatnum test for Nederlands, negative number'
+	},
+	{
+		lang: 'nl',
+		number: '.89',
+		result: '0,89',
+		description: 'formatnum test for Nederlands'
+	},
+	{
+		lang: 'nl',
+		number: 'invalidnumber',
+		result: 'invalidnumber',
+		description: 'formatnum test for Nederlands, invalid number'
+	},
+	{
+		lang: 'ml',
+		number: '1000000000',
+		result: '1,00,00,00,000',
+		description: 'formatnum test for Malayalam'
+	},
+	{
+		lang: 'ml',
+		number: '-1000000000',
+		result: '-1,00,00,00,000',
+		description: 'formatnum test for Malayalam, negative number'
+	},
+	/*
+	 * This will fail because of wrong pattern for ml in MW(different from CLDR)
+	{
+		lang: 'ml',
+		number: '1000000000.000',
+		result: '1,00,00,00,000.000',
+		description: 'formatnum test for Malayalam with decimal place'
+	},
+	*/
+	{
+		lang: 'hi',
+		number: '123456789.123456789',
+		result: '१२,३४,५६,७८९',
+		description: 'formatnum test for Hindi'
+	},
+	{
+		lang: 'hi',
+		number: '१२,३४,५६,७८९',
+		result: '१२,३४,५६,७८९',
+		description: 'formatnum test for Hindi, Devanagari digits passed'
+	},
+	{
+		lang: 'hi',
+		number: '१२३४५६,७८९',
+		result: '123456',
+		integer: true,
+		description: 'formatnum test for Hindi, Devanagari digits passed to get integer value'
+	}
+];
+
+QUnit.test( 'formatnum', formatnumTests.length, function ( assert ) {
+	mw.messages.set( 'formatnum-msg', '{{formatnum:$1}}' );
+	mw.messages.set( 'formatnum-msg-int', '{{formatnum:$1|R}}' );
+	$.each( formatnumTests, function ( i, test ) {
+		QUnit.stop();
+		getMwLanguage( test.lang, function ( langClass ) {
+			QUnit.start();
+			if ( !langClass ) {
+				assert.ok( false, 'Language "' + test.lang + '" failed to load' );
+				return;
+			}
+			mw.messages.set(test.message );
+			mw.config.set( 'wgUserLanguage', test.lang ) ;
+			var parser = new mw.jqueryMsg.parser( { language: langClass } );
+			assert.equal(
+				parser.parse( test.integer ? 'formatnum-msg-int' : 'formatnum-msg',
+					[ test.number ] ).html(),
+				test.result,
+				test.description
+			);
+		} );
+	} );
 } );
 
+// HTML in wikitext
+QUnit.test( 'HTML', 26, function ( assert ) {
+	mw.messages.set( 'jquerymsg-italics-msg', '<i>Very</i> important' );
 
-QUnit.test( 'mw.jqueryMsg Gender', 11, function ( assert ) {
-	// TODO: These tests should be for mw.msg once mw.msg integrated with mw.jqueryMsg
-	// TODO: English may not be the best language for these tests. Use a language like Arabic or Russian
-	var user = mw.user,
-		parser = mw.jqueryMsg.getMessageFunction();
+	assertBothModes( assert, ['jquerymsg-italics-msg'], mw.messages.get( 'jquerymsg-italics-msg' ), 'Simple italics unchanged' );
 
-	// The values here are not significant,
-	// what matters is which of the values is choosen by the parser
-	mw.messages.set( 'gender-msg', '$1: {{GENDER:$2|blue|pink|green}}' );
+	mw.messages.set( 'jquerymsg-bold-msg', '<b>Strong</b> speaker' );
+	assertBothModes( assert, ['jquerymsg-bold-msg'], mw.messages.get( 'jquerymsg-bold-msg' ), 'Simple bold unchanged' );
 
-	user.options.set( 'gender', 'male' );
-	assert.equal(
-		parser( 'gender-msg', 'Bob', 'male' ),
-		'Bob: blue',
-		'Masculine from string "male"'
+	mw.messages.set( 'jquerymsg-bold-italics-msg', 'It is <b><i>key</i></b>' );
+	assertBothModes( assert, ['jquerymsg-bold-italics-msg'], mw.messages.get( 'jquerymsg-bold-italics-msg' ), 'Bold and italics nesting order preserved' );
+
+	mw.messages.set( 'jquerymsg-italics-bold-msg', 'It is <i><b>vital</b></i>' );
+	assertBothModes( assert, ['jquerymsg-italics-bold-msg'], mw.messages.get( 'jquerymsg-italics-bold-msg' ), 'Italics and bold nesting order preserved' );
+
+	mw.messages.set( 'jquerymsg-italics-with-link', 'An <i>italicized [[link|wiki-link]]</i>' );
+
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-with-link' ),
+		'An <i>italicized <a title="link" href="' + mw.html.escape( mw.util.getUrl( 'link' ) ) + '">wiki-link</i>',
+		'Italics with link inside in parse mode'
 	);
+
 	assert.equal(
-		parser( 'gender-msg', 'Bob', user ),
-		'Bob: blue',
-		'Masculine from mw.user object'
+		formatText( 'jquerymsg-italics-with-link' ),
+		mw.messages.get( 'jquerymsg-italics-with-link' ),
+		'Italics with link unchanged in text mode'
 	);
 
-	user.options.set( 'gender', 'unknown' );
-	assert.equal(
-		parser( 'gender-msg', 'Foo', user ),
-		'Foo: green',
-		'Neutral from mw.user object' );
-	assert.equal(
-		parser( 'gender-msg', 'Alice', 'female' ),
-		'Alice: pink',
-		'Feminine from string "female"' );
-	assert.equal(
-		parser( 'gender-msg', 'User' ),
-		'User: green',
-		'Neutral when no parameter given' );
-	assert.equal(
-		parser( 'gender-msg', 'User', 'unknown' ),
-		'User: green',
-		'Neutral from string "unknown"'
+	mw.messages.set( 'jquerymsg-italics-id-class', '<i id="foo" class="bar">Foo</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-id-class' ),
+		mw.messages.get( 'jquerymsg-italics-id-class' ),
+		'ID and class are allowed'
 	);
 
-	mw.messages.set( 'gender-msg-one-form', '{{GENDER:$1|User}}: $2 {{PLURAL:$2|edit|edits}}' );
+	mw.messages.set( 'jquerymsg-italics-onclick', '<i onclick="alert(\'foo\')">Foo</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-onclick' ),
+		'&lt;i onclick=&quot;alert(\'foo\')&quot;&gt;Foo&lt;/i&gt;',
+		'element with onclick is escaped because it is not allowed'
+	);
 
-	assert.equal(
-		parser( 'gender-msg-one-form', 'male', 10 ),
-		'User: 10 edits',
-		'Gender neutral and plural form'
+	mw.messages.set( 'jquerymsg-script-msg', '<script  >alert( "Who put this tag here?" );</script>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-msg' ),
+		'&lt;script  &gt;alert( &quot;Who put this tag here?&quot; );&lt;/script&gt;',
+		'Tag outside whitelist escaped in parse mode'
 	);
+
 	assert.equal(
-		parser( 'gender-msg-one-form', 'female', 1 ),
-		'User: 1 edit',
-		'Gender neutral and singular form'
+		formatText( 'jquerymsg-script-msg' ),
+		mw.messages.get( 'jquerymsg-script-msg' ),
+		'Tag outside whitelist unchanged in text mode'
 	);
 
-	mw.messages.set( 'gender-msg-lowercase', '{{gender:$1|he|she}} is awesome' );
-	assert.equal(
-		parser( 'gender-msg-lowercase', 'male' ),
-		'he is awesome',
-		'Gender masculine'
+	mw.messages.set( 'jquerymsg-script-link-msg', '<script>[[Foo|bar]]</script>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-link-msg' ),
+		'&lt;script&gt;<a title="Foo" href="' + mw.html.escape( mw.util.getUrl( 'Foo' ) ) + '">bar</a>&lt;/script&gt;',
+		'Script tag text is escaped because that element is not allowed, but link inside is still HTML'
+	);
+
+	mw.messages.set( 'jquerymsg-mismatched-html', '<i class="important">test</b>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-mismatched-html' ),
+		'&lt;i class=&quot;important&quot;&gt;test&lt;/b&gt;',
+		'Mismatched HTML start and end tag treated as text'
 	);
+
+	// TODO (mattflaschen, 2013-03-18): It's not a security issue, but there's no real
+	// reason the htmlEmitter span needs to be here. It's an artifact of how emitting works.
+	mw.messages.set( 'jquerymsg-script-and-external-link', '<script>alert( "jquerymsg-script-and-external-link test" );</script> [http://example.com <i>Foo</i> bar]' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-and-external-link' ),
+		'&lt;script&gt;alert( "jquerymsg-script-and-external-link test" );&lt;/script&gt; <a href="http://example.com"><span class="mediaWiki_htmlEmitter"><i>Foo</i> bar</span></a>',
+		'HTML tags in external links not interfering with escaping of other tags'
+	);
+
+	mw.messages.set( 'jquerymsg-link-script', '[http://example.com <script>alert( "jquerymsg-link-script test" );</script>]' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-link-script' ),
+		'<a href="http://example.com"><span class="mediaWiki_htmlEmitter">&lt;script&gt;alert( "jquerymsg-link-script test" );&lt;/script&gt;</span></a>',
+		'Non-whitelisted HTML tag in external link anchor treated as text'
+	);
+
+	// Intentionally not using htmlEqual for the quote tests
+	mw.messages.set( 'jquerymsg-double-quotes-preserved', '<i id="double">Double</i>' );
 	assert.equal(
-		parser( 'gender-msg-lowercase', 'female' ),
-		'she is awesome',
-		'Gender feminine'
+		formatParse( 'jquerymsg-double-quotes-preserved' ),
+		mw.messages.get( 'jquerymsg-double-quotes-preserved' ),
+		'Attributes with double quotes are preserved as such'
 	);
 
-	mw.messages.set( 'gender-msg-wrong', '{{gender}} test' );
+	mw.messages.set( 'jquerymsg-single-quotes-normalized-to-double', '<i id=\'single\'>Single</i>' );
 	assert.equal(
-		parser( 'gender-msg-wrong', 'female' ),
-		' test',
-		'Invalid syntax should result in {{gender}} simply being stripped away'
+		formatParse( 'jquerymsg-single-quotes-normalized-to-double' ),
+		'<i id="single">Single</i>',
+		'Attributes with single quotes are normalized to double'
 	);
-} );
 
+	mw.messages.set( 'jquerymsg-escaped-double-quotes-attribute', '<i style="font-family:&quot;Arial&quot;">Styled</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-escaped-double-quotes-attribute' ),
+		mw.messages.get( 'jquerymsg-escaped-double-quotes-attribute' ),
+		'Escaped attributes are parsed correctly'
+	);
+
+	mw.messages.set( 'jquerymsg-escaped-single-quotes-attribute', '<i style=\'font-family:&#039;Arial&#039;\'>Styled</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-escaped-single-quotes-attribute' ),
+		mw.messages.get( 'jquerymsg-escaped-single-quotes-attribute' ),
+		'Escaped attributes are parsed correctly'
+	);
 
-QUnit.test( 'mw.jqueryMsg Grammar', 2, function ( assert ) {
-	var parser = mw.jqueryMsg.getMessageFunction();
 
-	// Assume the grammar form grammar_case_foo is not valid in any language
-	mw.messages.set( 'grammar-msg', 'Przeszukaj {{GRAMMAR:grammar_case_foo|{{SITENAME}}}}' );
-	assert.equal( parser( 'grammar-msg' ), 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'Grammar Test with sitename' );
+	mw.messages.set( 'jquerymsg-wikitext-contents-parsed', '<i>[http://example.com Example]</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-wikitext-contents-parsed' ),
+		'<i><a href="http://example.com">Example</a></i>',
+		'Contents of valid tag are treated as wikitext, so external link is parsed'
+	);
 
-	mw.messages.set( 'grammar-msg-wrong-syntax', 'Przeszukaj {{GRAMMAR:grammar_case_xyz}}' );
-	assert.equal( parser( 'grammar-msg-wrong-syntax' ), 'Przeszukaj ' , 'Grammar Test with wrong grammar template syntax' );
+	mw.messages.set( 'jquerymsg-wikitext-contents-script', '<i><script>Script inside</script></i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-wikitext-contents-script' ),
+		'<i><span class="mediaWiki_htmlEmitter">&lt;script&gt;Script inside&lt;/script&gt;</span></i>',
+		'Contents of valid tag are treated as wikitext, so invalid HTML element is treated as text'
+	);
+
+	mw.messages.set( 'jquerymsg-unclosed-tag', 'Foo<tag>bar' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-unclosed-tag' ),
+		'Foo&lt;tag&gt;bar',
+		'Nonsupported unclosed tags are escaped'
+	);
+
+	mw.messages.set( 'jquerymsg-self-closing-tag', 'Foo<tag/>bar' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-self-closing-tag' ),
+		'Foo&lt;tag/&gt;bar',
+		'Self-closing tags don\'t cause a parse error'
+	);
 } );
+
+}( mediaWiki, jQuery ) );