Fix language change requiring a logout to be applied (still requires a second page reload)

This commit is contained in:
Flavio Copes
2015-08-18 16:04:00 +02:00
parent 9a0a0f7f9d
commit 9976e2c72d

View File

@@ -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']);
}
}