diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 64a5c4f79..c80e5d2a9 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -524,6 +524,14 @@ class Poche $longlastingsession = isset($_POST['longlastingsession']); $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); + + # reload l10n + $language = $user['config']['language']; + @putenv('LC_ALL=' . $language); + setlocale(LC_ALL, $language); + bindtextdomain($language, LOCALE); + textdomain($language); + $this->messages->add('s', _('welcome to your wallabag')); Tools::logm('login successful'); Tools::redirect($referer); diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 6f03af188..2a458544f 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -59,7 +59,7 @@ @define ('LOCALE', ROOT . '/locale'); @define ('CACHE', ROOT . '/cache'); -@define ('PAGINATION', '10'); +@define ('PAGINATION', '12'); //limit for download of articles during import @define ('IMPORT_LIMIT', 5); diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 505ec368e..57a928c0b 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -4,7 +4,7 @@ {% trans "Save a link" %} + - diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index f82387449..9c50786b7 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -630,7 +630,7 @@ a.add-to-wallabag-link-after:after { #add-link-result { font-weight: bold; - margin-top: 10px; + font-size: 0.9em; } /* ==========================================================================