Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-02-25 08:01:26 +01:00
Code Issues Packages Projects Releases Activity

Keep language setting for AJAX requests

Browse Source
This commit is contained in:
Matias Griese
2019-09-11 18:05:45 +03:00
parent 5332670ea3
commit 495ebcb42b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/plugin/Admin.php
View File

@@ -3,8 +3,6 @@
namespace Grav\Plugin\Admin;
use DateTime;
use Grav\Common\Cache;
use Grav\Common\Config\Config;
use Grav\Common\Data;
use Grav\Common\File\CompiledYamlFile;
use Grav\Common\GPM\GPM;
@@ -145,16 +143,16 @@ class Admin
// Load utility class
if ($this->multilang) {
$this->language = $language->getLanguage();
$this->language = $language->getActive() ?? '';
$this->languages_enabled = (array)$this->grav['config']->get('system.languages.supported', []);
//Set the currently active language for the admin
$languageCode = $this->grav['uri']->param('lang');
if (!$languageCode && !$this->session->admin_lang) {
$this->session->admin_lang = $language->getLanguage();
if (null === $languageCode && !$this->session->admin_lang) {
$this->session->admin_lang = $language->getActive() ?? '';
}
} else {
$this->language = 'en';
$this->language = '';
}
}
@@ -189,7 +187,7 @@ class Admin
public function getLanguage(): string
{
return $this->language;
return $this->language ?: $this->grav['language']->getLanguage() ?: 'en';
}
/**
@@ -655,7 +653,7 @@ class Admin
} else {
$languages = (array)$grav['language']->getDefault();
}
$languages = $grav['user']->authenticated ? [ $grav['user']->language ] : $languages;
$languages = $grav['user']->authenticated ? [$grav['user']->language] : $languages;
} else {
$languages = (array)$languages;
}