Merge "Make NumericUppercaseCollation use localized digit transforms"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.Upload.BookletLayout.js

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 31e4492..100714a 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -1,4 +1,4 @@
-/*global moment*/
+/* global moment*/
 ( function ( $, mw, moment ) {
 
        /**
@@ -345,15 +345,18 @@
                        if ( error.message ) {
                                return this.upload.getApi()
                                        .then( function ( api ) {
-                                               return api.loadMessagesIfMissing( [ error.message.key ] ).then( function () {
-                                                       if ( !mw.message( error.message.key ).exists() ) {
-                                                               return $.Deferred().reject();
-                                                       }
-                                                       return new OO.ui.Error(
-                                                               $( '<p>' ).msg( error.message.key, error.message.params || [] ),
-                                                               { recoverable: false }
-                                                       );
-                                               } );
+                                               // 'amenableparser' will expand templates and parser functions server-side.
+                                               // We still do the rest of wikitext parsing here (through jqueryMsg).
+                                               return api.loadMessagesIfMissing( [ error.message.key ], { amenableparser: true } )
+                                                       .then( function () {
+                                                               if ( !mw.message( error.message.key ).exists() ) {
+                                                                       return $.Deferred().reject();
+                                                               }
+                                                               return new OO.ui.Error(
+                                                                       $( '<p>' ).msg( error.message.key, error.message.params || [] ),
+                                                                       { recoverable: false }
+                                                               );
+                                                       } );
                                        } )
                                        .then( null, function () {
                                                // We failed when loading the error message, or it doesn't actually exist, fall back