mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02: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

4
library/think/Lang.php
View File

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