mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加支持的语言列表配置lang_list 默认的语言GET变量名改为lang

Browse Source
This commit is contained in:
thinkphp
2015-12-19 23:06:59 +08:00
parent 883a55bbcb
commit c277f62f6a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -25,6 +25,8 @@ return [
'default_timezone' => 'PRC', 'default_timezone' => 'PRC',
// 是否开启多语言 // 是否开启多语言
'lang_switch_on' => false, 'lang_switch_on' => false,
// 支持的多语言列表
'lang_list' => ['zh-cn'],
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | 模块设置 // | 模块设置

6
library/think/lang.php
View File

@@ -17,10 +17,8 @@ class Lang
private static $lang = []; private static $lang = [];
// 语言作用域 // 语言作用域
private static $range = 'zh-cn'; private static $range = 'zh-cn';
// 语言列表
private static $list = [];
// 语言变量 // 语言变量
private static $var = 'l'; private static $var = 'lang';
// 设定语言参数的作用域（语言） // 设定语言参数的作用域（语言）
public static function range($range = '') public static function range($range = '')
@@ -122,7 +120,7 @@ class Lang
$langSet = $matches[1]; $langSet = $matches[1];
\think\Cookie::set('think_language', $langSet, 3600); \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; self::$range = $langSet;
} }