jenkins-bot has submitted this change and it was merged.
Change subject: mw.Upload.BookletLayout: Correct some message parameters
......................................................................
mw.Upload.BookletLayout: Correct some message parameters
* 'fileexists', 'filepageexists': Requires prefixed page name.
* 'api-error-duplicate', 'api-error-duplicate-archive': Takes the
number of duplicates, not name of duplicate. The list of duplicates
is supposed to follow this message.
Change-Id: Idfa978469f4a99526100f6c24a67bf18abf7ec89
---
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 98abaf6..496904f 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -285,21 +285,21 @@
} else if ( warnings.exists !== undefined ) {
return new OO.ui.Error(
$( '<p>' ).html(
- mw.message( 'fileexists',
warnings.exists ).parse()
+ mw.message( 'fileexists',
'File:' + warnings.exists ).parse()
),
{ recoverable: false }
);
} else if ( warnings[ 'page-exists' ] !== undefined ) {
return new OO.ui.Error(
$( '<p>' ).html(
- mw.message( 'filepageexists',
warnings[ 'page-exists' ] ).parse()
+ mw.message( 'filepageexists',
'File:' + warnings[ 'page-exists' ] ).parse()
),
{ recoverable: false }
);
} else if ( warnings.duplicate !== undefined ) {
return new OO.ui.Error(
$( '<p>' ).html(
- mw.message(
'api-error-duplicate', warnings.duplicate[ 0 ] ).parse()
+ mw.message(
'api-error-duplicate', warnings.duplicate.length ).parse()
),
{ recoverable: false }
);
@@ -320,7 +320,7 @@
} else if ( warnings[ 'duplicate-archive' ] !==
undefined ) {
return new OO.ui.Error(
$( '<p>' ).html(
- mw.message(
'api-error-duplicate-archive', warnings[ 'duplicate-archive' ] ).parse()
+ mw.message(
'api-error-duplicate-archive', 1 ).parse()
),
{ recoverable: false }
);
--
To view, visit https://gerrit.wikimedia.org/r/245512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfa978469f4a99526100f6c24a67bf18abf7ec89
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
