diff --git a/app/admin/controller/system/Admin.php b/app/admin/controller/system/Admin.php index a99e4c2..cc71635 100644 --- a/app/admin/controller/system/Admin.php +++ b/app/admin/controller/system/Admin.php @@ -492,6 +492,7 @@ class Admin extends AdminController $array = parse_ini_file($env, true); $array['LANG_DEFAULT_LANG'] = $language; $content = parse_array_ini($array); + request()->session()->set('lang', $language); if (write_file($env, $content)) { return json(['success']); } diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html index ecac26e..597594a 100644 --- a/app/admin/view/index/index.html +++ b/app/admin/view/index/index.html @@ -162,6 +162,9 @@ admin.setStorage('language', obj.symbol); location.reload(); }) + + // 清空本地缓存 + admin.setConfig("TabLists", undefined); } }); diff --git a/app/functions.php b/app/functions.php index a67e9ad..33451ac 100644 --- a/app/functions.php +++ b/app/functions.php @@ -558,8 +558,8 @@ if (!function_exists('__')) { */ function __($str, $parameters = [], $domain = null, $locale = null) { - if (is_numeric($str) - || getenv('LANG_DEFAULT_LANG') === 'zh-CN') { + $lang = session('lang', 'zh-CN'); + if (is_numeric($str) || strstr($lang, 'zh-CN')) { return $str; } diff --git a/public/static/system/module/admin.js b/public/static/system/module/admin.js index b905e31..2762c39 100644 --- a/public/static/system/module/admin.js +++ b/public/static/system/module/admin.js @@ -137,7 +137,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl , setBreadHtml: function () { var b = '
'; - b += ' ' + '主页' + ''; + b += ' ' + i18n.prop('主页') + ''; b += ' '; b += ' Dashboard'; b += ' ';