From 9cf6bac1a502d1418834f4f7619d40eb65378c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:01:27 +0200 Subject: [PATCH 1/3] fix to display the login successful message with the translation --- inc/poche/Poche.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 09a9f5ff8..2b0c3bf8d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -877,6 +877,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); From 3e87066506bbbc5e0819c4f8bc7ec5b763b76303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:12:03 +0200 Subject: [PATCH 2/3] fix display of 'Done' message when we add a link from 'save a link' item --- themes/baggy/_pocheit-form.twig | 2 +- themes/baggy/css/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 6d320cd2d..711c152be 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; } /* ========================================================================== From cca9284b6a8111f5dd07bca3f8d4f266ceee3c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:14:41 +0200 Subject: [PATCH 3/3] change default pagination, set it to 12, to have a nice baggy display --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 95f727c68..d01580970 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);