From 109774d607a2a24a7f567848a62522deba85629c Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Mon, 18 Jul 2022 10:55:49 +0200 Subject: [PATCH] fix wording --- lang/fr_FR.UTF-8/LC_MESSAGES/messages.po | 18 +++++++++--------- .../Repository/UpdateLockerException.php | 2 +- .../UpdateVersions/UpdateVersionsException.php | 8 ++++---- .../DatabaseRequirementException.php | 4 ++-- .../DatabaseRequirementValidator.php | 2 +- .../UpdateVersions/UpdateVersionsTest.php | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lang/fr_FR.UTF-8/LC_MESSAGES/messages.po b/lang/fr_FR.UTF-8/LC_MESSAGES/messages.po index b96dea0e1fb..49142b5d656 100644 --- a/lang/fr_FR.UTF-8/LC_MESSAGES/messages.po +++ b/lang/fr_FR.UTF-8/LC_MESSAGES/messages.po @@ -16920,19 +16920,19 @@ msgstr "Attention, taille maximale dépassée pour le champ '%s' (max: %d), il s msgid "Update already in progress" msgstr "Une mise à jour est déjà en cours" -msgid "An error occurred when retrieving current version" +msgid "An error occurred when retrieving the current version" msgstr "Une erreur s'est produite lors de la récupération de la version actuelle" -msgid "Cannot retrieve current version" -msgstr "La version actuelle n'a pas pu être trouvée" +msgid "Cannot retrieve the current version" +msgstr "La version actuelle n'a pas pu être récupérée" -msgid "An error occurred when getting available updates" +msgid "An error occurred when retrieving available updates" msgstr "Une erreur s'est produite lors de la récupération des mises à jour disponibles" -msgid "An error occurred when applying update %s (%s)" +msgid "An error occurred when applying the update %s (%s)" msgstr "Une erreur s'est produite lors de l'application de la mise à jour %s (%s)" -msgid "Error while locking update process" +msgid "Error while locking the update process" msgstr "Erreur lors du verrouillage du processus de mise à jour" msgid "Error while unlocking update process" @@ -16950,11 +16950,11 @@ msgstr "La version %s de PHP est requise (%s installée)" msgid "PHP extension %s not loaded" msgstr "L'extension %s de PHP n'est pas chargée" -msgid "Error when getting database version" +msgid "Error when retrieving the database version" msgstr "Erreur lors de la récupération de la version de la base de données" -msgid "Cannot retrieve database version information" -msgstr "Les informations de version de la base de données n'ont pas pu être trouvées" +msgid "Cannot retrieve the database version information" +msgstr "Les informations de version de la base de données n'ont pas pu être récupérées" msgid "MariaDB version %s required (%s installed)" msgstr "La version %s de MariaDB est requise (%s installée)" diff --git a/src/Core/Platform/Application/Repository/UpdateLockerException.php b/src/Core/Platform/Application/Repository/UpdateLockerException.php index 57fbfff71e3..835decfe21b 100644 --- a/src/Core/Platform/Application/Repository/UpdateLockerException.php +++ b/src/Core/Platform/Application/Repository/UpdateLockerException.php @@ -31,7 +31,7 @@ class UpdateLockerException extends RepositoryException */ public static function errorWhileLockingUpdate(\Throwable $e): self { - return new self(_('Error while locking update process'), 0, $e); + return new self(_('Error while locking the update process'), 0, $e); } /** diff --git a/src/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsException.php b/src/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsException.php index 58045eed72c..dbfaec97ba3 100644 --- a/src/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsException.php +++ b/src/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsException.php @@ -38,7 +38,7 @@ public static function updateAlreadyInProgress(): self */ public static function errorWhenRetrievingCurrentVersion(\Throwable $e): self { - return new self(_('An error occurred when retrieving current version'), 0, $e); + return new self(_('An error occurred when retrieving the current version'), 0, $e); } /** @@ -46,7 +46,7 @@ public static function errorWhenRetrievingCurrentVersion(\Throwable $e): self */ public static function cannotRetrieveCurrentVersion(): self { - return new self(_('Cannot retrieve current version')); + return new self(_('Cannot retrieve the current version')); } /** @@ -55,7 +55,7 @@ public static function cannotRetrieveCurrentVersion(): self */ public static function errorWhenRetrievingAvailableUpdates(\Throwable $e): self { - return new self(_('An error occurred when getting available updates'), 0, $e); + return new self(_('An error occurred when retrieving available updates'), 0, $e); } /** @@ -70,7 +70,7 @@ public static function errorWhenApplyingUpdate( \Throwable $e ): self { return new self( - sprintf(_('An error occurred when applying update %s (%s)'), $version, $technicalMessage), + sprintf(_('An error occurred when applying the update %s (%s)'), $version, $technicalMessage), 0, $e ); diff --git a/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementException.php b/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementException.php index f478124932f..f9517d8216a 100644 --- a/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementException.php +++ b/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementException.php @@ -33,7 +33,7 @@ class DatabaseRequirementException extends RequirementException public static function errorWhenGettingDatabaseVersion(\Throwable $e): self { return new self( - _('Error when getting database version'), + _('Error when retrieving the database version'), 0, $e, ); @@ -44,6 +44,6 @@ public static function errorWhenGettingDatabaseVersion(\Throwable $e): self */ public static function cannotRetrieveVersionInformation(): self { - return new self(_('Cannot retrieve database version information')); + return new self(_('Cannot retrieve the database version information')); } } diff --git a/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementValidator.php b/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementValidator.php index e2cd200e119..619d338eddf 100644 --- a/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementValidator.php +++ b/src/Core/Platform/Infrastructure/Validator/RequirementValidators/DatabaseRequirementValidator.php @@ -121,7 +121,7 @@ private function initDatabaseVersionInformation(): void } if (empty($this->version) || empty($this->versionComment)) { - $this->info('Cannot retrieve database version information'); + $this->info('Cannot retrieve the database version information'); throw DatabaseRequirementException::cannotRetrieveVersionInformation(); } } diff --git a/tests/php/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsTest.php b/tests/php/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsTest.php index 26dbef00733..6f96a95531a 100644 --- a/tests/php/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsTest.php +++ b/tests/php/Core/Platform/Application/UseCase/UpdateVersions/UpdateVersionsTest.php @@ -109,7 +109,7 @@ $this->presenter ->expects($this->once()) ->method('setResponseStatus') - ->with(new ErrorResponse('Cannot retrieve current version')); + ->with(new ErrorResponse('Cannot retrieve the current version')); $updateVersions($this->presenter); });