From d9670f61a9fea550706e4529eab15aa34af6ad54 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Thu, 29 Dec 2011 09:29:07 +0000 Subject: [PATCH] Use jqueryMsg wikitext parser to parse interface messages at client side. Support for PLURAL in javascript. --- RELEASE-NOTES-1.19 | 2 ++ resources/Resources.php | 1 + resources/mediawiki/mediawiki.js | 11 +++-------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index c75295d115..0eb0c6b011 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -110,6 +110,8 @@ production. * Added $wgSend404Code, true by default, which can be set to false to send a 200 status code instead of 404 for nonexistent articles. * (bug 23427) Introduced {{PAGEID}} variable to expose page.page_id +* Use jqueryMsg wikitext parser to parse interface messages at client side. + Support for PLURAL in javascript. === Bug fixes in 1.19 === * $wgUploadNavigationUrl should be used for file redlinks if. diff --git a/resources/Resources.php b/resources/Resources.php index 8edbc24b64..e13a0e8592 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -706,6 +706,7 @@ return array( 'jquery.placeholder', 'jquery.mw-jump', 'mediawiki.util', + 'mediawiki.jqueryMsg' ), ), 'mediawiki.page.startup' => array( diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index c9bcdec386..bb6cb85677 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -158,14 +158,9 @@ var mw = ( function ( $, undefined ) { } return '<' + this.key + '>'; } - var text = this.map.get( this.key ), - parameters = this.parameters; - - text = text.replace( /\$(\d+)/g, function ( str, match ) { - var index = parseInt( match, 10 ) - 1; - return parameters[index] !== undefined ? parameters[index] : '$' + match; - } ); - + + var text = mw.jqueryMsg.getMessageFunction( )( this.key, this.parameters ); + if ( this.format === 'plain' ) { return text; } -- 2.20.1