Translated login error messages and style fix

This commit is contained in:
Matteo Gheza 2020-11-23 22:09:21 +01:00
parent 536054f9dd
commit 5006090ec1
6 changed files with 35 additions and 24 deletions

View File

@ -563,7 +563,6 @@ class user
}
$this->auth->loginWithUsername($name, $password, $rememberDuration);
}
//TODO: translate errors code
catch (\Delight\Auth\InvalidEmailException $e) {
$this->tools->profiler_stop();
return ["status" => "error", "code" => 010, "text" => "Wrong email address"];

View File

@ -18,7 +18,7 @@
</div>
<br>
<br>
<label><b>{{ 'Code'|t }}</b></label>
<label><b>{{ 'code'|t }}</b></label>
<input id="progressivo" type="text" name="codice" placeholder="1234/5" required value="{{ values.codice }}">
<br>
<br>

View File

@ -11,22 +11,6 @@
{% endblock %}
{% block content %}
{% if error %}
<div class='text-center' id="err">
<script>
var sound = new Howl({
src: ['{{ urlsoftware }}/resources/sounds/{{ error_sound }}'],
autoplay: true
});
sound.play();
</script>
<script>
$("#err").delay(20000).fadeOut(300);
</script>
{{ error.text }}
<img src='{{ urlsoftware }}/resources/images/{{ error_image }}'></img>
</div>
{% endif %}
<div class="container text-center" id="modulogin">
<form method="post">
<img alt="VVF" src="{{ urlsoftware }}/resources/images/logo.png" class="img-resposive"><br><br><br>
@ -41,6 +25,20 @@
</div>
<input type="submit" name="login" class="btn btn-lg btn-success" value="{{ 'Login'|t }}">
</form>
{% if error %}
<div id="err" class="alert alert-danger m-3" role="alert">
<h4 class="alert-heading">{{ error.text|t }}</h4>
<p>{{ 'Error'|t}} {{ 'code'|t}} {{ error.code }}. {{ 'Check the entered credentials and make sure they are correct'|t }}.</p>
<img src='{{ urlsoftware }}/resources/images/{{ error_image }}'></img>
</div>
<script>
var sound = new Howl({
src: ['{{ urlsoftware }}/resources/sounds/{{ error_sound }}'],
autoplay: true
});
sound.play();
$("#err").delay(20000).fadeOut(300);
</script>
{% endif %}
</div>
<br><br>
{% endblock %}

View File

@ -15,7 +15,7 @@
<thead>
<tr>
<th>{{ 'Date'|t }}</th>
<th>{{ 'Code'|t }}</th>
<th>{{ 'code'|t }}</th>
<th>{{ 'Start time'|t }}</th>
<th>{{ 'End time'|t }}</th>
<th>{{ 'Chief'|t }}</th>

View File

@ -23,7 +23,7 @@ return [
"Drivers" => "Drivers",
"People" => "People",
"Date" => "Date",
"Code" => "Code",
"code" => "code",
"Start time" => "Start time",
"End time" => "End time",
"Edit" => "Edit",
@ -79,5 +79,12 @@ return [
"Last update" => "Last update",
"Search" => "Search",
"Search results" => "Search results",
"No results found" => "No results found"
"No results found" => "No results found",
"Error" => "Error",
"Check the entered credentials and make sure they are correct" => "Check the entered credentials and make sure they are correct",
"Wrong email address" => "Wrong email address",
"Wrong password" => "Wrong password",
"Email not verified" => "Email not verified",
"Wrong username" => "Wrong username",
"Too many requests" => "Too many requests"
];

View File

@ -23,7 +23,7 @@ return [
"Drivers" => "Autisti",
"People" => "Persone",
"Date" => "Data",
"Code" => "Codice",
"code" => "codice",
"Start time" => "Tempo inizio",
"End time" => "Tempo fine",
"Edit" => "Modifica",
@ -79,5 +79,12 @@ return [
"Last update" => "Ultimo aggiornamento",
"Search" => "Cerca",
"Search results" => "Risultati della ricerca",
"No results found" => "Nessun risultato trovato"
"No results found" => "Nessun risultato trovato",
"Error" => "Errore",
"Check the entered credentials and make sure they are correct" => "Controlla le credenziali inserite e accertati che siano corrette",
"Wrong email address" => "Indirizzo email errato",
"Wrong password" => "Password errata",
"Email not verified" => "Indirizzo email non verificato",
"Wrong username" => "Username errato",
"Too many requests" => "Troppi tentativi effettuati"
];