From 8af0f428245a61acd49bff1a83d16d077b4096ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BA=A6=E5=BD=93=E8=8B=97=E5=84=BF?= <zuojiazi@vip.qq.com>
Date: Mon, 1 Feb 2016 18:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Lang.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/library/think/Lang.php b/library/think/Lang.php
index 2b7774b6..eeaa3ae8 100644
--- a/library/think/Lang.php
+++ b/library/think/Lang.php
@@ -94,13 +94,28 @@ class Lang
         }
         $key   = strtolower($name);
         $value = isset(self::$lang[$range][$key]) ? self::$lang[$range][$key] : $name;
-        if (is_array($vars) && !empty($vars)) {
-            // 支持变量
-            $replace = array_keys($vars);
-            foreach ($replace as &$v) {
-                $v = '{$' . $v . '}';
+        
+        // 变量解析
+        if (!empty($vars) && is_array($vars)) {
+            /**
+             * Notes:
+             * 为了检测的方便，数字索引的判断仅仅是参数数组的第一个元素的key为数字0
+             * 数字索引采用的是系统的 sprintf 函数替换，用法请参考 sprintf 函数
+             */
+            if (key($vars) === 0) {
+                // 数字索引解析
+                array_unshift($vars, $name);
+                $value = call_user_func_array('sprintf', $vars);
+            } else {
+                // 关联索引解析
+                $replace = array_keys($vars);
+                foreach ($replace as &$v) {
+                    $v = "{:{$v}}";
+                }
+                $value = str_replace($replace, $vars, $value);
             }
-            $value = str_replace($replace, $vars, $value);
+            
+            
         }
         return $value;
     }