Merge pull request #1883 from nextcloud/downstream-26145

Storage 503 message improvements

3 files changed, 7 insertions, 7 deletions

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index bb95f124dab..2cd09765435 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -79,12 +79,12 @@ try {
 	OCP\JSON::success(array('data' => $data));
 } catch (\OCP\Files\StorageNotAvailableException $e) {
 	\OCP\Util::logException('files', $e);
-	OCP\JSON::error(array(
-		'data' => array(
+	OCP\JSON::error([
+		'data' => [
 			'exception' => '\OCP\Files\StorageNotAvailableException',
-			'message' => $l->t('Storage not available')
-		)
-	));
+			'message' => $l->t('Storage is temporarily not available')
+		]
+	]);
 } catch (\OCP\Files\StorageInvalidException $e) {
 	\OCP\Util::logException('files', $e);
 	OCP\JSON::error(array(
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e728a816cc0..bf4fd75d4cc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1625,7 +1625,7 @@
 					this.changeDirectory('/');
 					// TODO: read error message from exception
 					OC.Notification.showTemporary(
-						t('files', 'Storage not available')
+						t('files', 'Storage is temporarily not available')
 					);
 				}
 				return false;
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 1c73bc845c5..3b0e0b83b82 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2836,7 +2836,7 @@ describe('OCA.Files.FileList tests', function() {
 		});
 		it('redirects to root folder and shows notification in case of storage not available', function () {
 			expect(notificationStub.notCalled).toEqual(true);
-			deferredList.reject(503, 'Storage not available');
+			deferredList.reject(503, 'Storage is temporarily not available');
 
 			expect(fileList.getCurrentDirectory()).toEqual('/');
 			expect(getFolderContentsStub.calledTwice).toEqual(true);