From e7a848b7df01a26024ca83fac3ea6c5418873621 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@bachhuber.co>
Date: Wed, 20 Jun 2018 05:02:42 -0700
Subject: [PATCH 1/2] Display server error message when one exists

---
 utils/mediaupload.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/utils/mediaupload.js b/utils/mediaupload.js
index 02b76603b9573..555dcb92b286d 100644
--- a/utils/mediaupload.js
+++ b/utils/mediaupload.js
@@ -1,7 +1,7 @@
 /**
  * External Dependencies
  */
-import { compact, forEach, get, includes, noop, startsWith } from 'lodash';
+import { compact, forEach, get, includes, isEmpty, noop, startsWith } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -97,15 +97,19 @@ export function mediaUpload( {
 				};
 				setAndUpdateFiles( idx, mediaObject );
 			},
-			() => {
+			( response ) => {
 				// Reset to empty on failure.
 				setAndUpdateFiles( idx, null );
+				let message = sprintf(
+					__( 'Error while uploading file %s to the media library.' ),
+					mediaFile.name
+				);
+				if ( ! isEmpty( response.responseJSON.message ) ) {
+					message = response.responseJSON.message;
+				}
 				onError( {
 					code: 'GENERAL',
-					message: sprintf(
-						__( 'Error while uploading file %s to the media library.' ),
-						mediaFile.name
-					),
+					message,
 					file: mediaFile,
 				} );
 			}

From 94ca1b7ac4fa294acf832f05e1c08529bcb241d6 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@bachhuber.co>
Date: Wed, 20 Jun 2018 05:11:46 -0700
Subject: [PATCH 2/2] Avoid `sprintf()` unless it's necessary

---
 utils/mediaupload.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/mediaupload.js b/utils/mediaupload.js
index 555dcb92b286d..c1171eec69230 100644
--- a/utils/mediaupload.js
+++ b/utils/mediaupload.js
@@ -100,12 +100,14 @@ export function mediaUpload( {
 			( response ) => {
 				// Reset to empty on failure.
 				setAndUpdateFiles( idx, null );
-				let message = sprintf(
-					__( 'Error while uploading file %s to the media library.' ),
-					mediaFile.name
-				);
+				let message;
 				if ( ! isEmpty( response.responseJSON.message ) ) {
 					message = response.responseJSON.message;
+				} else {
+					message = sprintf(
+						__( 'Error while uploading file %s to the media library.' ),
+						mediaFile.name
+					);
 				}
 				onError( {
 					code: 'GENERAL',