From 1595742b1844592b2cafbacd8d7176527ccb11c4 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 10 Jan 2024 11:56:42 +0100 Subject: [PATCH] i18n: Improve the CSRF error message --- tests/Controller/MessageDocumentsControllerTest.php | 4 ++-- translations/errors+intl-icu.en_GB.yaml | 2 +- translations/errors+intl-icu.fr_FR.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Controller/MessageDocumentsControllerTest.php b/tests/Controller/MessageDocumentsControllerTest.php index 3ff507ea..4d5250cd 100644 --- a/tests/Controller/MessageDocumentsControllerTest.php +++ b/tests/Controller/MessageDocumentsControllerTest.php @@ -103,7 +103,7 @@ public function testPostCreateFailsIfCsrfTokenIsInvalid(): void /** @var string */ $content = $response->getContent(); $responseData = json_decode($content, true); - $this->assertSame('The security token is invalid, please try again.', $responseData['error']); + $this->assertStringContainsString('The security token is invalid', $responseData['error']); } public function testPostCreateFailsIfMimetypeIsInvalid(): void @@ -413,7 +413,7 @@ public function testPostDeleteFailsIfCsrfIsInvalid(): void /** @var string */ $content = $response->getContent(); $responseData = json_decode($content, true); - $this->assertSame('The security token is invalid, please try again.', $responseData['error']); + $this->assertStringContainsString('The security token is invalid', $responseData['error']); } public function testGetIndexListsTheFile(): void diff --git a/translations/errors+intl-icu.en_GB.yaml b/translations/errors+intl-icu.en_GB.yaml index c11258b2..1d1fbc6d 100644 --- a/translations/errors+intl-icu.en_GB.yaml +++ b/translations/errors+intl-icu.en_GB.yaml @@ -10,7 +10,7 @@ contract.max_hours.required: 'Enter a number of hours.' contract.name.max_chars: 'Enter a name of less than {limit} characters.' contract.name.required: 'Enter a name.' contract.start_at.required: 'Enter a start date.' -csrf.invalid: 'The security token is invalid, please try again.' +csrf.invalid: 'The security token is invalid. Please try to resubmit the form.' mailbox.authentication.invalid: 'Select an authentication method from the list.' mailbox.encryption.invalid: 'Select an encryption method from the list.' mailbox.folder.required: 'Enter a folder.' diff --git a/translations/errors+intl-icu.fr_FR.yaml b/translations/errors+intl-icu.fr_FR.yaml index 15029312..1fff976f 100644 --- a/translations/errors+intl-icu.fr_FR.yaml +++ b/translations/errors+intl-icu.fr_FR.yaml @@ -10,7 +10,7 @@ contract.max_hours.required: 'Saisissez un nombre d’heures.' contract.name.max_chars: 'Saisissez un nom de moins de {limit} caractères.' contract.name.required: 'Saisissez un nom.' contract.start_at.required: 'Saisissez une date de début.' -csrf.invalid: 'Le jeton de sécurité est invalide, veuillez réessayer.' +csrf.invalid: 'Le jeton de sécurité est invalide. Veuillez essayer de revalider le formulaire.' mailbox.authentication.invalid: 'Sélectionnez une méthode d’authentification de la liste.' mailbox.encryption.invalid: 'Sélectionnez une méthode de chiffrement de la liste.' mailbox.folder.required: 'Saisissez un répertoire.'