From 6e5a307757cf686209dd6b0a605c97e08cf04be0 Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 9 May 2023 10:56:02 +0200 Subject: [PATCH 1/2] adjust wording for update hint when files of a specific app are not there Signed-off-by: Simon L --- lib/base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/base.php b/lib/base.php index 119e89f6ae0bf..cca17fc1eae94 100644 --- a/lib/base.php +++ b/lib/base.php @@ -394,8 +394,8 @@ private static function printUpgradePage(\OC\SystemConfig $systemConfig): void { if (!empty($incompatibleShippedApps)) { $l = Server::get(\OCP\L10N\IFactory::class)->get('core'); - $hint = $l->t('The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]); - throw new \OCP\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint); + $hint = $l->t('The files of the app %1$s were not replaced correctly or are not existing in the first place. Make sure to add a version of the app that is compatible with the server.', [implode(', ', $incompatibleShippedApps)]); + throw new \OCP\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly or are not existing in the first place. Make sure to add a version of the app that is compatible with the server.', $hint); } $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion)); From 84b88c01c78f7d6a6c0670d0dcf1c79664337ed7 Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 9 May 2023 11:19:48 +0200 Subject: [PATCH 2/2] adjust wording Signed-off-by: Simon L --- lib/base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/base.php b/lib/base.php index cca17fc1eae94..c7fde4136fef3 100644 --- a/lib/base.php +++ b/lib/base.php @@ -394,8 +394,8 @@ private static function printUpgradePage(\OC\SystemConfig $systemConfig): void { if (!empty($incompatibleShippedApps)) { $l = Server::get(\OCP\L10N\IFactory::class)->get('core'); - $hint = $l->t('The files of the app %1$s were not replaced correctly or are not existing in the first place. Make sure to add a version of the app that is compatible with the server.', [implode(', ', $incompatibleShippedApps)]); - throw new \OCP\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly or are not existing in the first place. Make sure to add a version of the app that is compatible with the server.', $hint); + $hint = $l->t('Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory.', [implode(', ', $incompatibleShippedApps)]); + throw new \OCP\HintException('Application ' . implode(', ', $incompatibleShippedApps) . ' is not present or has a non-compatible version with this server. Please check the apps directory.', $hint); } $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));