aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-06-13 10:34:34 +0200
committerThomas Citharel <tcit@tcit.fr>2015-06-13 10:34:34 +0200
commit21353e4448e9da2bc307491932a0f25adacb1aee (patch)
treebdb8bb1186c2b69216f2195dceff26065633824e
parentc57e38595e78b63e54e392d3d17ffe6d98872981 (diff)
parent3d8d7da6145de23245f59f41b1abada60ad6bed4 (diff)
downloadwallabag-21353e4448e9da2bc307491932a0f25adacb1aee.tar.gz
wallabag-21353e4448e9da2bc307491932a0f25adacb1aee.tar.zst
wallabag-21353e4448e9da2bc307491932a0f25adacb1aee.zip
Merge branch 'dev' of http://github.com/wallabag/wallabag into dev
-rwxr-xr-xinc/poche/Poche.class.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 779c04c2..baa08788 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -686,6 +686,7 @@ class Poche
686 setlocale(LC_ALL, $language); 686 setlocale(LC_ALL, $language);
687 bindtextdomain($language, LOCALE); 687 bindtextdomain($language, LOCALE);
688 textdomain($language); 688 textdomain($language);
689 bind_textdomain_codeset($language, 'UTF-8');
689 690
690 $this->messages->add('s', _('welcome to your wallabag')); 691 $this->messages->add('s', _('welcome to your wallabag'));
691 Tools::logm('login successful'); 692 Tools::logm('login successful');