Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308270
Change subject: mw.Upload.BookletLayout: Use 'amenableparser' to handle
templates in error messages
......................................................................
mw.Upload.BookletLayout: Use 'amenableparser' to handle templates in error
messages
Depends-On: I7e1a52a59a25befe4edb7b4f531d60a2615e8f90
Bug: T144237
Change-Id: I022e1f178c5a10c440f7fddc73709a4e262c5801
(cherry picked from commit 33041b752d7c2638ba5a08668a16ea13f7db96b1)
---
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
1 file changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/308270/1
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 31e4492..920835f 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -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 (throught 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
--
To view, visit https://gerrit.wikimedia.org/r/308270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I022e1f178c5a10c440f7fddc73709a4e262c5801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.17
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
