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

diff --combined resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 496904f,4cb956b..7b307ee
--- 1/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
--- 2/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@@ -259,6 -259,19 +259,19 @@@
                        warnings = stateDetails.upload && stateDetails.upload.warnings;
  
                if ( state === mw.Upload.State.ERROR ) {
+                       // HACK We should either have a hook here to allow TitleBlacklist to handle this, or just have
+                       // TitleBlacklist produce sane error messages that can be displayed without arcane knowledge
+                       if ( error.info === 'TitleBlacklist prevents this title from being created' ) {
+                               // HACK Apparently the only reliable way to determine whether TitleBlacklist was involved
+                               return new OO.ui.Error(
+                                       $( '<p>' ).html(
+                                               // HACK TitleBlacklist doesn't have a sensible message, this one is from UploadWizard
+                                               mw.message( 'api-error-blacklisted' ).parse()
+                                       ),
+                                       { recoverable: false }
+                               );
+                       }
+ 
                        message = mw.message( 'api-error-' + error.code );
                        if ( !message.exists() ) {
                                message = mw.message( 'api-error-unknownerror', JSON.stringify( stateDetails ) );
@@@ -285,21 -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 }
                                );
@@@ -320,7 -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 }
                                );