Merge "mediawiki.Upload.BookletLayout: Handle errors from TitleBlacklist (HACK)"

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 4cb956b..7b307ee 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -298,14 +298,21 @@
                        } else if ( warnings.exists !== undefined ) {
                                return new OO.ui.Error(
                                        $( '<p>' ).html(
-                                               mw.message( 'filepageexists', 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', 'File:' + 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.length ).parse()
                                        ),
                                        { recoverable: false }
                                );
@@ -326,7 +333,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 }
                                );