From cca0a757fefc8e6e79081172d07d88fe5918207e Mon Sep 17 00:00:00 2001 From: rakekniven <2069590+rakekniven@users.noreply.github.com> Date: Fri, 23 May 2025 07:27:48 +0200 Subject: [PATCH 1/4] chore(18n): More natural english Reported at Transifex. Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> --- apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php index 8e6448f91d4..4b3d6f7c7ac 100644 --- a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php +++ b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php @@ -55,9 +55,9 @@ class TaskProcessingPickupSpeed implements ISetupCheck { } if ($slowCount / $taskCount < self::MAX_SLOW_PERCENTAGE) { - return SetupResult::success($this->l10n->t('Task pickup speed is ok in the last {hours} hours.', ['hours' => self::TIME_SPAN])); + return SetupResult::success($this->l10n->t('the task pickup speed has been ok in the last {hours} hours.', ['hours' => self::TIME_SPAN])); } else { - return SetupResult::warning($this->l10n->t('Task pickup speed is slow in the last {hours} hours. Many tasks took longer than 4 min to get picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed'); + return SetupResult::warning($this->l10n->t('The task pickup speed has been slow in the last {hours} hours. Many tasks took longer than 4 minutes to be picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed'); } } } From 8be6518e0c947fa478b7cbba2be06638c13450d5 Mon Sep 17 00:00:00 2001 From: rakekniven <2069590+rakekniven@users.noreply.github.com> Date: Fri, 23 May 2025 07:28:36 +0200 Subject: [PATCH 2/4] fix(SetupChecks): Update TaskProcessingPickupSpeed Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> --- apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php index 4b3d6f7c7ac..67f8937758f 100644 --- a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php +++ b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php @@ -55,7 +55,7 @@ class TaskProcessingPickupSpeed implements ISetupCheck { } if ($slowCount / $taskCount < self::MAX_SLOW_PERCENTAGE) { - return SetupResult::success($this->l10n->t('the task pickup speed has been ok in the last {hours} hours.', ['hours' => self::TIME_SPAN])); + return SetupResult::success($this->l10n->t('The task pickup speed has been ok in the last {hours} hours.', ['hours' => self::TIME_SPAN])); } else { return SetupResult::warning($this->l10n->t('The task pickup speed has been slow in the last {hours} hours. Many tasks took longer than 4 minutes to be picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed'); } From 1afc1805c4c7d808703f98df5d85f018b2202ddf Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Fri, 23 May 2025 09:34:28 +0200 Subject: [PATCH 3/4] fix: Correct translation method use Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Signed-off-by: Marcel Klehr --- apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php index 67f8937758f..ab97b58bd04 100644 --- a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php +++ b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php @@ -55,9 +55,9 @@ class TaskProcessingPickupSpeed implements ISetupCheck { } if ($slowCount / $taskCount < self::MAX_SLOW_PERCENTAGE) { - return SetupResult::success($this->l10n->t('The task pickup speed has been ok in the last {hours} hours.', ['hours' => self::TIME_SPAN])); + return SetupResult::success($this->l10n->n('The task pickup speed has been ok in the last %n hour.', 'The task pickup speed has been ok in the last %n hours.', self::TIME_SPAN)); } else { - return SetupResult::warning($this->l10n->t('The task pickup speed has been slow in the last {hours} hours. Many tasks took longer than 4 minutes to be picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed'); + return SetupResult::warning($this->l10n->n('The task pickup speed has been slow in the last %n hour. Many tasks took longer than 4 minutes to be picked up. Consider setting up a worker to process tasks in the background.', 'The task pickup speed has been slow in the last %n hours. Many tasks took longer than 4 minutes to be picked up. Consider setting up a worker to process tasks in the background.', self::TIME_SPAN), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed'); } } } From e064af31495e8204f5689c1086664c0d9d1355b6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 23 May 2025 09:56:15 +0200 Subject: [PATCH 4/4] fix(l10n): Fix one more plural Signed-off-by: Joas Schilling --- apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php index ab97b58bd04..4fb2b10cf33 100644 --- a/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php +++ b/apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php @@ -38,7 +38,7 @@ class TaskProcessingPickupSpeed implements ISetupCheck { $tasks = $this->taskProcessingManager->getTasks(userId: '', scheduleAfter: $this->timeFactory->now()->getTimestamp() - 60 * 60 * self::TIME_SPAN); // userId: '' means no filter, whereas null would mean guest $taskCount = count($tasks); if ($taskCount === 0) { - return SetupResult::success($this->l10n->t('No scheduled tasks in the last {hours} hours.', ['hours' => self::TIME_SPAN])); + return SetupResult::success($this->l10n->n('No scheduled tasks in the last %n hours.', 'No scheduled tasks in the last %n hours.', self::TIME_SPAN)); } $slowCount = 0; foreach ($tasks as $task) {