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

改进

Browse Source
This commit is contained in:
thinkphp
2017-04-10 20:30:13 +08:00
parent f342734c91
commit 2be45bfd29
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/think/Lang.php
View File

@@ -26,7 +26,9 @@ class Lang
// 允许语言列表 // 允许语言列表
protected static $allowLangList = []; protected static $allowLangList = [];
// Accept-Language转义为对应语言包名称 系统默认配置 // Accept-Language转义为对应语言包名称 系统默认配置
private static $acceptLanguage = ['zh-hans-cn'=>'zh-cn']; protected static $acceptLanguage = [
'zh-hans-cn' => 'zh-cn',
];
// 设定当前的语言 // 设定当前的语言
public static function range($range = '') public static function range($range = '')
@@ -158,16 +160,15 @@ class Lang
if (isset($_GET[self::$langDetectVar])) { if (isset($_GET[self::$langDetectVar])) {
// url中设置了语言变量 // url中设置了语言变量
$langSet = strtolower($_GET[self::$langDetectVar]); $langSet = strtolower($_GET[self::$langDetectVar]);
} } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
// 自动侦测浏览器语言 // 自动侦测浏览器语言
preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches); preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
$langSet = strtolower($matches[1]); $langSet = strtolower($matches[1]);
$header_accept_lang_config = Config::get('header_accept_lang'); $acceptLangs = Config::get('header_accept_lang');
if(isset($header_accept_lang_config[$langSet])){ if (isset($acceptLangs[$langSet])) {
$langSet =$header_accept_lang_config[$langSet]; $langSet = $acceptLangs[$langSet];
}elseif(isset(self::$acceptLanguage[$langSet])){ } elseif (isset(self::$acceptLanguage[$langSet])) {
$langSet =self::$acceptLanguage[$langSet]; $langSet = self::$acceptLanguage[$langSet];
} }
} }
if (empty(self::$allowLangList) || in_array($langSet, self::$allowLangList)) { if (empty(self::$allowLangList) || in_array($langSet, self::$allowLangList)) {