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

修正lang类

Browse Source
This commit is contained in:
thinkphp
2015-12-20 11:02:37 +08:00
parent f1a02a74b3
commit 394d85a505
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/lang.php
View File

@@ -64,14 +64,14 @@ class Lang
self::$lang[$range] = []; self::$lang[$range] = [];
} }
// 批量定义 // 批量定义
+ if (is_string($file)) { if (is_string($file)) {
+ $file = [$file]; $file = [$file];
+ } }
+ $lang = []; $lang = [];
+ foreach ($file as $_file) { foreach ($file as $_file) {
+ $_lang = is_file($_file) ? include $_file : []; $_lang = is_file($_file) ? include $_file : [];
+ $lang = array_merge($lang, array_change_key_case($_lang)); $lang = array_merge($lang, array_change_key_case($_lang));
} }
if (!empty($lang)) { if (!empty($lang)) {
self::$lang[$range] = array_merge(self::$lang[$range], $lang); self::$lang[$range] = array_merge(self::$lang[$range], $lang);
} }