From f2321633b9dcc806b3c036a742bde1e4c9bcbef9 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Feb 2015 19:39:48 +0100 Subject: [PATCH] couple improvements, translations --- inc/poche/Poche.class.php | 8 ++++++-- inc/poche/Routing.class.php | 2 +- inc/poche/config.inc.default.php | 3 +-- locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 17302 -> 17420 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 3 +++ locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 22690 -> 22813 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 3 +++ 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index cd7578e34..a91a3f8f4 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -93,7 +93,9 @@ class Poche _('This is an automatically generated message, no one will answer if you respond to it.'); // if external (public) registration - $body = "Hi, " . $newUsername . "\r\n\r\nYou've just created a wallabag account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; + $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) @@ -117,7 +119,9 @@ class Poche $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in')); } Tools::logm('The new user ' . $newUsername . ' has been installed'); - $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername)); + if (\Session::isLogged()) { + $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername)); + } Tools::redirect(); } else { diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index e9b677717..177b74d55 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -72,7 +72,7 @@ class Routing Tools::logm('register'); $tplFile = Tools::getTplFile('register'); } elseif (ALLOW_REGISTER && isset($_GET['register'])){ - $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); + $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']); Tools::redirect(); } elseif(isset($_SERVER['PHP_AUTH_USER'])) { if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) { diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index e569dddd6..7c27856db 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -33,8 +33,6 @@ @define ('MODE_DEMO', FALSE); @define ('DEBUG_POCHE', FALSE); -@define ('ALLOW_REGISTER', TRUE); - //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); @@ -63,6 +61,7 @@ // registration @define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL +@define ('ALLOW_REGISTER', TRUE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); 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 025231250ebaa376d2b3c3a7a067d9351810e2be..4341e50e33572f944c10a8ea0371781ae9b7edf7 100644 GIT binary patch delta 4640 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
U`MzTl;(v3JH`OtQd z+(XWjCFIujFpd6pXMwdLzGU0QSWfnkG2{VKL5`4JB#gXH-XiVDt!O4;)ovO3FI_+jQDPR4D9yp zxF1n)fUG2C(>BgQrM79=c-UQ>{8$a^|7C-^^n+Pe<` 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 75dad661e..37d926f1e 100644 --- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po +++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po @@ -673,6 +673,9 @@ msgstr "Hi, %1$s" msgid "Someone just created a wallabag account for you on %1$s." msgstr "Someone just created a wallabag account for you on %1$s." +msgid "You've just created a wallabag account on %1$s" +msgstr "You've just created a wallabag account on %1$s" + msgid "Your login is %1$s." msgstr "Your login is %1$s." 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 b3b2f6fed9ebafeba0bb90d7c8216628720f3ec4..1004c1a07d119063bafb8fb4b1f9e15ba045a168 100644 GIT binary patch delta 4996 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 BGJOC5 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 948a83564..e0ee574ed 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -800,6 +800,9 @@ msgid "Someone just created a wallabag account for you on %1$s." msgstr "" "Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s." +msgid "You've just created a wallabag account on %1$s" +msgstr "Vous venez juste de vous créer un compte wallabag sur %1$s" + msgid "Your login is %1$s." msgstr "Votre identifiant is %1$s."