From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 12 Oct 2015 18:48:54 +0000 (+0200)
Subject: mw.Upload.BookletLayout: Correct some message parameters
X-Git-Tag: 1.31.0-rc.0~9428
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=ffd100df378f76efeb054e1b103029a86414a931;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 98abaf66fc..496904f35a 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 }
 				);