Skip to content
Snippets Groups Projects
Commit dbbf1bb5 authored by Camille Simiand's avatar Camille Simiand
Browse files

Add missing french and english translations

parent 74b7e148
No related branches found
No related tags found
1 merge request!37tuleap-117-fix-translation-for-register-mail-sent-and-confirmation-email-templates
Pipeline #676 passed
<h1>Hi! Please confirm your email!</h1> <h1>
{{ 'registration.email.title'|trans }}
</h1>
<p> <p>
Please confirm your email address by clicking the following link: <br><br> {{ 'registration.email.text'|trans }}:
<a href="{{ signedUrl }}">Confirm my Email</a>. <br><br>
This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}. <a href="{{ signedUrl }}">
{{ 'registration.email.confirm_email'|trans }}
</a>
{{ 'general.link_expire'|trans({'%expirationDuration%':
expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle')}) }}
</p> </p>
<p> <p>
Cheers! {{ 'general.greeting'|trans }}
</p> </p>
{% extends 'connexion.html.twig' %} {% extends 'connexion.html.twig' %}
{% block title %}Register{% endblock %} {% block title %}
{{ 'registration.register'|trans }}
{% endblock %}
{% block body %} {% block body %}
<div class="mt-4"> <div class="mt-4">
{% for flashError in app.flashes('verify_email_error') %} {% for flashError in app.flashes('verify_email_error') %}
......
{% extends 'layout.html.twig' %} {% extends 'layout.html.twig' %}
{% block title %}Mail registration sent{% endblock %} {% block title %}
{{ 'registration.email_sent.title' }}
{% endblock %}
{% block body %} {% block body %}
<div class="container d-flex flex-row justify-content-center"> <div class="container d-flex flex-row justify-content-center">
<div class="col-6"> <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>
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</a> </a>
<p> <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>
<p> <p>
{{ 'email_reset_password.greeting'|trans }} {{ 'general.greeting'|trans }}
</p> </p>
...@@ -177,7 +177,7 @@ class RegistrationControllerTest extends WebTestCase ...@@ -177,7 +177,7 @@ class RegistrationControllerTest extends WebTestCase
{ {
/** @phpstan-ignore-next-line */ /** @phpstan-ignore-next-line */
$crawler = new Crawler($emailMessage->getHtmlBody()); $crawler = new Crawler($emailMessage->getHtmlBody());
$crawlerLink = $crawler->selectLink('Confirm my Email')->link(); $crawlerLink = $crawler->selectLink('Confirm my email')->link();
$client->click($crawlerLink); $client->click($crawlerLink);
} }
......
...@@ -4,6 +4,8 @@ general: ...@@ -4,6 +4,8 @@ general:
sign_in: Sign in sign_in: Sign in
log_out: Log out log_out: Log out
go_back_to_home_page: Home page go_back_to_home_page: Home page
link_expire: This link will expire in %expirationDuration%
greeting: Cheers!
login: login:
account_disabled_feedback: Your user account is disabled. Please click on the link your receive by email to validate your registration. 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: ...@@ -20,6 +22,13 @@ registration:
agreeTerms: Accept terms and conditions agreeTerms: Accept terms and conditions
register: Register register: Register
email_verified_success: Your email address has been verified 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: reset_password:
title: Reset your password title: Reset your password
...@@ -31,9 +40,10 @@ reset_password: ...@@ -31,9 +40,10 @@ reset_password:
email: email:
address_verified: Your email address has been verified address_verified: Your email address has been verified
check_email_reset_password: check_email_reset_password:
title: Password Reset Email Sent 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% This link will expire in %expirationDuration%
check_spam: If you don't receive an email please check your spam folder or check_spam: If you don't receive an email please check your spam folder or
try_again: Try again. try_again: Try again.
...@@ -41,8 +51,6 @@ check_email_reset_password: ...@@ -41,8 +51,6 @@ check_email_reset_password:
email_reset_password: email_reset_password:
instructions: To reset your password, please visit the following link instructions: To reset your password, please visit the following link
link: Reset my password link: Reset my password
link_expire: This link will expire in %expirationDuration%
greeting: Cheers!
capsule: capsule:
title: My capsules title: My capsules
......
...@@ -3,6 +3,8 @@ general: ...@@ -3,6 +3,8 @@ general:
password: Mot de passe password: Mot de passe
sign_in: Se connecter sign_in: Se connecter
log_out: Se déconnecter log_out: Se déconnecter
link_expire: Le lien expirera dans
greeting: Salutation !
login: login:
account_disabled_feedback: Le compte utilisateur a été désactivé. Veuillez cliquer sur le lien pour recevoir un courriel de validation 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: ...@@ -17,8 +19,15 @@ registration:
second: Répéter le mot de passe second: Répéter le mot de passe
captcha: Captcha captcha: Captcha
agreeTerms: Accepter les termes et conditions agreeTerms: Accepter les termes et conditions
register: S'enregistrer register: Créer un compte
email_verified_success: Votre courriel a été vérifié 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: reset_password:
title: Réinitialiser mon mot de passe title: Réinitialiser mon mot de passe
...@@ -40,8 +49,6 @@ check_email_reset_password: ...@@ -40,8 +49,6 @@ check_email_reset_password:
email_reset_password: email_reset_password:
instructions: Pour réinitialiser le mot de passe, veuillez cliquer sur le lien suivant instructions: Pour réinitialiser le mot de passe, veuillez cliquer sur le lien suivant
link: Réinitialiser mon mot de passe link: Réinitialiser mon mot de passe
link_expire: Le lien expirera dans
greeting: Salutation !
capsule: capsule:
title: Mes capsules title: Mes capsules
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment