lip 5 hari lalu
induk
melakukan
48be78b62e

+ 1 - 1
README.md

@@ -72,7 +72,7 @@ php artisan storage:link
 location / {
         add_header 'Access-Control-Allow-Origin' '*';
         add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-        add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization';
+        add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Lang';
         add_header 'Access-Control-Allow-Credentials' 'true';
         add_header 'Access-Control-Max-Age' 3600;
 

+ 2 - 2
app/Helpers/helpers.php

@@ -66,9 +66,9 @@ if (!function_exists('custom_sort')) {
 }
 
 if (!function_exists('lang')) {
-    function lang(string $key): string
+    function lang(string $key, array $data = []): string
     {
-        $msg = Lang::get("messages.{$key}");
+        $msg = Lang::get("messages.{$key}", $data);
         if ($msg === "messages.{$key}") return $key;
         return $msg;
     }

+ 4 - 1
app/Http/Controllers/api/BaseController.php

@@ -17,7 +17,10 @@ class BaseController extends Controller
 
     public function __construct()
     {
-        $lang = request()->input('lang', 'zh');
+        $lang = request()->input('lang');
+        if (!$lang) {
+            $lang = request()->header('Lang', 'zh');
+        }
         App::setLocale($lang);
         $this->lang = $lang;
     }

+ 15 - 0
app/Http/Controllers/api/NewPc.php

@@ -45,6 +45,21 @@ class NewPc extends BaseController
             $item['openCode1'] = $item['winning_array'][0];
             $item['openCode2'] = $item['winning_array'][1];
             $item['openCode3'] = $item['winning_array'][2];
+            if ($item['combo']) {
+                $combo = explode(" ", $item['combo']);
+                foreach($combo as &$v) {
+                    if (stripos($v, '尾') !== false) {
+                        $v = str_replace('尾', lang('尾'), $v);
+                    } elseif (stripos($v, '头') !== false) {
+                        $v = str_replace('头', lang('头'), $v);
+                    } elseif (stripos($v, '操') !== false) {
+                        $v = str_replace('操', lang('操'), $v);
+                    } else {
+                        $v = lang($v);
+                    }
+                }
+                $item['combo'] = implode(" ", $combo);
+            }
         }
         return $this->success($data);
     }

+ 3 - 0
lang/en/messages.php

@@ -362,6 +362,9 @@ return [
     'Draw/Home' => 'Draw/Home Win',
     'Draw/Draw' => 'Draw/Draw',
     'Draw/Away' => 'Draw/Away Win',
+    "操" => " Operation ",
+    "尾" => " Tail ",
+    "头" => " First Digit ",
     '大' => 'Big',
     '小' => 'Small',
     '单' => 'Odd',

+ 3 - 0
lang/vi/messages.php

@@ -362,6 +362,9 @@ return [
     'Draw/Home' => 'Hòa/Thắng nhà',
     'Draw/Draw' => 'Hòa/Hòa',
     'Draw/Away' => 'Hòa/Thắng khách',
+    "操" => " Thao tác ",
+    "尾" => " Đuôi ",
+    "头" => " Đầu số ",
     '大' => 'Tài (Lớn)',
     '小' => 'Xỉu (Nhỏ)',
     '单' => 'Lẻ',

+ 3 - 0
lang/zh/messages.php

@@ -362,6 +362,9 @@ return [
     'Draw/Home' => '平局/主胜',
     'Draw/Draw' => '平局/平局',
     'Draw/Away' => '平局/客胜',
+    "操" => "操",
+    "尾" => "尾",
+    "头" => "头",
     "大" => "大",
     "小" => "小",
     "单" => "单",