黄宗昌 hace 2 años
padre
commit
e8ff708d34

+ 0 - 1
app/Admin/Forms/AdminSetting.php

xqd
@@ -51,7 +51,6 @@ class AdminSetting extends Form implements LazyRenderable
      */
     public function form()
     {
-        // 'en' => 'English',
         $this->radio('lang', trans('site-setting.language'))->width(6)->required()->options(['zh' => '简体中文','ko'=>'한국어']);
     }
 

+ 1 - 0
app/Admin/bootstrap.php

xqd
@@ -23,6 +23,7 @@ use Dcat\Admin\Admin;
  */
 config(['admin' => user_admin_config()]);
 config(['app.locale' => config('admin.lang') ?: config('app.locale')]);
+App::setLocale(config('admin.lang') ?: config('app.locale'));  //配置默认语言
 Admin::navbar(function (Navbar $navbar) {
     $method = config('admin.layout.horizontal_menu') ? 'left' : 'right';
     // ajax请求不执行

+ 2 - 2
app/Http/Controllers/V1/ProductController.php

xqd
@@ -83,8 +83,8 @@ class ProductController extends Controller
             $data[] =[
                 'id'                  => $v['id'],
                 'icon'                => $v['icon'],
-                'zh_name'             => $v['zh_alias'] != null?$v['zh_alias']:$v['zh_name'],
-                'ko_name'             => $v['ko_alias'] != null?$v['ko_alias']:$v['ko_name'],
+                'zh_name'             => $v['zh_name'],
+                'ko_name'             => $v['ko_name'],
                 'describe'            => $v['describe'],
                 'pid'                 => $v['upload_display_pid'] > 0?$v['upload_display_pid']:$v['pid'],
                 'is_display'          => $v['is_upload_display']

+ 33 - 0
app/helpers.php

xqd
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Arr;
+
+if (! function_exists('user_admin_config')) {
+    function user_admin_config($key = null, $value = null)
+    {
+        $session = session();
+
+        if (! $config = $session->get('admin.config')) {
+            $config = config('admin');
+
+            $config['lang'] = config('app.locale');
+        }
+
+        if (is_array($key)) {
+            // 保存
+            foreach ($key as $k => $v) {
+                Arr::set($config, $k, $v);
+            }
+
+            $session->put('admin.config', $config);
+
+            return;
+        }
+
+        if ($key === null) {
+            return $config;
+        }
+
+        return Arr::get($config, $key, $value);
+    }
+}