diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-08-18 14:41:09 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-08-18 14:41:09 +0200 |
| commit | 051f7fb28c312519419f41025c9a83b6befb91bc (patch) | |
| tree | 6bb036ee7a0b9cbbd4a946b9430efcc730e6cc56 | |
| parent | 79666a3046035a6871cb56927ef6356eb30d7528 (diff) | |
| parent | 9cf6bac1a502d1418834f4f7619d40eb65378c60 (diff) | |
| download | wallabag-051f7fb28c312519419f41025c9a83b6befb91bc.tar.gz wallabag-051f7fb28c312519419f41025c9a83b6befb91bc.tar.zst wallabag-051f7fb28c312519419f41025c9a83b6befb91bc.zip | |
Merge pull request #783 from wallabag/message-after-login
#763 fix to display the login successful message with the translation
| -rwxr-xr-x | inc/poche/Poche.class.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 098dd7c1..3e9c2991 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
| @@ -524,6 +524,14 @@ class Poche | |||
| 524 | $longlastingsession = isset($_POST['longlastingsession']); | 524 | $longlastingsession = isset($_POST['longlastingsession']); |
| 525 | $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); | 525 | $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); |
| 526 | Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); | 526 | Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); |
| 527 | |||
| 528 | # reload l10n | ||
| 529 | $language = $user['config']['language']; | ||
| 530 | @putenv('LC_ALL=' . $language); | ||
| 531 | setlocale(LC_ALL, $language); | ||
| 532 | bindtextdomain($language, LOCALE); | ||
| 533 | textdomain($language); | ||
| 534 | |||
| 527 | $this->messages->add('s', _('welcome to your wallabag')); | 535 | $this->messages->add('s', _('welcome to your wallabag')); |
| 528 | Tools::logm('login successful'); | 536 | Tools::logm('login successful'); |
| 529 | Tools::redirect($referer); | 537 | Tools::redirect($referer); |