调整header方式和cookie自动识别多语言的优先级

top-think · Jun 26, 2020 · eaf6e6d · eaf6e6d
1 parent 3709848
commit eaf6e6d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/think/Lang.php b/src/think/Lang.php
@@ -241,12 +241,12 @@ public function detect(Request $request): string
         if ($request->get($this->config['detect_var'])) {
             // url中设置了语言变量
             $langSet = strtolower($request->get($this->config['detect_var']));
-        } elseif ($request->cookie($this->config['cookie_var'])) {
-            // Cookie中设置了语言变量
-            $langSet = strtolower($request->cookie($this->config['cookie_var']));
         } elseif ($request->header($this->config['header_var'])) {
             // Header中设置了语言变量
             $langSet = strtolower($request->header($this->config['header_var']));
+        } elseif ($request->cookie($this->config['cookie_var'])) {
+            // Cookie中设置了语言变量
+            $langSet = strtolower($request->cookie($this->config['cookie_var']));
         } elseif ($request->server('HTTP_ACCEPT_LANGUAGE')) {
             // 自动侦测浏览器语言
             $match = preg_match('/^([a-z\d\-]+)/i', $request->server('HTTP_ACCEPT_LANGUAGE'), $matches);