From 9976e2c72d5c2111f9fec4c4b0f6d286521cbff3 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Tue, 18 Aug 2015 16:04:00 +0200
Subject: [PATCH] Fix language change requiring a logout to be applied (still
 requires a second page reload)

---
 classes/admin.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/classes/admin.php b/classes/admin.php
index 3dabc7d9..fd6e96fd 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -96,8 +96,6 @@ class Admin
         $this->uri = $this->grav['uri'];
         $this->session = $this->grav['session'];
         $this->user = $this->grav['user'];
-        $this->lang = $this->grav['user']->language;
-
 
         $language = $this->grav['language'];
         if ($language->enabled()) {
@@ -653,7 +651,7 @@ class Admin
      * @param $string the string to translate
      */
     public function translate($string) {
-        return $this->grav['language']->translate($string, [$this->grav['user']->authenticated ? $this->lang : 'en']);
+        return $this->grav['language']->translate($string, [$this->grav['user']->authenticated ? $this->grav['user']->language : 'en']);
     }
 
 }