From 883a55bbcb1aaccc3df1830a5fb29fec25aef386 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 19 Dec 2015 22:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0lang=5Fswitch=5Fon=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=82=E6=95=B0=E7=94=A8=E4=BA=8E=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=A4=9A=E8=AF=AD=E8=A8=80=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php        |  2 ++
 library/think/app.php | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/convention.php b/convention.php
index b12b3589..0e102917 100644
--- a/convention.php
+++ b/convention.php
@@ -23,6 +23,8 @@ return [
     'var_jsonp_handler'     => 'callback',
     // 默认时区
     'default_timezone'      => 'PRC',
+    // 是否开启多语言
+    'lang_switch_on'        =>  false,
 
     // +----------------------------------------------------------------------
     // | 模块设置
diff --git a/library/think/app.php b/library/think/app.php
index 2d11f033..f9f4e9e9 100644
--- a/library/think/app.php
+++ b/library/think/app.php
@@ -53,10 +53,13 @@ class App
         // 监听app_init
         APP_HOOK && Hook::listen('app_init');
 
-        // 当前语言
-        defined('LANG_SET') or define('LANG_SET', Lang::range());
-        // 加载系统语言包
-        Lang::load(THINK_PATH . 'lang' . DS . LANG_SET . EXT);
+        // 开启多语言机制
+        if ($config['lang_switch_on']) {
+            // 获取当前语言
+            defined('LANG_SET') or define('LANG_SET', Lang::range());
+            // 加载系统语言包
+            Lang::load(THINK_PATH . 'lang' . DS . LANG_SET . EXT);
+        }
 
         // 启动session API CLI 不开启
         if (!IS_CLI && !IS_API && $config['use_session']) {
@@ -225,7 +228,7 @@ class App
             }
 
             // 加载当前模块语言包
-            if ($module) {
+            if ($config['lang_switch_on'] && $module) {
                 Lang::load($path . 'lang' . DS . LANG_SET . EXT);
             }
         }