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

Add exhaustive translations

parent 8d70d920
No related branches found
No related tags found
1 merge request!23Tuleap 47 reset my password
Show whitespace changes
Inline Side-by-side
Showing
with 90 additions and 37 deletions
src/Form/RegistrationFormType.php
+ 1
− 1
View file @ 241e4f20
......@@ -44,7 +44,7 @@ class RegistrationFormType extends AbstractType
EmailType::class,
[
'constraints' => [new NotBlank(['message' => 'email.not_blank'])],
'label' => 'registration.email'
'label' => 'general.email'
]
)
->add('plainPassword', RepeatedType::class, [
......
src/Form/ResetPasswordRequestFormType.php
+ 1
− 1
View file @ 241e4f20
......@@ -20,7 +20,7 @@ class ResetPasswordRequestFormType extends AbstractType
'message' => 'email.not_blank',
]),
],
'label' => 'reset_password.email'
'label' => 'general.email'
])
;
}
......
templates/connexion.html.twig
+ 6
− 2
View file @ 241e4f20
......@@ -2,7 +2,11 @@
{% block connexion %}
<div class="d-flex flex-row justify-content-center mb-10">
<a href="/login" class="btn btn-primary m-2 px-4 py-3" >LOG IN</a>
<a href="/register" class="btn btn-primary m-2 px-4 py-3" >SIGN IN</a>
<a href="/login" class="btn btn-primary m-2 px-4 py-3 text-uppercase" >
{{ 'login.log_in'|trans }}
</a>
<a href="/register" class="btn btn-primary m-2 px-4 py-3 text-uppercase">
{{ 'general.sign_in'|trans }}
</a>
</div>
{% endblock %}
templates/layout.html.twig
+ 4
− 3
View file @ 241e4f20
......@@ -3,8 +3,7 @@
<head>
<meta charset="UTF-8">
<title>{% block title %}MemoRekall{% endblock %}</title>
{# Run `composer require symfony/webpack-encore-bundle`
and uncomment the following Encore helpers to start using Symfony UX #}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% endblock %}
......@@ -27,7 +26,9 @@
<div id="user-block">
<div id="user-block-nom">{{ app.user.firstName }} {{ app.user.lastName }}</div>
<form>
<button class="btn btn-primary" formaction="/logout">Log out</button>
<button class="btn btn-primary" formaction="/logout">
{{ 'general.log_out'|trans }}
</button>
</form>
</div>
{% endif %}
......
templates/reset_password/check_email.html.twig
+ 10
− 4
View file @ 241e4f20
{% extends 'layout.html.twig' %}
{% block title %}Password Reset Email Sent{% endblock %}
{% block title %}
{{ 'check_email_reset_password.title'|trans }}
{% endblock %}
{% block body %}
<p>
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 {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
{{ 'check_email_reset_password.text'|trans }}
{{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
</p>
<p>{{ 'check_email_reset_password.check_spam'|trans }}
<a href="{{ path('app_forgot_password_request') }}">
{{ 'check_email_reset_password.try_again'|trans }}
</a>
</p>
<p>If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
{% endblock %}
templates/reset_password/email.html.twig
+ 12
− 4
View file @ 241e4f20
<h1>Hi!</h1>
<p>To reset your password, please visit the following link</p>
<p>
{{ 'email_reset_password.instructions'|trans }}
</p>
<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">Reset my password</a>
<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">
{{ 'email_reset_password.link'|trans }}
</a>
<p>This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.</p>
<p>
{{ 'email_reset_password.link_expire'|trans }} {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
</p>
<p>Cheers!</p>
<p>
{{ 'email_reset_password.greeting'|trans }}
</p>
templates/reset_password/request.html.twig
+ 10
− 5
View file @ 241e4f20
{% extends 'layout.html.twig' %}
{% block title %}Reset your password{% endblock %}
{% block title %}
{{ 'reset_password.title'|trans }}
{% endblock %}
{% block body %}
{% for flashError in app.flashes('reset_password_error') %}
<div class="alert alert-danger" role="alert">{{ flashError }}</div>
{% endfor %}
<h1 class="m-auto mb-4 mt-4 col-6">Reset your password</h1>
<h1 class="m-auto mb-4 mt-4 col-6">
{{ 'reset_password.title'|trans }}
</h1>
<div class="d-flex flex-column justify-content-center">
......@@ -17,12 +21,13 @@
<div class="m-auto mb-4 mt-4 col-6">
<small>
Enter your email address and we will send you a
link to reset your password.
{{ 'reset_password.message'|trans }}
</small>
</div>
<button class="d-flex flex-column btn btn-primary m-auto mt-2 mb-4 col-2" type="submit">Reset password</button>
<button class="d-flex flex-column btn btn-primary m-auto mt-2 mb-4 col-2" type="submit">
{{ 'reset_password.button'|trans }}
</button>
{{ form_end(requestForm) }}
</div>
......
templates/reset_password/reset.html.twig
+ 7
− 3
View file @ 241e4f20
{% extends 'layout.html.twig' %}
{% block title %}Reset your password{% endblock %}
{% block title %}
{{ 'reset_password.title'|trans }}
{% endblock %}
{% block body %}
<h1 class="m-auto mb-4 col-6">Reset your password</h1>
<h1 class="m-auto mb-4 col-6">
{{ 'reset_password.title'|trans }}
</h1>
<div class="d-flex flex-column justify-content-center">
{{ form_start(resetForm, {'attr': {novalidate: 'novalidate'}}) }}
......@@ -11,7 +15,7 @@
{{ form_row(resetForm.plainPassword) }}
</div>
<button class="d-flex flex-column btn btn-primary m-auto mt-2 mb-4 col-2" type="submit">
Reset password
{{ 'reset_password.button'|trans }}
</button>
{{ form_end(resetForm) }}
</div>
......
templates/security/login.html.twig
+ 13
− 11
View file @ 241e4f20
{% extends 'connexion.html.twig' %}
{% block title %}Log in{% endblock %}
{% block title %}
{{ 'login.log_in'|trans }}
{% endblock %}
{% block body %}
<form method="post" class="d-flex flex-column justify-content-center">
......@@ -11,18 +13,16 @@
<div class="alert alert-warning col-6 m-auto" role="alert" >{{ flashMessage }}</div>
{% endfor %}
{% if app.user %}
<div class="mb-3">
You are logged in as {{ app.user.username }}, <a href="{{ path('app_logout') }}">Logout</a>
</div>
{% endif %}
<div class="form-group d-flex flex-column m-auto mb-4 mt-4 col-6">
<label for="inputEmail" class="form-label">Email</label>
<label for="inputEmail" class="form-label">
{{ 'general.email'|trans }}
</label>
<input type="email" value="{{ last_username }}" name="email" id="inputEmail" class="form-control" autocomplete="email" required autofocus>
</div>
<div class="form-group d-flex flex-column m-auto mb-4 col-6">
<label for="inputPassword" class="form-label">Password</label>
<label for="inputPassword" class="form-label">
{{ 'general.password'|trans }}
</label>
<input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password" required>
</div>
......@@ -41,10 +41,12 @@
</div>
#}
<a href="/reset-password" class="m-auto">I forgot my password</a>
<a href="/reset-password" class="m-auto">
{{ 'login.forgot_password_link'|trans }}
</a>
<button class="btn btn-primary col-2 m-auto mt-4" type="submit">
Log in
{{ 'login.log_in'|trans }}
</button>
</form>
......
translations/messages.en.yaml
+ 26
− 3
View file @ 241e4f20
general:
email: Email
password: Password
sign_in: Sign in
log_out: Log out
login:
account_disabled_feedback: Your user account is disabled. Please click on the link your receive by email to validate your registration.
forgot_password_link: I forgot my password
log_in: Log in
registration:
firstName: First name
lastName: Last name
email: Email
password:
first: Password
second: Repeat Password
......@@ -12,7 +19,23 @@ registration:
agreeTerms: Accept terms and conditions
register: Register
#RESET PASSWORD
reset_password:
email: Email
repeat_password: Repeat password
title: Reset your password
new_password: New password
repeat_password: Repeat password
message: Enter your email address and we will send you a link to reset your password.
button: Reset password
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.
This link will expire in
check_spam: If you don't receive an email please check your spam folder or
try_again: Try again.
email_reset_password:
instructions: To reset your password, please visit the following link
link: Reset my password
link_expire: This link will expire in
greeting: Cheers!
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment