Merge pull request #814 from wallabag/fix-issue813

vendor dir is not accessible before install, sqlite db dir write check moved into db class

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 098dd7c19c16b6f1891157c32a7639ac0b10e1f1..3e9c2991f600772f523197c08300eca0b768ca73 100755 (executable)
--- 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 6f03af188dd2ea2d4aac53296c9d77a278f10a42..2a458544f0fd49b09a4b4f4bb873486db5e3216b 100755 (executable)
--- 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 505ec368e30754fe71858d8a8fdf0bb3161b56de..57a928c0b4c2a135b5bc0e716ecdc1dcb9501d89 100755 (executable)
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,7 +4,7 @@
         {% trans "Save a link" %}</h2>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <span id="add-link-result"></span>
         <input type="submit" value="{% trans "save link!" %}" />
-        <div id="add-link-result"></div>
     </form>
 </div>

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index f8238744928be9f1c15d48d8178174bf19228074..9c50786b7539db9ea26b06e8d5fe8a4c68515a8c 100755 (executable)
--- 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;
 }
 
 /* ==========================================================================