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

改进默认语言读取

Browse Source
This commit is contained in:
thinkphp
2017-03-14 11:46:43 +08:00
parent 6e72edd354
commit 8a8d590f4f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/App.php
View File

@@ -85,14 +85,14 @@ class App
$request->filter($config['default_filter']); $request->filter($config['default_filter']);
// 默认语言
Lang::range($config['default_lang']);
if ($config['lang_switch_on']) { if ($config['lang_switch_on']) {
// 开启多语言机制 检测当前语言 // 开启多语言机制 检测当前语言
Lang::detect(); Lang::detect();
} else {
// 读取默认语言
Lang::range($config['default_lang']);
} }
$request->langset(Lang::range()); $request->langset(Lang::range());
// 加载系统语言包 // 加载系统语言包
Lang::load([ Lang::load([
THINK_PATH . 'lang' . DS . $request->langset() . EXT, THINK_PATH . 'lang' . DS . $request->langset() . EXT,