From 2e51d944815d5dff6ab654ed734c1477d72b4ef3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 17 Dec 2015 21:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E8=A8=80=E5=8C=85?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/app.php  | 17 +++++++++++------
 library/think/lang.php | 15 +++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/library/think/app.php b/library/think/app.php
index 3ce81f04..c5803d10 100644
--- a/library/think/app.php
+++ b/library/think/app.php
@@ -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);
+            }
         }
     }
 
diff --git a/library/think/lang.php b/library/think/lang.php
index dd86b779..e0c198b1 100644
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -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];
     }
 
     /**