1 files changed, 21 insertions, 6 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 11d159f15d1..42f7f14bbdd 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -68,12 +68,24 @@ if (OC::checkUpgrade(false)) {
 	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
 	});
+	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Updating database schema'));
+	});
 	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Updated database'));
 	});
+	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+	});
 	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Checked database schema update'));
 	});
+	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
+	});
+	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+	});
 	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
 	});
@@ -112,15 +124,18 @@ if (OC::checkUpgrade(false)) {
 		exit();
 	}
 
-	if (!empty($incompatibleApps)) {
-		$eventSource->send('notice',
-			(string)$l->t('Following incompatible apps have been disabled: %s', implode(', ', $incompatibleApps)));
+	$disabledApps = [];
+	foreach ($disabledThirdPartyApps as $app) {
+		$disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]);
 	}
-	if (!empty($disabledThirdPartyApps)) {
-		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
+	foreach ($incompatibleApps as $app) {
+		$disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
 	}
 
+	if (!empty($disabledApps)) {
+		$eventSource->send('notice',
+			(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledApps)));
+	}
 } else {
 	$eventSource->send('notice', (string)$l->t('Already up to date'));
 }