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

添加语言包加载

Browse Source
This commit is contained in:
thinkphp
2015-12-17 21:56:00 +08:00
parent 8c4f63ea8b
commit 2e51d94481
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/app.php
View File

@@ -50,15 +50,15 @@ class App
// 设置系统时区
date_default_timezone_set($config['default_timezone']);
// 默认语言
$lang = strtolower($config['default_lang']);
Lang::range($lang);
// 加载默认语言包
Lang::load(THINK_PATH . 'Lang/' . $lang . EXT);
// 监听app_init
APP_HOOK && Hook::listen('app_init');
// 默认语言
defined('LANG_SET') or define('LANG_SET', strtolower($config['default_lang']));
Lang::range(LANG_SET);
// 加载默认语言包
Lang::load(THINK_PATH . 'lang' . DS . LANG_SET . EXT);
// 启动session API CLI 不开启
if (!IS_CLI && !IS_API && $config['use_session']) {
Session::init($config['session']);
@@ -214,6 +214,11 @@ class App
if (is_file($path . 'common' . EXT)) {
include $path . 'common' . EXT;
}
// 加载当前模块语言包
if ($module) {
Lang::load($path . 'lang' . DS . LANG_SET . EXT);
}
}
}

15
library/think/lang.php
View File

@@ -19,9 +19,13 @@ class Lang
private static $range = '';
// 设定语言参数的作用域（语言）
public static function range($range)
public static function range($range = '')
{
self::$range = $range;
if ('' == $range) {
return self::$range;
} else {
self::$range = $range;
}
}
/**
@@ -59,10 +63,13 @@ class Lang
self::$lang[$range] = [];
}
// 批量定义
if(!isset(self::$lang[$range])) {
if (!isset(self::$lang[$range])) {
self::$lang[$range] = [];
}
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
if (!empty($lang)) {
self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
}
return self::$lang[$range];
}
/**