diff --git a/convention.php b/convention.php index 0e102917..751382da 100644 --- a/convention.php +++ b/convention.php @@ -25,6 +25,8 @@ return [ 'default_timezone' => 'PRC', // 是否开启多语言 'lang_switch_on' => false, + // 支持的多语言列表 + 'lang_list' => ['zh-cn'], // +---------------------------------------------------------------------- // | 模块设置 diff --git a/library/think/lang.php b/library/think/lang.php index 35529426..a5adb6b8 100644 --- a/library/think/lang.php +++ b/library/think/lang.php @@ -17,10 +17,8 @@ class Lang private static $lang = []; // 语言作用域 private static $range = 'zh-cn'; - // 语言列表 - private static $list = []; // 语言变量 - private static $var = 'l'; + private static $var = 'lang'; // 设定语言参数的作用域(语言) public static function range($range = '') @@ -122,7 +120,7 @@ class Lang $langSet = $matches[1]; \think\Cookie::set('think_language', $langSet, 3600); } - if (false !== stripos(self::$list, $langSet)) { + if (in_array($langSet, \think\Config::get('lang_list'))) { // 合法的语言 self::$range = $langSet; }