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

改进Lang类的detect方法 返回当前语言 取消 LANG_SET 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-13 17:05:50 +08:00
parent 126bb348ca
commit 8b0078d936
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/App.php
View File

@@ -68,11 +68,11 @@ class App
// 开启多语言机制
if ($config['lang_switch_on']) {
// 获取当前语言
defined('LANG_SET') or define('LANG_SET', Lang::range());
$request->langset(Lang::detect());
// 加载系统语言包
Lang::load(THINK_PATH . 'lang' . DS . LANG_SET . EXT);
Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT);
if (!APP_MULTI_MODULE) {
Lang::load(APP_PATH . 'lang' . DS . LANG_SET . EXT);
Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT);
}
}
@@ -349,7 +349,7 @@ class App
// 加载当前模块语言包
if ($config['lang_switch_on'] && $module) {
Lang::load($path . 'lang' . DS . LANG_SET . EXT);
Lang::load($path . 'lang' . DS . Request::instance()->langset() . EXT);
}
}
return Config::get();