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 { ...@@ -353,7 +353,8 @@ sub forgot_password {
} elsif ($user->confirmed) { } elsif ($user->confirmed) {
$user = $user->renew_token(); $user = $user->renew_token();
my $subject = $c->l('Password renewal'); 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 .= $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 .= "\n-- \n";
$data .= $c->l("Kind regards\n"); $data .= $c->l("Kind regards\n");
......
This diff is collapsed.
...@@ -98,7 +98,7 @@ msgid "An email has been sent to %1 for your account deletion." ...@@ -98,7 +98,7 @@ msgid "An email has been sent to %1 for your account deletion."
msgstr "" msgstr ""
#. ($mail) #. ($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." msgid "An email has been sent to %1 for your password renewal."
msgstr "" msgstr ""
...@@ -146,7 +146,7 @@ msgstr "" ...@@ -146,7 +146,7 @@ msgstr ""
msgid "Author" msgid "Author"
msgstr "" 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!" msgid "Bad CSRF token!"
msgstr "" msgstr ""
...@@ -267,7 +267,7 @@ msgstr "" ...@@ -267,7 +267,7 @@ msgstr ""
msgid "Dashboard" msgid "Dashboard"
msgstr "" msgstr ""
#: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:614 #: lib/Dolomon.pm:186 lib/Dolomon/Controller/Users.pm:615
msgid "Default" msgid "Default"
msgstr "" msgstr ""
...@@ -361,11 +361,11 @@ msgstr "" ...@@ -361,11 +361,11 @@ msgstr ""
msgid "Email address" msgid "Email address"
msgstr "" 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." msgid "Email address already used. Choose another one."
msgstr "" 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" msgid "Error"
msgstr "" msgstr ""
...@@ -397,6 +397,11 @@ msgstr "" ...@@ -397,6 +397,11 @@ msgstr ""
msgid "Go" msgid "Go"
msgstr "" msgstr ""
#. ($user->login)
#: lib/Dolomon/Controller/Users.pm:356
msgid "Hello %1,"
msgstr ""
#: themes/default/templates/js/i18n.js.ep:3 #: themes/default/templates/js/i18n.js.ep:3
msgid "Help" msgid "Help"
msgstr "" msgstr ""
...@@ -430,7 +435,7 @@ msgid "I forgot my password" ...@@ -430,7 +435,7 @@ msgid "I forgot my password"
msgstr "" msgstr ""
#. ($c->url_for('renew_password', {token => $user->token}) #. ($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" msgid "If it's you, please click on this link: %1"
msgstr "" msgstr ""
...@@ -467,7 +472,7 @@ msgstr "" ...@@ -467,7 +472,7 @@ msgstr ""
msgid "It's quite simple:" msgid "It's quite simple:"
msgstr "" 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" msgid "Kind regards\n"
msgstr "" msgstr ""
...@@ -475,7 +480,7 @@ msgstr "" ...@@ -475,7 +480,7 @@ msgstr ""
msgid "LDAP" msgid "LDAP"
msgstr "" msgstr ""
#: themes/default/templates/partial/change_lang.html.ep:8 #: themes/default/templates/partial/change_lang.html.ep:4
msgid "Language" msgid "Language"
msgstr "" msgstr ""
...@@ -514,7 +519,7 @@ msgstr "" ...@@ -514,7 +519,7 @@ msgstr ""
msgid "Login" msgid "Login"
msgstr "" msgstr ""
#: lib/Dolomon/Controller/Users.pm:557 #: lib/Dolomon/Controller/Users.pm:558
msgid "Login already taken. Choose another one." msgid "Login already taken. Choose another one."
msgstr "" msgstr ""
...@@ -522,7 +527,7 @@ msgstr "" ...@@ -522,7 +527,7 @@ msgstr ""
msgid "Login or email" msgid "Login or email"
msgstr "" 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" msgid "Logout"
msgstr "" msgstr ""
...@@ -607,11 +612,11 @@ msgid "Per year" ...@@ -607,11 +612,11 @@ msgid "Per year"
msgstr "" msgstr ""
#. ($c->url_for('confirm', {token => $user->token}) #. ($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" msgid "Please click on this link: %1"
msgstr "" 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" msgid "Please confirm your email address"
msgstr "" msgstr ""
...@@ -623,7 +628,7 @@ msgstr "" ...@@ -623,7 +628,7 @@ msgstr ""
msgid "Please wait" msgid "Please wait"
msgstr "" 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." msgid "Please, choose a password with at least 8 characters."
msgstr "" msgstr ""
...@@ -697,7 +702,7 @@ msgid "Someone asked to delete your account on %1.\n" ...@@ -697,7 +702,7 @@ msgid "Someone asked to delete your account on %1.\n"
msgstr "" msgstr ""
#. ($c->url_for('/') #. ($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" msgid "Someone asked to renew your password on %1.\n"
msgstr "" msgstr ""
...@@ -744,7 +749,7 @@ msgstr "" ...@@ -744,7 +749,7 @@ msgstr ""
msgid "Stop graph at" msgid "Stop graph at"
msgstr "" msgstr ""
#: themes/default/templates/partial/navbar.html.ep:115 #: themes/default/templates/partial/navbar.html.ep:113
msgid "Stop impersonating" msgid "Stop impersonating"
msgstr "" msgstr ""
...@@ -785,7 +790,7 @@ msgstr "" ...@@ -785,7 +790,7 @@ msgstr ""
msgid "The account %1 will be deleted in a short time." msgid "The account %1 will be deleted in a short time."
msgstr "" 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." msgid "The account linked to this email address is not confirmed. Please confirm the account."
msgstr "" msgstr ""
...@@ -911,7 +916,7 @@ msgstr "" ...@@ -911,7 +916,7 @@ msgstr ""
msgid "The new name is the same as the previous: %1." msgid "The new name is the same as the previous: %1."
msgstr "" 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." msgid "The passwords does not match."
msgstr "" msgstr ""
...@@ -950,11 +955,11 @@ msgstr "" ...@@ -950,11 +955,11 @@ msgstr ""
msgid "The url is not a valid http, https, ftp or ftps URL." msgid "The url is not a valid http, https, ftp or ftps URL."
msgstr "" 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." msgid "This account has already been confirmed."
msgstr "" 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." msgid "This email address is not valid."
msgstr "" msgstr ""
...@@ -967,7 +972,7 @@ msgid "This is a LDAP account, you can't change your password here." ...@@ -967,7 +972,7 @@ msgid "This is a LDAP account, you can't change your password here."
msgstr "" msgstr ""
#. ($c->url_for('/') #. ($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" msgid "This is the final step for your registration on %1.\n"
msgstr "" msgstr ""
...@@ -1041,7 +1046,7 @@ msgstr "" ...@@ -1041,7 +1046,7 @@ msgstr ""
msgid "Unable to find an account with this id." msgid "Unable to find an account with this id."
msgstr "" 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." msgid "Unable to find an account with this token."
msgstr "" msgstr ""
...@@ -1049,7 +1054,7 @@ msgstr "" ...@@ -1049,7 +1054,7 @@ msgstr ""
msgid "Unable to generate the zip file. Please contact the administrator" msgid "Unable to generate the zip file. Please contact the administrator"
msgstr "" 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." msgid "Unable to retrieve an account linked to that email address."
msgstr "" msgstr ""
...@@ -1121,7 +1126,7 @@ msgstr "" ...@@ -1121,7 +1126,7 @@ msgstr ""
msgid "You already have that URL in the dolos of this category." msgid "You already have that URL in the dolos of this category."
msgstr "" msgstr ""
#: lib/Dolomon.pm:444 #: lib/Dolomon.pm:338
msgid "You are not authenticated or have not valid application credentials" msgid "You are not authenticated or have not valid application credentials"
msgstr "" msgstr ""
...@@ -1153,7 +1158,7 @@ msgstr "" ...@@ -1153,7 +1158,7 @@ msgstr ""
msgid "You have been successfully disconnected." msgid "You have been successfully disconnected."
msgstr "" 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." msgid "You have been successfully registered. You will receive a mail containing a link to finish your registration."
msgstr "" msgstr ""
...@@ -1177,7 +1182,7 @@ msgstr "" ...@@ -1177,7 +1182,7 @@ msgstr ""
msgid "Your account details have been updated." msgid "Your account details have been updated."
msgstr "" msgstr ""
#: lib/Dolomon/Controller/Users.pm:498 #: lib/Dolomon/Controller/Users.pm:499
msgid "Your account is now confirmed. You can now login." msgid "Your account is now confirmed. You can now login."
msgstr "" msgstr ""
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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