Verified Commit 7ef7ae08 authored by Luc Didry's avatar Luc Didry

Fix #31 Add login in forgot password mail + update trads (add hungarian)

parent 3b641fee
......@@ -353,7 +353,8 @@ sub forgot_password {
} elsif ($user->confirmed) {
$user = $user->renew_token();
my $subject = $c->l('Password renewal');
my $data = $c->l("Someone asked to renew your password on %1.\n", $c->url_for('/')->to_abs->to_string);
my $data = $c->l('Hello %1,', $user->login)."\n\n";
$data .= $c->l("Someone asked to renew your password on %1.\n", $c->url_for('/')->to_abs->to_string);
$data .= $c->l('If it\'s you, please click on this link: %1', $c->url_for('renew_password', {token => $user->token})->to_abs->to_string);
$data .= "\n-- \n";
$data .= $c->l("Kind regards\n");
......
......@@ -101,7 +101,7 @@ msgstr ""
"Eine E-Mail wurde an %1 gesendet für deinen Vorgang zur Accountlöschung."
#. ($mail)
#: lib/Dolomon/Controller/Users.pm:369 lib/Dolomon/Controller/Users.pm:458
#: lib/Dolomon/Controller/Users.pm:370 lib/Dolomon/Controller/Users.pm:459
msgid "An email has been sent to %1 for your password renewal."
msgstr "Eine E-Mail wurde an %1 für deine Passworterneuerung."
......@@ -153,7 +153,7 @@ msgstr "Authentifikation"
msgid "Author"
msgstr "Autor"
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:408 lib/Dolomon/Controller/Users.pm:539 lib/Dolomon/Controller/Users.pm:82
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:409 lib/Dolomon/Controller/Users.pm:540 lib/Dolomon/Controller/Users.pm:82
msgid "Bad CSRF token!"
msgstr "Falscher CSRF Token!"
......@@ -282,7 +282,7 @@ msgstr "Erstellt am"
msgid "Dashboard"
msgstr "Dashboard"
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:614
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:615
msgid "Default"
msgstr "Standard"
......@@ -393,11 +393,11 @@ msgstr "E-Mail"
msgid "Email address"
msgstr "E-Mail Adresse"
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:562
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:563
msgid "Email address already used. Choose another one."
msgstr "E-Mail-Adresse ist bereits in Benutzung. Wähle eine andere."
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:375 lib/Dolomon/Controller/Users.pm:384 lib/Dolomon/Controller/Users.pm:406 lib/Dolomon/Controller/Users.pm:420 lib/Dolomon/Controller/Users.pm:437 lib/Dolomon/Controller/Users.pm:465 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:487 lib/Dolomon/Controller/Users.pm:510 lib/Dolomon/Controller/Users.pm:537 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:580 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:376 lib/Dolomon/Controller/Users.pm:385 lib/Dolomon/Controller/Users.pm:407 lib/Dolomon/Controller/Users.pm:421 lib/Dolomon/Controller/Users.pm:438 lib/Dolomon/Controller/Users.pm:466 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:488 lib/Dolomon/Controller/Users.pm:511 lib/Dolomon/Controller/Users.pm:538 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:581 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
msgid "Error"
msgstr "Fehler"
......@@ -430,6 +430,11 @@ msgstr "Freies Feld"
msgid "Go"
msgstr "Los"
#. ($user->login)
#: lib/Dolomon/Controller/Users.pm:356
msgid "Hello %1,"
msgstr ""
#: themes/default/templates/js/i18n.js.ep:3
msgid "Help"
msgstr "Hilfe"
......@@ -463,7 +468,7 @@ msgid "I forgot my password"
msgstr "Ich habe mein Passwort vergessen"
#. ($c->url_for('renew_password', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:357
#: lib/Dolomon/Controller/Users.pm:358
msgid "If it's you, please click on this link: %1"
msgstr "Wenn du es warst, klicke bitte auf diesen Link: %1"
......@@ -502,7 +507,7 @@ msgstr "Es steht für DOwnLOad MONitor."
msgid "It's quite simple:"
msgstr "Es ist recht einfach:"
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:358 lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:359 lib/Dolomon/Controller/Users.pm:448 lib/Dolomon/Controller/Users.pm:632
msgid "Kind regards\n"
msgstr "Viele Grüße\n"
......@@ -510,7 +515,7 @@ msgstr "Viele Grüße\n"
msgid "LDAP"
msgstr "LDAP"
#: themes/default/templates/partial/change_lang.html.ep:8
#: themes/default/templates/partial/change_lang.html.ep:4
msgid "Language"
msgstr "Sprache"
......@@ -549,7 +554,7 @@ msgstr "Lädt…"
msgid "Login"
msgstr "Login"
#: lib/Dolomon/Controller/Users.pm:557
#: lib/Dolomon/Controller/Users.pm:558
msgid "Login already taken. Choose another one."
msgstr "Login ist bereits in Benutzung. Wähle einen anderen."
......@@ -557,7 +562,7 @@ msgstr "Login ist bereits in Benutzung. Wähle einen anderen."
msgid "Login or email"
msgstr "Login oder E-Mail"
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:112
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:115
msgid "Logout"
msgstr "Ausloggen"
......@@ -643,11 +648,11 @@ msgid "Per year"
msgstr ""
#. ($c->url_for('confirm', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:446 lib/Dolomon/Controller/Users.pm:630
#: lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
msgid "Please click on this link: %1"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "Please confirm your email address"
msgstr ""
......@@ -659,7 +664,7 @@ msgstr ""
msgid "Please wait"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:574
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:575
msgid "Please, choose a password with at least 8 characters."
msgstr "Bitte wähle ein Passwort mit mindestens 8 Zeichen."
......@@ -733,7 +738,7 @@ msgid "Someone asked to delete your account on %1.\n"
msgstr "Jemand beantragte deinen Account auf %1 zu löschen.\n"
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:355
#: lib/Dolomon/Controller/Users.pm:356
msgid "Someone asked to renew your password on %1.\n"
msgstr ""
......@@ -780,7 +785,7 @@ msgstr "Starte den Graphen ab"
msgid "Stop graph at"
msgstr "Stoppe den Graphen ab"
#: themes/default/templates/partial/navbar.html.ep:115
#: themes/default/templates/partial/navbar.html.ep:113
msgid "Stop impersonating"
msgstr ""
......@@ -828,7 +833,7 @@ msgstr ""
msgid "The account %1 will be deleted in a short time."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:377
#: lib/Dolomon/Controller/Users.pm:378
msgid ""
"The account linked to this email address is not confirmed. Please confirm "
"the account."
......@@ -964,7 +969,7 @@ msgstr ""
msgid "The new name is the same as the previous: %1."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:570
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:571
msgid "The passwords does not match."
msgstr "Die Passwörter stimmen nicht überein."
......@@ -1004,11 +1009,11 @@ msgstr ""
msgid "The url is not a valid http, https, ftp or ftps URL."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:439 lib/Dolomon/Controller/Users.pm:489
#: lib/Dolomon/Controller/Users.pm:440 lib/Dolomon/Controller/Users.pm:490
msgid "This account has already been confirmed."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:422 lib/Dolomon/Controller/Users.pm:566
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:423 lib/Dolomon/Controller/Users.pm:567
msgid "This email address is not valid."
msgstr "Diese E-Mail-Adresse ist nicht gültig."
......@@ -1022,7 +1027,7 @@ msgid "This is a LDAP account, you can't change your password here."
msgstr ""
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "This is the final step for your registration on %1.\n"
msgstr ""
......@@ -1106,7 +1111,7 @@ msgstr ""
msgid "Unable to find an account with this id."
msgstr "Es gibt keinen Account mit dieser ID."
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:512 lib/Dolomon/Controller/Users.pm:59
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:513 lib/Dolomon/Controller/Users.pm:59
msgid "Unable to find an account with this token."
msgstr "Es gibt keinen Account mit diesem Token"
......@@ -1114,7 +1119,7 @@ msgstr "Es gibt keinen Account mit diesem Token"
msgid "Unable to generate the zip file. Please contact the administrator"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:386 lib/Dolomon/Controller/Users.pm:467
#: lib/Dolomon/Controller/Users.pm:387 lib/Dolomon/Controller/Users.pm:468
msgid "Unable to retrieve an account linked to that email address."
msgstr ""
......@@ -1188,7 +1193,7 @@ msgstr ""
msgid "You already have that URL in the dolos of this category."
msgstr ""
#: lib/Dolomon.pm:444
#: lib/Dolomon.pm:338
msgid "You are not authenticated or have not valid application credentials"
msgstr ""
......@@ -1228,7 +1233,7 @@ msgstr ""
msgid "You have been successfully disconnected."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:624
#: lib/Dolomon/Controller/Users.pm:625
msgid ""
"You have been successfully registered. You will receive a mail containing a "
"link to finish your registration."
......@@ -1256,7 +1261,7 @@ msgstr ""
msgid "Your account details have been updated."
msgstr "Deine Accountdetails wurden aktualisiert."
#: lib/Dolomon/Controller/Users.pm:498
#: lib/Dolomon/Controller/Users.pm:499
msgid "Your account is now confirmed. You can now login."
msgstr ""
......
......@@ -98,7 +98,7 @@ msgid "An email has been sent to %1 for your account deletion."
msgstr ""
#. ($mail)
#: lib/Dolomon/Controller/Users.pm:369 lib/Dolomon/Controller/Users.pm:458
#: lib/Dolomon/Controller/Users.pm:370 lib/Dolomon/Controller/Users.pm:459
msgid "An email has been sent to %1 for your password renewal."
msgstr ""
......@@ -146,7 +146,7 @@ msgstr ""
msgid "Author"
msgstr ""
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:408 lib/Dolomon/Controller/Users.pm:539 lib/Dolomon/Controller/Users.pm:82
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:409 lib/Dolomon/Controller/Users.pm:540 lib/Dolomon/Controller/Users.pm:82
msgid "Bad CSRF token!"
msgstr ""
......@@ -267,7 +267,7 @@ msgstr ""
msgid "Dashboard"
msgstr ""
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:614
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:615
msgid "Default"
msgstr ""
......@@ -361,11 +361,11 @@ msgstr ""
msgid "Email address"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:562
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:563
msgid "Email address already used. Choose another one."
msgstr ""
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:375 lib/Dolomon/Controller/Users.pm:384 lib/Dolomon/Controller/Users.pm:406 lib/Dolomon/Controller/Users.pm:420 lib/Dolomon/Controller/Users.pm:437 lib/Dolomon/Controller/Users.pm:465 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:487 lib/Dolomon/Controller/Users.pm:510 lib/Dolomon/Controller/Users.pm:537 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:580 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:376 lib/Dolomon/Controller/Users.pm:385 lib/Dolomon/Controller/Users.pm:407 lib/Dolomon/Controller/Users.pm:421 lib/Dolomon/Controller/Users.pm:438 lib/Dolomon/Controller/Users.pm:466 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:488 lib/Dolomon/Controller/Users.pm:511 lib/Dolomon/Controller/Users.pm:538 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:581 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
msgid "Error"
msgstr ""
......@@ -397,6 +397,11 @@ msgstr ""
msgid "Go"
msgstr ""
#. ($user->login)
#: lib/Dolomon/Controller/Users.pm:356
msgid "Hello %1,"
msgstr ""
#: themes/default/templates/js/i18n.js.ep:3
msgid "Help"
msgstr ""
......@@ -430,7 +435,7 @@ msgid "I forgot my password"
msgstr ""
#. ($c->url_for('renew_password', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:357
#: lib/Dolomon/Controller/Users.pm:358
msgid "If it's you, please click on this link: %1"
msgstr ""
......@@ -467,7 +472,7 @@ msgstr ""
msgid "It's quite simple:"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:358 lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:359 lib/Dolomon/Controller/Users.pm:448 lib/Dolomon/Controller/Users.pm:632
msgid "Kind regards\n"
msgstr ""
......@@ -475,7 +480,7 @@ msgstr ""
msgid "LDAP"
msgstr ""
#: themes/default/templates/partial/change_lang.html.ep:8
#: themes/default/templates/partial/change_lang.html.ep:4
msgid "Language"
msgstr ""
......@@ -514,7 +519,7 @@ msgstr ""
msgid "Login"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:557
#: lib/Dolomon/Controller/Users.pm:558
msgid "Login already taken. Choose another one."
msgstr ""
......@@ -522,7 +527,7 @@ msgstr ""
msgid "Login or email"
msgstr ""
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:112
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:115
msgid "Logout"
msgstr ""
......@@ -607,11 +612,11 @@ msgid "Per year"
msgstr ""
#. ($c->url_for('confirm', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:446 lib/Dolomon/Controller/Users.pm:630
#: lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
msgid "Please click on this link: %1"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "Please confirm your email address"
msgstr ""
......@@ -623,7 +628,7 @@ msgstr ""
msgid "Please wait"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:574
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:575
msgid "Please, choose a password with at least 8 characters."
msgstr ""
......@@ -697,7 +702,7 @@ msgid "Someone asked to delete your account on %1.\n"
msgstr ""
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:355
#: lib/Dolomon/Controller/Users.pm:356
msgid "Someone asked to renew your password on %1.\n"
msgstr ""
......@@ -744,7 +749,7 @@ msgstr ""
msgid "Stop graph at"
msgstr ""
#: themes/default/templates/partial/navbar.html.ep:115
#: themes/default/templates/partial/navbar.html.ep:113
msgid "Stop impersonating"
msgstr ""
......@@ -785,7 +790,7 @@ msgstr ""
msgid "The account %1 will be deleted in a short time."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:377
#: lib/Dolomon/Controller/Users.pm:378
msgid "The account linked to this email address is not confirmed. Please confirm the account."
msgstr ""
......@@ -911,7 +916,7 @@ msgstr ""
msgid "The new name is the same as the previous: %1."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:570
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:571
msgid "The passwords does not match."
msgstr ""
......@@ -950,11 +955,11 @@ msgstr ""
msgid "The url is not a valid http, https, ftp or ftps URL."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:439 lib/Dolomon/Controller/Users.pm:489
#: lib/Dolomon/Controller/Users.pm:440 lib/Dolomon/Controller/Users.pm:490
msgid "This account has already been confirmed."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:422 lib/Dolomon/Controller/Users.pm:566
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:423 lib/Dolomon/Controller/Users.pm:567
msgid "This email address is not valid."
msgstr ""
......@@ -967,7 +972,7 @@ msgid "This is a LDAP account, you can't change your password here."
msgstr ""
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "This is the final step for your registration on %1.\n"
msgstr ""
......@@ -1041,7 +1046,7 @@ msgstr ""
msgid "Unable to find an account with this id."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:512 lib/Dolomon/Controller/Users.pm:59
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:513 lib/Dolomon/Controller/Users.pm:59
msgid "Unable to find an account with this token."
msgstr ""
......@@ -1049,7 +1054,7 @@ msgstr ""
msgid "Unable to generate the zip file. Please contact the administrator"
msgstr ""
#: lib/Dolomon/Controller/Users.pm:386 lib/Dolomon/Controller/Users.pm:467
#: lib/Dolomon/Controller/Users.pm:387 lib/Dolomon/Controller/Users.pm:468
msgid "Unable to retrieve an account linked to that email address."
msgstr ""
......@@ -1121,7 +1126,7 @@ msgstr ""
msgid "You already have that URL in the dolos of this category."
msgstr ""
#: lib/Dolomon.pm:444
#: lib/Dolomon.pm:338
msgid "You are not authenticated or have not valid application credentials"
msgstr ""
......@@ -1153,7 +1158,7 @@ msgstr ""
msgid "You have been successfully disconnected."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:624
#: lib/Dolomon/Controller/Users.pm:625
msgid "You have been successfully registered. You will receive a mail containing a link to finish your registration."
msgstr ""
......@@ -1177,7 +1182,7 @@ msgstr ""
msgid "Your account details have been updated."
msgstr ""
#: lib/Dolomon/Controller/Users.pm:498
#: lib/Dolomon/Controller/Users.pm:499
msgid "Your account is now confirmed. You can now login."
msgstr ""
......
......@@ -6,7 +6,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2018-03-01 01:04+0000\n"
"PO-Revision-Date: 2018-06-01 08:55+0000\n"
"Last-Translator: Luc Didry <luc@framasoft.org>\n"
"Language-Team: English\n"
"Language: en\n"
......@@ -104,7 +104,7 @@ msgid "An email has been sent to %1 for your account deletion."
msgstr "An email has been sent to %1 for your account deletion."
#. ($mail)
#: lib/Dolomon/Controller/Users.pm:369 lib/Dolomon/Controller/Users.pm:458
#: lib/Dolomon/Controller/Users.pm:370 lib/Dolomon/Controller/Users.pm:459
msgid "An email has been sent to %1 for your password renewal."
msgstr "An email has been sent to %1 for your password renewal."
......@@ -160,7 +160,7 @@ msgstr "Authentication"
msgid "Author"
msgstr "Author"
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:408 lib/Dolomon/Controller/Users.pm:539 lib/Dolomon/Controller/Users.pm:82
#: lib/Dolomon/Controller/Misc.pm:47 lib/Dolomon/Controller/Users.pm:240 lib/Dolomon/Controller/Users.pm:319 lib/Dolomon/Controller/Users.pm:409 lib/Dolomon/Controller/Users.pm:540 lib/Dolomon/Controller/Users.pm:82
msgid "Bad CSRF token!"
msgstr "Bad CSRF token!"
......@@ -291,7 +291,7 @@ msgstr "Created at"
msgid "Dashboard"
msgstr "Dashboard"
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:614
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:615
msgid "Default"
msgstr "Default"
......@@ -408,11 +408,11 @@ msgstr "Email"
msgid "Email address"
msgstr "Email address"
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:562
#: lib/Dolomon/Controller/Users.pm:114 lib/Dolomon/Controller/Users.pm:563
msgid "Email address already used. Choose another one."
msgstr "Email address already used. Choose another one."
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:375 lib/Dolomon/Controller/Users.pm:384 lib/Dolomon/Controller/Users.pm:406 lib/Dolomon/Controller/Users.pm:420 lib/Dolomon/Controller/Users.pm:437 lib/Dolomon/Controller/Users.pm:465 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:487 lib/Dolomon/Controller/Users.pm:510 lib/Dolomon/Controller/Users.pm:537 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:580 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
#: lib/Dolomon/Controller/Admin.pm:139 lib/Dolomon/Controller/Categories.pm:59 lib/Dolomon/Controller/Dolos.pm:40 lib/Dolomon/Controller/Dolos.pm:534 lib/Dolomon/Controller/Dolos.pm:543 lib/Dolomon/Controller/Misc.pm:45 lib/Dolomon/Controller/Misc.pm:73 lib/Dolomon/Controller/Tags.pm:64 lib/Dolomon/Controller/Users.pm:120 lib/Dolomon/Controller/Users.pm:169 lib/Dolomon/Controller/Users.pm:17 lib/Dolomon/Controller/Users.pm:193 lib/Dolomon/Controller/Users.pm:238 lib/Dolomon/Controller/Users.pm:296 lib/Dolomon/Controller/Users.pm:317 lib/Dolomon/Controller/Users.pm:331 lib/Dolomon/Controller/Users.pm:348 lib/Dolomon/Controller/Users.pm:376 lib/Dolomon/Controller/Users.pm:385 lib/Dolomon/Controller/Users.pm:407 lib/Dolomon/Controller/Users.pm:421 lib/Dolomon/Controller/Users.pm:438 lib/Dolomon/Controller/Users.pm:466 lib/Dolomon/Controller/Users.pm:48 lib/Dolomon/Controller/Users.pm:488 lib/Dolomon/Controller/Users.pm:511 lib/Dolomon/Controller/Users.pm:538 lib/Dolomon/Controller/Users.pm:57 lib/Dolomon/Controller/Users.pm:581 lib/Dolomon/Controller/Users.pm:80 lib/Dolomon/Controller/Users.pm:93 themes/default/templates/error.html.ep:3
msgid "Error"
msgstr "Error"
......@@ -444,6 +444,11 @@ msgstr "Free field"
msgid "Go"
msgstr "Go"
#. ($user->login)
#: lib/Dolomon/Controller/Users.pm:356
msgid "Hello %1,"
msgstr "Hello %1,"
#: themes/default/templates/js/i18n.js.ep:3
msgid "Help"
msgstr "Help"
......@@ -477,7 +482,7 @@ msgid "I forgot my password"
msgstr "I forgot my password"
#. ($c->url_for('renew_password', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:357
#: lib/Dolomon/Controller/Users.pm:358
msgid "If it's you, please click on this link: %1"
msgstr "If it's you, please click on this link: %1"
......@@ -514,7 +519,7 @@ msgstr "It means DOwnLOad MONitor."
msgid "It's quite simple:"
msgstr "It's quite simple:"
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:358 lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
#: lib/Dolomon/Controller/Users.pm:205 lib/Dolomon/Controller/Users.pm:359 lib/Dolomon/Controller/Users.pm:448 lib/Dolomon/Controller/Users.pm:632
msgid "Kind regards\n"
msgstr "Kind regards\n"
......@@ -522,7 +527,7 @@ msgstr "Kind regards\n"
msgid "LDAP"
msgstr "LDAP"
#: themes/default/templates/partial/change_lang.html.ep:8
#: themes/default/templates/partial/change_lang.html.ep:4
msgid "Language"
msgstr "Language"
......@@ -561,7 +566,7 @@ msgstr "Loading…"
msgid "Login"
msgstr "Login"
#: lib/Dolomon/Controller/Users.pm:557
#: lib/Dolomon/Controller/Users.pm:558
msgid "Login already taken. Choose another one."
msgstr "Login already taken. Choose another one."
......@@ -569,7 +574,7 @@ msgstr "Login already taken. Choose another one."
msgid "Login or email"
msgstr "Login or email"
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:112
#: lib/Dolomon/Controller/Misc.pm:93 themes/default/templates/partial/navbar.html.ep:115
msgid "Logout"
msgstr "Logout"
......@@ -657,11 +662,11 @@ msgid "Per year"
msgstr "Per year"
#. ($c->url_for('confirm', {token => $user->token})
#: lib/Dolomon/Controller/Users.pm:446 lib/Dolomon/Controller/Users.pm:630
#: lib/Dolomon/Controller/Users.pm:447 lib/Dolomon/Controller/Users.pm:631
msgid "Please click on this link: %1"
msgstr "Please click on this link: %1"
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "Please confirm your email address"
msgstr "Please confirm your email address"
......@@ -673,7 +678,7 @@ msgstr "Please contact the administrator."
msgid "Please wait"
msgstr "Please wait"
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:574
#: lib/Dolomon/Controller/Users.pm:163 lib/Dolomon/Controller/Users.pm:258 lib/Dolomon/Controller/Users.pm:575
msgid "Please, choose a password with at least 8 characters."
msgstr "Please, choose a password with at least 8 characters."
......@@ -747,7 +752,7 @@ msgid "Someone asked to delete your account on %1.\n"
msgstr "Someone asked to delete your account on %1.\n"
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:355
#: lib/Dolomon/Controller/Users.pm:356
msgid "Someone asked to renew your password on %1.\n"
msgstr "Someone asked to renew your password on %1.\n"
......@@ -794,7 +799,7 @@ msgstr "Start graph at"
msgid "Stop graph at"
msgstr "Stop graph at"
#: themes/default/templates/partial/navbar.html.ep:115
#: themes/default/templates/partial/navbar.html.ep:113
msgid "Stop impersonating"
msgstr "Stop impersonating"
......@@ -849,7 +854,7 @@ msgstr ""
msgid "The account %1 will be deleted in a short time."
msgstr "The account %1 will be deleted in a short time."
#: lib/Dolomon/Controller/Users.pm:377
#: lib/Dolomon/Controller/Users.pm:378
msgid ""
"The account linked to this email address is not confirmed. Please confirm "
"the account."
......@@ -995,7 +1000,7 @@ msgstr "The name %1 is already taken for the category you choose."
msgid "The new name is the same as the previous: %1."
msgstr "The new name is the same as the previous: %1."
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:570
#: lib/Dolomon/Controller/Users.pm:159 lib/Dolomon/Controller/Users.pm:254 lib/Dolomon/Controller/Users.pm:571
msgid "The passwords does not match."
msgstr "The passwords does not match."
......@@ -1036,11 +1041,11 @@ msgstr ""
msgid "The url is not a valid http, https, ftp or ftps URL."
msgstr "The url is not a valid http, https, ftp or ftps URL."
#: lib/Dolomon/Controller/Users.pm:439 lib/Dolomon/Controller/Users.pm:489
#: lib/Dolomon/Controller/Users.pm:440 lib/Dolomon/Controller/Users.pm:490
msgid "This account has already been confirmed."
msgstr "This account has already been confirmed."
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:422 lib/Dolomon/Controller/Users.pm:566
#: lib/Dolomon/Controller/Users.pm:109 lib/Dolomon/Controller/Users.pm:333 lib/Dolomon/Controller/Users.pm:423 lib/Dolomon/Controller/Users.pm:567
msgid "This email address is not valid."
msgstr "This email address is not valid."
......@@ -1055,7 +1060,7 @@ msgid "This is a LDAP account, you can't change your password here."
msgstr "This is a LDAP account, you can't change your password here."
#. ($c->url_for('/')
#: lib/Dolomon/Controller/Users.pm:444 lib/Dolomon/Controller/Users.pm:628
#: lib/Dolomon/Controller/Users.pm:445 lib/Dolomon/Controller/Users.pm:629
msgid "This is the final step for your registration on %1.\n"
msgstr "This is the final step for your registration on %1.\n"
......@@ -1149,7 +1154,7 @@ msgstr "Unable to create tag %1. Please contact the administrator."
msgid "Unable to find an account with this id."
msgstr "Unable to find an account with this id."
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:512 lib/Dolomon/Controller/Users.pm:59
#: lib/Dolomon/Controller/Users.pm:291 lib/Dolomon/Controller/Users.pm:513 lib/Dolomon/Controller/Users.pm:59
msgid "Unable to find an account with this token."
msgstr "Unable to find an account with this token."
......@@ -1157,7 +1162,7 @@ msgstr "Unable to find an account with this token."
msgid "Unable to generate the zip file. Please contact the administrator"
msgstr "Unable to generate the zip file. Please contact the administrator"
#: lib/Dolomon/Controller/Users.pm:386 lib/Dolomon/Controller/Users.pm:467
#: lib/Dolomon/Controller/Users.pm:387 lib/Dolomon/Controller/Users.pm:468
msgid "Unable to retrieve an account linked to that email address."
msgstr "Unable to retrieve an account linked to that email address."
......@@ -1233,7 +1238,7 @@ msgstr "You already have a dolo which dolomon URL is %1."
msgid "You already have that URL in the dolos of this category."
msgstr "You already have that URL in the dolos of this category."
#: lib/Dolomon.pm:444
#: lib/Dolomon.pm:338
msgid "You are not authenticated or have not valid application credentials"
msgstr "You are not authenticated or have not valid application credential"
......@@ -1281,7 +1286,7 @@ msgstr "You have been successfully authenticated."
msgid "You have been successfully disconnected."
msgstr "You have been successfully disconnected."
#: lib/Dolomon/Controller/Users.pm:624
#: lib/Dolomon/Controller/Users.pm:625
msgid ""
"You have been successfully registered. You will receive a mail containing a "
"link to finish your registration."
......@@ -1313,7 +1318,7 @@ msgstr "You weren't impersonating anyone."
msgid "Your account details have been updated."
msgstr "Your account details have been updated."
#: lib/Dolomon/Controller/Users.pm:498
#: lib/Dolomon/Controller/Users.pm:499
msgid "Your account is now confirmed. You can now login."
msgstr "Your account is now confirmed. You can now login."
......
......@@ -6,7 +6,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2018-03-01 01:04+0000\n"
"PO-Revision-Date: 2018-06-01 08:55+0000\n"
"Last-Translator: Luc Didry <luc@framasoft.org>\n"
"Language-Team: English\n"
"Language: en_US\n"
......@@ -104,7 +104,7 @@ msgid "An email has been sent to %1 for your account deletion."
msgstr "An email has been sent to %1 for your account deletion."
#. ($mail)
#: lib/Dolomon/Controller/Users.pm:369 lib/Dolomon/Controller/Users.pm:458
#: lib/Dolomon/Controller/Users.pm:370 lib/Dolomon/Controller/Users.pm:459