X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.Upload.BookletLayout.js;h=3ade332c88bf6fcf88d516e4db449e04f99e0070;hb=d19826aa35b206847a568a4b2c1c9ffaa615fca5;hp=3fcbb3f460eade3b8dd18b34a9e073c44196f328;hpb=d199da516c7ae96e0d52b9287db333d40d440b7a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 3fcbb3f460..3ade332c88 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -330,13 +330,26 @@
 			stateDetails = this.upload.getStateDetails(),
 			error = stateDetails.errors ? stateDetails.errors[ 0 ] : false,
 			warnings = stateDetails.upload && stateDetails.upload.warnings,
-			$ul = $( '<ul>' );
+			$ul = $( '<ul>' ),
+			errorText;
 
 		if ( state === mw.Upload.State.ERROR ) {
 			if ( !error ) {
+				if ( stateDetails.textStatus === 'timeout' ) {
+					// in case of $.ajax.fail(), there is no response json
+					errorText = mw.message( 'apierror-timeout' ).parse();
+				} else if ( stateDetails.xhr && stateDetails.xhr.status === 0 ) {
+					// failed to even connect to server
+					errorText = mw.message( 'apierror-offline' ).parse();
+				} else if ( stateDetails.textStatus ) {
+					errorText = stateDetails.textStatus;
+				} else {
+					errorText = mw.message( 'apierror-unknownerror', JSON.stringify( stateDetails ) ).parse();
+				}
+
 				// If there's an 'exception' key, this might be a timeout, or other connection problem
 				return $.Deferred().resolve( new OO.ui.Error(
-					$( '<p>' ).msg( 'apierror-unknownerror', JSON.stringify( stateDetails ) ),
+					$( '<p>' ).html( errorText ),
 					{ recoverable: false }
 				) );
 			}
@@ -518,11 +531,10 @@
 			required: true,
 			validate: /.+/
 		} );
-		this.descriptionWidget = new OO.ui.TextInputWidget( {
+		this.descriptionWidget = new OO.ui.MultilineTextInputWidget( {
 			indicator: 'required',
 			required: true,
 			validate: /\S+/,
-			multiline: true,
 			autosize: true
 		} );