From 927821e36392861737e3f3fe90af122251f3c579 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:21:33 +0100 Subject: [PATCH 1/2] l10n: Change admin to administrator Spelling unification. Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- apps/theming/lib/Migration/MigrateAdminConfig.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/theming/lib/Migration/MigrateAdminConfig.php b/apps/theming/lib/Migration/MigrateAdminConfig.php index 392b014474e..6b1beb500ac 100644 --- a/apps/theming/lib/Migration/MigrateAdminConfig.php +++ b/apps/theming/lib/Migration/MigrateAdminConfig.php @@ -47,11 +47,11 @@ class MigrateAdminConfig implements IRepairStep { } public function getName(): string { - return $this->l10n->t('Failed to clean up the old admin theming images folder'); + return $this->l10n->t('Failed to clean up the old administrator theming images folder'); } public function run(IOutput $output): void { - $output->info('Migrating admin images'); + $output->info('Migrating administrator images'); $this->migrateAdminImages($output); $this->cleanupAdminImages($output); } @@ -59,7 +59,7 @@ class MigrateAdminConfig implements IRepairStep { private function migrateAdminImages(IOutput $output): void { try { $images = $this->appData->getFolder('images'); - $output->info('Migrating admin images'); + $output->info('Migrating administrator images'); // get or init the global folder if any try { @@ -84,7 +84,7 @@ class MigrateAdminConfig implements IRepairStep { $output->finishProgress(); } catch(NotFoundException $e) { - $output->info('No admin images to migrate'); + $output->info('No administrator images to migrate'); } } @@ -95,7 +95,7 @@ class MigrateAdminConfig implements IRepairStep { $images->delete(); } catch (NotFoundException $e) { } catch (Throwable $e) { - $output->warning($this->l10n->t('Failed to cleanup the old admin image folder', [$e->getMessage()])); + $output->warning($this->l10n->t('Failed to cleanup the old administrator image folder', [$e->getMessage()])); } } } From 928f62610b4fc58b6706b188c4b2bbbc9f8e39b2 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:40:29 +0100 Subject: [PATCH 2/2] l10n: Change administrator to administration Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- apps/theming/lib/Migration/MigrateAdminConfig.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/theming/lib/Migration/MigrateAdminConfig.php b/apps/theming/lib/Migration/MigrateAdminConfig.php index 6b1beb500ac..913b29f0061 100644 --- a/apps/theming/lib/Migration/MigrateAdminConfig.php +++ b/apps/theming/lib/Migration/MigrateAdminConfig.php @@ -47,11 +47,11 @@ class MigrateAdminConfig implements IRepairStep { } public function getName(): string { - return $this->l10n->t('Failed to clean up the old administrator theming images folder'); + return $this->l10n->t('Failed to clean up the old administration theming images folder'); } public function run(IOutput $output): void { - $output->info('Migrating administrator images'); + $output->info('Migrating administration images'); $this->migrateAdminImages($output); $this->cleanupAdminImages($output); } @@ -59,7 +59,7 @@ class MigrateAdminConfig implements IRepairStep { private function migrateAdminImages(IOutput $output): void { try { $images = $this->appData->getFolder('images'); - $output->info('Migrating administrator images'); + $output->info('Migrating administration images'); // get or init the global folder if any try { @@ -84,7 +84,7 @@ class MigrateAdminConfig implements IRepairStep { $output->finishProgress(); } catch(NotFoundException $e) { - $output->info('No administrator images to migrate'); + $output->info('No administration images to migrate'); } } @@ -95,7 +95,7 @@ class MigrateAdminConfig implements IRepairStep { $images->delete(); } catch (NotFoundException $e) { } catch (Throwable $e) { - $output->warning($this->l10n->t('Failed to cleanup the old administrator image folder', [$e->getMessage()])); + $output->warning($this->l10n->t('Failed to cleanup the old administration image folder', [$e->getMessage()])); } } }