From e30863f709599885363ad765ebbe0973ae249a3c Mon Sep 17 00:00:00 2001
From: Prateek Saxena <prtksxna@gmail.com>
Date: Mon, 12 Oct 2015 21:09:17 +0530
Subject: [PATCH] mw.Upload.BookletLayout: Use appropriate messages for
 warnings

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

Bug: T115056
Change-Id: I5c393ee034e100d4fa415e7e215920d8af465a78
---
 .../src/mediawiki/mediawiki.Upload.BookletLayout.js   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 }
 				);
-- 
2.20.1