Use $foo.msg( 'bar' ) rather than $foo.html( mw.message( 'bar' ).parse() )

This is a rarely used, but well-documented and convenient feature of
jqueryMsg. (Rarely used in core, at least, I only found one use in
'mediawiki.action.edit.preview'; UploadWizard uses it all over).

Usages found with: \.(append|html)\(\s*mw\.(message)

Change-Id: Id555ba0d23b63dfaf46a401f88b70ded9c6c3bc4

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 4ce2c1a..7401445 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -294,51 +294,37 @@
                        // won't help the fact that the file already exists.
                        if ( warnings.stashfailed !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'api-error-stashfailed' ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'api-error-stashfailed' ),
                                        { recoverable: false }
                                );
                        } else if ( warnings.exists !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'fileexists', 'File:' + warnings.exists ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'fileexists', 'File:' + warnings.exists ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'page-exists' ] !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'filepageexists', 'File:' + warnings[ 'page-exists' ] ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'filepageexists', 'File:' + warnings[ 'page-exists' ] ),
                                        { recoverable: false }
                                );
                        } else if ( warnings.duplicate !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'api-error-duplicate', warnings.duplicate.length ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'api-error-duplicate', warnings.duplicate.length ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'thumb-name' ] !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'filename-thumb-name' ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'filename-thumb-name' ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'bad-prefix' ] !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'filename-bad-prefix', warnings[ 'bad-prefix' ] ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'filename-bad-prefix', warnings[ 'bad-prefix' ] ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'duplicate-archive' ] !== undefined ) {
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'api-error-duplicate-archive', 1 ).parse()
-                                       ),
+                                       $( '<p>' ).msg( 'api-error-duplicate-archive', 1 ),
                                        { recoverable: false }
                                );
                        } else if ( warnings.badfilename !== undefined ) {
@@ -346,9 +332,7 @@
                                // TODO This might not really be the best place to do this
                                this.filenameWidget.setValue( warnings.badfilename );
                                return new OO.ui.Error(
-                                       $( '<p>' ).html(
-                                               mw.message( 'badfilename', warnings.badfilename ).parse()
-                                       )
+                                       $( '<p>' ).msg( 'badfilename', warnings.badfilename )
                                );
                        } else {
                                return new OO.ui.Error(

diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index 68818be..ebf0e7d 100644 (file)
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -98,16 +98,13 @@
                        case 'submitted':
                                dialogConfig = {
                                        title: mw.msg( 'feedback-thanks-title' ),
-                                       message: $( '<span>' ).append(
-                                               mw.message(
-                                                       'feedback-thanks',
-                                                       this.feedbackPageTitle.getNameText(),
-                                                       $( '<a>' )
-                                                               .attr( {
-                                                                       target: '_blank',
-                                                                       href: this.feedbackPageTitle.getUrl()
-                                                               } )
-                                               ).parse()
+                                       message: $( '<span>' ).msg(
+                                               'feedback-thanks',
+                                               this.feedbackPageTitle.getNameText(),
+                                               $( '<a>' ).attr( {
+                                                       target: '_blank',
+                                                       href: this.feedbackPageTitle.getUrl()
+                                               } )
                                        ),
                                        actions: [
                                                {