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 05afbe3..98abaf6 100644 (file)
--- 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 }
                                );