Commit fe74b742 authored by Clouard Regis's avatar Clouard Regis
Browse files

Refactored planner login page

parent fe1f3c5c
......@@ -53,7 +53,7 @@ class SecurityController extends AbstractController
if ($user) {
$creator = new CreateUser($user, $translator);
$creator->forgotPassword($encoder, $this->getDoctrine()->getManager());
$creator->sendEmail($mailer, false,$translator);
$creator->sendEmail($mailer, false, $translator);
return $this->redirectToRoute('all_planners');
} else {
......
......@@ -39,7 +39,7 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
}
/**
* Used to upgrade (rehash) the user's password automatically over time.
* Used to upgrade (rehash) the user's password automatically overtime.
* @throws ORMException
*/
public function upgradePassword(UserInterface $user, string $newHashedPassword): void
......
......@@ -67,7 +67,7 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator implements P
}
$user = $this->entityManager->getRepository(User::class)->findOneBy(['username' => $credentials['username']]);
if (!$user) {
throw new CustomUserMessageAuthenticationException("Le compte n'existe pas.");
throw new CustomUserMessageAuthenticationException('login.unknown.planner');
}
return $user;
......@@ -79,7 +79,7 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator implements P
}
/**
* Used to upgrade (rehash) the user's password automatically over time.
* Used to upgrade (rehash) the user's password automatically overtime.
*/
public function getPassword($credentials): ?string
{
......
......@@ -15,7 +15,7 @@
{% elseif event.type == 2 %}
{% trans %}event.info.event_type.cumulativeTime{% endtrans %}
{% endif %}</h5>
<h5>{% trans %}event.info.courses{% endtrans %} :</h5>
<h5>{% trans %}event.info.courses{% endtrans %}</h5>
<table class="table table-bordered table-sm">
<thead>
<tr>
......@@ -24,18 +24,17 @@
<th scope="col">{% trans %}event.info.courses_table.limit_time{% endtrans %}</th>
{% if event.type==0 or event.type == 1 %}
<th scope="col">{% trans %}event.info.courses_table.PM_penalty{% endtrans %}</th>
<th scope="col">{% trans %}event.info.courses_table.over_time_penalty{% endtrans %}</th>
<th scope="col">{% trans %}event.info.courses_table.overtime_penalty{% endtrans %}</th>
{% elseif event.type==2 %}
<th scope="col">{% trans %}event.info.courses_table.PM_penalty_sec{% endtrans %}</th>
<th scope="col">{% trans %}event.info.courses_table.over_time_penalty_sec{% endtrans %}</th>
<th scope="col">{% trans %}event.info.courses_table.overtime_penalty_sec{% endtrans %}</th>
{% endif %}
</tr>
</thead>
{% for eventCourse in eventCourses %}
<tbody>
<tr>
<th scope="row"><a href="{{ path('show_info', {id: eventCourse.course.id}) }}"
class="ml-auto btn btn-primary">{{ eventCourse.course.name }}</a></th>
<th scope="row"><a href="{{ path('show_info', {id: eventCourse.course.id}) }}" class="ml-auto btn btn-primary">{{ eventCourse.course.name }}</a></th>
<td>{% if eventCourse.format == 0 %}
{% trans %}my_event_details.imposed{% endtrans %}
{% else %}
......@@ -53,7 +52,7 @@
{% endfor %}
</table>
<h5>{% trans %}event.info.participants{% endtrans %} :</h5>
<h5>{% trans %}event.info.participants{% endtrans %}</h5>
<table class="table table-striped table-bordered">
<thead>
<tr>
......
......@@ -12,10 +12,10 @@
<h3 class="text-center text-primary" style="padding-bottom: 30pt">Se connecter</h3>
{% if error %}
<div class="alert alert-danger">
{{ error.messageKey|trans(error.messageData, 'security') }}
{{ error.messageKey|trans(error.messageData) }}
<p></p>
<a href="{{ path('app_logout') }}">
<button type="button" class="btn btn-outline-primary">Logout</button>
<button type="button" class="btn btn-outline-primary">{% trans %}login.logout{% endtrans %}</button>
</a>
</div>
{% elseif app.user %}
......
......@@ -687,7 +687,7 @@ such as orienteering, multisport orienteering, trails...</target>
</trans-unit>
<trans-unit id="5Oc6vm2" resname="my_event_details.participants.score_total">
<source>my_event_details.participants.score_total</source>
<target>Total score</target>
<target>Total Score</target>
</trans-unit>
<trans-unit id="q4kvmTB" resname="my_event_details.event_type.time">
<source>my_event_details.event_type.time</source>
......@@ -739,7 +739,7 @@ such as orienteering, multisport orienteering, trails...</target>
</trans-unit>
<trans-unit id="dJKEQow" resname="event.info.courses_table.limit_time">
<source>event.info.courses_table.limit_time</source>
<target>Limit time</target>
<target>Time Limit</target>
</trans-unit>
<trans-unit id="_KwGIsT" resname="event.info.participants">
<source>event.info.participants</source>
......@@ -771,11 +771,11 @@ such as orienteering, multisport orienteering, trails...</target>
</trans-unit>
<trans-unit id="g8XJIb5" resname="event.info.courses_table.PM_penalty">
<source>event.info.courses_table.PM_penalty</source>
<target>Missing punch penalty</target>
<target>Missing Punch Penalty</target>
</trans-unit>
<trans-unit id="ZDI79ZV" resname="event.info.courses_table.over_time_penalty">
<source>event.info.courses_table.over_time_penalty</source>
<target>Over time penalty</target>
<trans-unit id="UPZKrrf" resname="event.info.courses_table.overtime_penalty">
<source>event.info.courses_table.overtime_penalty</source>
<target>Overtime Penalty</target>
</trans-unit>
<trans-unit id="eWgEjiM" resname="my_events.create.title">
<source>my_events.create.title</source>
......@@ -1093,8 +1093,8 @@ such as orienteering, multisport orienteering, trails...</target>
<source>event.info.courses_table.PM_penalty_sec</source>
<target>Missing punch penalty in seconds</target>
</trans-unit>
<trans-unit id="QQddspD" resname="event.info.courses_table.over_time_penalty_sec">
<source>event.info.courses_table.over_time_penalty_sec</source>
<trans-unit id="s6ZqanI" resname="event.info.courses_table.overtime_penalty_sec">
<source>event.info.courses_table.overtime_penalty_sec</source>
<target>Penalty per minute exceeded in seconds</target>
</trans-unit>
<trans-unit id="eAcXosP" resname="my_event_details.courses_table.PM_penalty_sec">
......@@ -1325,6 +1325,14 @@ such as orienteering, multisport orienteering, trails...</target>
<source>error.printable.choice.invalid</source>
<target>Invalid printable choice</target>
</trans-unit>
<trans-unit id="Hd9NYNq" resname="login.unknown.planner">
<source>login.unknown.planner</source>
<target>Unknown planner</target>
</trans-unit>
<trans-unit id="slP6BBh" resname="login.logout">
<source>login.logout</source>
<target>Logout</target>
</trans-unit>
</body>
</file>
</xliff>
......@@ -643,7 +643,7 @@ de l’Informatique.</target>
</trans-unit>
<trans-unit id="bGf_k1w" resname="my_event_details.participants.nickname">
<source>my_event_details.participants.nickname</source>
<target>pseudonyme</target>
<target>Pseudonyme</target>
</trans-unit>
<trans-unit id="xG6oiSq" resname="my_event_details.participants.progress">
<source>my_event_details.participants.progress</source>
......@@ -739,10 +739,10 @@ de l’Informatique.</target>
</trans-unit>
<trans-unit id="g8XJIb5" resname="event.info.courses_table.PM_penalty">
<source>event.info.courses_table.PM_penalty</source>
<target>Pénalité PM</target>
<target>Pénalité par poste manquant</target>
</trans-unit>
<trans-unit id="ZDI79ZV" resname="event.info.courses_table.over_time_penalty">
<source>event.info.courses_table.over_time_penalty</source>
<trans-unit id="UPZKrrf" resname="event.info.courses_table.overtime_penalty">
<source>event.info.courses_table.overtime_penalty</source>
<target>Pénalité par minute entamée</target>
</trans-unit>
<trans-unit id="eWgEjiM" resname="my_events.create.title">
......@@ -1201,8 +1201,8 @@ de l’Informatique.</target>
<source>event.info.courses_table.PM_penalty_sec</source>
<target>Pénalité par poste manquant en secondes</target>
</trans-unit>
<trans-unit id="QQddspD" resname="event.info.courses_table.over_time_penalty_sec">
<source>event.info.courses_table.over_time_penalty_sec</source>
<trans-unit id="s6ZqanI" resname="event.info.courses_table.overtime_penalty_sec">
<source>event.info.courses_table.overtime_penalty_sec</source>
<target>Pénalité par minute entamée en seconde</target>
</trans-unit>
<trans-unit id="eYEFYQ_" resname="my_event.return.my_event">
......@@ -1333,6 +1333,14 @@ de l’Informatique.</target>
<source>error.printable.choice.invalid</source>
<target>Valeur invalide pour le champ Imprimable</target>
</trans-unit>
<trans-unit id="Hd9NYNq" resname="login.unknown.planner">
<source>login.unknown.planner</source>
<target>Le compte n'existe pas.</target>
</trans-unit>
<trans-unit id="slP6BBh" resname="login.logout">
<source>login.logout</source>
<target>Déconnexion</target>
</trans-unit>
</body>
</file>
</xliff>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment