mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-03-01 17:01:00 +00:00
Code Issues Projects Releases Wiki Activity

couple improvements, translations

Browse source
This commit is contained in:
Thomas Citharel 2015-02-13 19:39:48 +01:00
parent 0eae6d14b8
commit f2321633b9
7 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inc/poche/Poche.class.php
View file

@ -93,7 +93,9 @@ class Poche
_('This is an automatically generated message, no one will answer if you respond to it.'); _('This is an automatically generated message, no one will answer if you respond to it.');
// if external (public) registration // 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 = $internalRegistration ? $body_internal : $body;
$body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) $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')); $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'); 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 <a href="?logout">logout ?</a>'), $newUsername)); if (\Session::isLogged()) {
$this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
}
Tools::redirect(); Tools::redirect();
} }
else { else {

2
inc/poche/Routing.class.php
View file

@ -72,7 +72,7 @@ class Routing
Tools::logm('register'); Tools::logm('register');
$tplFile = Tools::getTplFile('register'); $tplFile = Tools::getTplFile('register');
} elseif (ALLOW_REGISTER && isset($_GET['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(); Tools::redirect();
} elseif(isset($_SERVER['PHP_AUTH_USER'])) { } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) { if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {

3
inc/poche/config.inc.default.php
View file

@ -33,8 +33,6 @@
@define ('MODE_DEMO', FALSE); @define ('MODE_DEMO', FALSE);
@define ('DEBUG_POCHE', 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. //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); @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE);
@ -63,6 +61,7 @@
// registration // registration
@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL @define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
@define ('ALLOW_REGISTER', TRUE);
// display or not print link in article view // display or not print link in article view
@define ('SHOW_PRINTLINK', '1'); @define ('SHOW_PRINTLINK', '1');

BIN
locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
View file

Binary file not shown.

3
locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
View file

@ -673,6 +673,9 @@ msgstr "Hi, %1$s"
msgid "Someone just created a wallabag account for you on %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." 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." msgid "Your login is %1$s."
msgstr "Your login is %1$s." msgstr "Your login is %1$s."

BIN
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
View file

Binary file not shown.

3
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
View file

@ -800,6 +800,9 @@ msgid "Someone just created a wallabag account for you on %1$s."
msgstr "" msgstr ""
"Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s." "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." msgid "Your login is %1$s."
msgstr "Votre identifiant is %1$s." msgstr "Votre identifiant is %1$s."