Ken 2 주 전
부모
커밋
3dbad71be3
6개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      app/Http/Controllers/Controller.php
  2. 2 2
      app/Http/Controllers/api/BaseController.php
  3. 2 2
      config/app.php
  4. 0 0
      lang/zh/messages.php
  5. 0 0
      lang/zh/validation.php
  6. 0 0
      lang/zh/validation1.php

+ 1 - 1
app/Http/Controllers/Controller.php

@@ -22,7 +22,7 @@ class Controller extends BaseController
     /**
      * @apiDefine lang
      * @apiParam (公共参数) {String} [lang=en] 语言
-     * - 允许值:`zh-CN`,`en`
+     * - 允许值:`zh`,`en`
      */
 
     /**

+ 2 - 2
app/Http/Controllers/api/BaseController.php

@@ -13,11 +13,11 @@ class BaseController extends Controller
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
-    protected $lang = 'zh-CN';
+    protected $lang = 'zh';
 
     public function __construct()
     {
-        $lang = request()->input('lang', 'vi');
+        $lang = request()->input('lang', 'zh');
         App::setLocale($lang);
         $this->lang = $lang;
     }

+ 2 - 2
config/app.php

@@ -98,8 +98,8 @@ return [
     */
 
 //    'locale' => 'en',
-//    'locale' => 'zh-CN',
-    'locale' => isset($_REQUEST['lang']) && $_REQUEST['lang'] == 'en' ? 'en' : 'zh-CN',
+//    'locale' => 'zh',
+    'locale' => isset($_REQUEST['lang']) && $_REQUEST['lang'] == 'en' ? 'en' : 'zh',
 
     /*
     |--------------------------------------------------------------------------

+ 0 - 0
lang/zh-CN/messages.php → lang/zh/messages.php


+ 0 - 0
lang/zh-CN/validation.php → lang/zh/validation.php


+ 0 - 0
lang/zh-CN/validation1.php → lang/zh/validation1.php