From c277f62f6a87d3980e48c1f23df869d4cb9c1357 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 19 Dec 2015 23:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E7=9A=84?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=88=97=E8=A1=A8=E9=85=8D=E7=BD=AElang=5Fli?=
 =?UTF-8?q?st=20=E9=BB=98=E8=AE=A4=E7=9A=84=E8=AF=AD=E8=A8=80GET=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E6=94=B9=E4=B8=BAlang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php         | 2 ++
 library/think/lang.php | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/convention.php b/convention.php
index 0e102917..751382da 100644
--- a/convention.php
+++ b/convention.php
@@ -25,6 +25,8 @@ return [
     'default_timezone'      => 'PRC',
     // 是否开启多语言
     'lang_switch_on'        =>  false,
+    // 支持的多语言列表
+    'lang_list'         =>  ['zh-cn'],
 
     // +----------------------------------------------------------------------
     // | 模块设置
diff --git a/library/think/lang.php b/library/think/lang.php
index 35529426..a5adb6b8 100644
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -17,10 +17,8 @@ class Lang
     private static $lang = [];
     // 语言作用域
     private static $range = 'zh-cn';
-    // 语言列表
-    private static $list = [];
     // 语言变量
-    private static $var = 'l';
+    private static $var = 'lang';
 
     // 设定语言参数的作用域（语言）
     public static function range($range = '')
@@ -122,7 +120,7 @@ class Lang
             $langSet = $matches[1];
             \think\Cookie::set('think_language', $langSet, 3600);
         }
-        if (false !== stripos(self::$list, $langSet)) {
+        if (in_array($langSet, \think\Config::get('lang_list'))) {
             // 合法的语言
             self::$range = $langSet;
         }