diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a91a3f8f4..e37d7c6c5 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -85,7 +85,7 @@ class Poche
if ($email != "") { // if email is filled
if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
- // if internal registration
+ // if internal registration from config screen
$body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
"\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
_('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
@@ -96,6 +96,7 @@ class Poche
$body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
"\r\n\r\n" . _("Have fun with it !");
+
$body = $internalRegistration ? $body_internal : $body;
$body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
@@ -105,6 +106,7 @@ class Poche
"From: " . $newUsername . "@" . gethostname() . "\r\n")) {
Tools::logm('The user ' . $newUsername . ' has been emailed');
$this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
+ Tools::redirect('?');
} else {
Tools::logm('A problem has been encountered while sending an email');
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 7c27856db..6750383e3 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,7 @@
@define ('PDF', FALSE);
// registration
-@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
+@define ('SEND_CONFIRMATION_EMAIL', FALSE);
@define ('ALLOW_REGISTER', TRUE);
// display or not print link in article view
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 4341e50e3..f2c8a0f6f 100644
Binary files a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo and b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 37d926f1e..73589e202 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -369,8 +369,8 @@ msgstr "Mark all the entries as read"
msgid "Return home"
msgstr "Return home"
-msgid "Back to top"
-msgstr "Back to top"
+msgid "back"
+msgstr "back"
msgid "Mark as read"
msgstr "Mark as read"
@@ -435,6 +435,9 @@ msgstr "Save a Link"
msgid "back to home"
msgstr "Back to Home"
+msgid "back to login"
+msgstr "back to login"
+
msgid "toggle mark as read"
msgstr "Toggle mark as read"
@@ -705,8 +708,12 @@ msgstr ""
"The new user %1$s has been sent an email at %2$s. You may have to check spam "
"folder."
-msgid "A problem has been encountered while sending the confirmation email"
-msgstr "A problem has been encountered while sending an confirmation email"
+msgid ""
+"A problem has been encountered while sending the confirmation email, but the "
+"user was created."
+msgstr ""
+"A problem has been encountered while sending an confirmation email, but the "
+"user was created."
msgid "The server did not authorize sending a confirmation email"
msgstr "The server did not authorize sending a confirmation email"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index 1004c1a07..1f1995b85 100644
Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index e0ee574ed..526a44a33 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -67,6 +67,9 @@ msgstr "Se connecter"
msgid "back to home"
msgstr "retour à l'accueil"
+msgid "back"
+msgstr "retour"
+
msgid "favorites"
msgstr "favoris"
@@ -357,6 +360,9 @@ msgstr "Tweet"
msgid "Email"
msgstr "E-mail"
+msgid "Email (not required)"
+msgstr "E-mail (non requis)"
+
msgid "shaarli"
msgstr "Shaarli"
@@ -835,8 +841,12 @@ msgstr ""
msgid "A problem has been encountered while sending the confirmation email"
msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
-msgid "The server did not authorize sending a confirmation email"
-msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation"
+msgid ""
+"The server did not authorize sending a confirmation email, but the user was "
+"created."
+msgstr ""
+"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
+"l'utilisateur a été créé."
msgid ""
"The user was created, but no email was sent because email was not filled in"
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 7906cc203..d941ca936 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -26,14 +26,14 @@