From: Prateek Saxena <prtksxna@gmail.com>
Date: Mon, 12 Oct 2015 15:39:17 +0000 (+0530)
Subject: mw.Upload.BookletLayout: Use appropriate messages for warnings
X-Git-Tag: 1.31.0-rc.0~9429
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=e30863f709599885363ad765ebbe0973ae249a3c;p=lhc%2Fweb%2Fwiklou.git

mw.Upload.BookletLayout: Use appropriate messages for warnings

...and properly handle the 'page-exists' warning.

Bug: T115056
Change-Id: I5c393ee034e100d4fa415e7e215920d8af465a78
---

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 05afbe3329..98abaf66fc 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -285,14 +285,21 @@
 			} else if ( warnings.exists !== undefined ) {
 				return new OO.ui.Error(
 					$( '<p>' ).html(
-						mw.message( 'filepageexists', warnings.exists ).parse()
+						mw.message( 'fileexists', 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()
 					),
 					{ recoverable: false }
 				);
 			} else if ( warnings.duplicate !== undefined ) {
 				return new OO.ui.Error(
 					$( '<p>' ).html(
-						mw.message( 'fileexists', warnings.duplicate[ 0 ] ).parse()
+						mw.message( 'api-error-duplicate', warnings.duplicate[ 0 ] ).parse()
 					),
 					{ recoverable: false }
 				);