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

改进默认语言的设置 修正默认语言包的加载问题

Browse Source
This commit is contained in:
thinkphp
2016-09-28 11:32:32 +08:00
parent e2335946cc
commit 3aa7e463dd
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/App.php
View File

@@ -94,15 +94,18 @@ class App
$request->filter($config['default_filter']); $request->filter($config['default_filter']);
// 开启多语言机制
if ($config['lang_switch_on']) { if ($config['lang_switch_on']) {
// 获取当前语言 // 开启多语言机制 检测当前语言
$request->langset(Lang::detect()); Lang::detect();
// 加载系统语言包 } else {
Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT); // 读取默认语言
if (!$config['app_multi_module']) { Lang::range($config['default_lang']);
Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT); }
} $request->langset(Lang::range());
// 加载系统语言包
Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT);
if (!$config['app_multi_module']) {
Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT);
} }
// 获取应用调度信息 // 获取应用调度信息
@@ -496,7 +499,7 @@ class App
} }
// 加载当前模块语言包 // 加载当前模块语言包
if ($config['lang_switch_on'] && $module) { if ($module) {
Lang::load($path . 'lang' . DS . Request::instance()->langset() . EXT); Lang::load($path . 'lang' . DS . Request::instance()->langset() . EXT);
} }
} }

4
library/think/Lang.php
View File

@@ -81,10 +81,8 @@ class Lang
// 记录加载信息 // 记录加载信息
App::$debug && Log::record('[ LANG ] ' . $_file, 'info'); App::$debug && Log::record('[ LANG ] ' . $_file, 'info');
$_lang = include $_file; $_lang = include $_file;
} else { $lang = array_change_key_case($_lang) + $lang;
$_lang = [];
} }
$lang = array_change_key_case($_lang) + $lang;
} }
if (!empty($lang)) { if (!empty($lang)) {
self::$lang[$range] = $lang + self::$lang[$range]; self::$lang[$range] = $lang + self::$lang[$range];

4
library/think/exception/Handle.php
View File

@@ -203,10 +203,6 @@ class Handle
if (IS_CLI) { if (IS_CLI) {
return $message; return $message;
} }
// 导入语言包
if (!Config::get('lang_switch_on')) {
Lang::load(THINK_PATH . 'lang' . DS . Lang::detect() . EXT);
}
if (strpos($message, ':')) { if (strpos($message, ':')) {
$name = strstr($message, ':', true); $name = strstr($message, ':', true);