diff --git a/templates/registration/confirmation_email.html.twig b/templates/registration/confirmation_email.html.twig index bc307f272ec3242d25397e1fd5dd30f58441add6..3d9a4743b16a6e670a1c4f867d0dea3ff72c4103 100644 --- a/templates/registration/confirmation_email.html.twig +++ b/templates/registration/confirmation_email.html.twig @@ -1,11 +1,17 @@ -<h1>Hi! Please confirm your email!</h1> +<h1> + {{ 'registration.email.title'|trans }} +</h1> <p> - Please confirm your email address by clicking the following link: <br><br> - <a href="{{ signedUrl }}">Confirm my Email</a>. - This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}. + {{ 'registration.email.text'|trans }}: + <br><br> + <a href="{{ signedUrl }}"> + {{ 'registration.email.confirm_email'|trans }} + </a> + {{ 'general.link_expire'|trans({'%expirationDuration%': + expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle')}) }} </p> <p> - Cheers! + {{ 'general.greeting'|trans }} </p> diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index 7333e24d2a67600b4bb70bcc8d8ea085da3ca2d5..45e7b0fdd73cf56386a7f22154511129a1796d82 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -1,6 +1,9 @@ {% extends 'connexion.html.twig' %} -{% block title %}Register{% endblock %} +{% block title %} + {{ 'registration.register'|trans }} +{% endblock %} + {% block body %} <div class="mt-4"> {% for flashError in app.flashes('verify_email_error') %} diff --git a/templates/registration/register_mail_sent.html.twig b/templates/registration/register_mail_sent.html.twig index fb44dc61ce88f116ee4c4d66dcf7c33ea6c46523..108891bda33a96eec60a2e0b8a71cb9edd80a351 100644 --- a/templates/registration/register_mail_sent.html.twig +++ b/templates/registration/register_mail_sent.html.twig @@ -1,10 +1,14 @@ {% extends 'layout.html.twig' %} -{% block title %}Mail registration sent{% endblock %} +{% block title %} + {{ 'registration.email_sent.title' }} +{% endblock %} {% block body %} <div class="container d-flex flex-row justify-content-center"> <div class="col-6"> - <p class="alert">An email has been sent to {{ user.getEmail() }}. It contains an activation link you must click to activate your account.</p> + <p class="alert"> + {{ 'registration.email_sent.text'|trans({'%userEmail%': user.getEmail()}) }} + </p> </div> </div> {% endblock %} \ No newline at end of file diff --git a/templates/reset_password/email.html.twig b/templates/reset_password/email.html.twig index f1f5593c3754d9c0f652d2eb9ee9728753c17a9c..58c5de8063dac0efcc4cd70ac7dc98a04c669a0f 100644 --- a/templates/reset_password/email.html.twig +++ b/templates/reset_password/email.html.twig @@ -9,9 +9,9 @@ </a> <p> - {{ 'email_reset_password.link_expire'|trans({'%expirationDuration%': (resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle'))}) }}. + {{ 'general.link_expire'|trans({'%expirationDuration%': (resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle'))}) }}. </p> <p> - {{ 'email_reset_password.greeting'|trans }} + {{ 'general.greeting'|trans }} </p> diff --git a/tests/functional/RegistrationControllerTest.php b/tests/functional/RegistrationControllerTest.php index 85fca77d802f0729048916e3c1d27df5cd20d2a5..3095ea1b44f5de47af09b5f3eb7a2009a4e4f16c 100644 --- a/tests/functional/RegistrationControllerTest.php +++ b/tests/functional/RegistrationControllerTest.php @@ -177,7 +177,7 @@ class RegistrationControllerTest extends WebTestCase { /** @phpstan-ignore-next-line */ $crawler = new Crawler($emailMessage->getHtmlBody()); - $crawlerLink = $crawler->selectLink('Confirm my Email')->link(); + $crawlerLink = $crawler->selectLink('Confirm my email')->link(); $client->click($crawlerLink); } diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index a2c55b354433ad70db5941df81a5305e75c7f057..4e8a7ae761d1419e7a113e7c70a0eda6d2d07b6d 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -4,6 +4,8 @@ general: sign_in: Sign in log_out: Log out go_back_to_home_page: Home page + link_expire: This link will expire in %expirationDuration% + greeting: Cheers! login: account_disabled_feedback: Your user account is disabled. Please click on the link your receive by email to validate your registration. @@ -20,6 +22,13 @@ registration: agreeTerms: Accept terms and conditions register: Register email_verified_success: Your email address has been verified + email_sent: + title: Mail registration sent + text: An email has been sent to %userEmail%. It contains an activation link you must click to activate your account + email: + title: Hi! Please confirm your email + text: Please confirm your email address to activate MemoRekall account by clicking the following link + confirm_email: Confirm my email reset_password: title: Reset your password @@ -31,9 +40,10 @@ reset_password: email: address_verified: Your email address has been verified + check_email_reset_password: title: Password Reset Email Sent - text: If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. + text: If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password This link will expire in %expirationDuration% check_spam: If you don't receive an email please check your spam folder or try_again: Try again. @@ -41,8 +51,6 @@ check_email_reset_password: email_reset_password: instructions: To reset your password, please visit the following link link: Reset my password - link_expire: This link will expire in %expirationDuration% - greeting: Cheers! capsule: title: My capsules diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml index 9ac0296996c9beefc01981d63b968378f1a94af1..3bfa7fbfae2aa8f6a2f64abd785f7745b3f4ea99 100644 --- a/translations/messages.fr.yaml +++ b/translations/messages.fr.yaml @@ -3,6 +3,8 @@ general: password: Mot de passe sign_in: Se connecter log_out: Se déconnecter + link_expire: Le lien expirera dans + greeting: Salutation ! login: account_disabled_feedback: Le compte utilisateur a été désactivé. Veuillez cliquer sur le lien pour recevoir un courriel de validation @@ -17,8 +19,15 @@ registration: second: Répéter le mot de passe captcha: Captcha agreeTerms: Accepter les termes et conditions - register: S'enregistrer - email_verified_success: Votre courriel a été vérifié + register: Créer un compte + email_verified_success: Votre adresse email a été vérifiée + email_sent: + title: E-mail de création de compte envoyé + text: Nous avons envoyé un courriel à l'adresse e-mail %userEmail%. Il contient un lien d'activation sur lequel vous devez cliquer pour activer votre compte + email: + title: Bonjour ! Veuillez confirmer votre adresse email + text: Veuillez confirmer votre adresse e-mail pour activer votre compte MemoRekall en cliquant sur le lien suivant + confirm_email: Confirmer mon adresse e-mail reset_password: title: Réinitialiser mon mot de passe @@ -40,8 +49,6 @@ check_email_reset_password: email_reset_password: instructions: Pour réinitialiser le mot de passe, veuillez cliquer sur le lien suivant link: Réinitialiser mon mot de passe - link_expire: Le lien expirera dans - greeting: Salutation ! capsule: title: Mes capsules