From c601f4a2bf75d25cf00f828f131ba47d1bc1a08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <867057410@qq.com>
Date: Mon, 26 Dec 2022 18:59:00 +0800
Subject: [PATCH] Improve lang support

---
 .env.example                                  |  2 +-
 config/common.php                             |  5 ++
 resources/views/admin/layouts.blade.php       | 13 ++++
 resources/views/admin/tools/convert.blade.php |  1 -
 resources/views/auth/layouts.blade.php        | 13 ++--
 resources/views/user/layouts.blade.php        | 62 +++++++++----------
 6 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/.env.example b/.env.example
index bc73ddf8..2dd2b5a8 100644
--- a/.env.example
+++ b/.env.example
@@ -5,7 +5,7 @@ APP_DEBUG=
 APP_DEMO=
 APP_URL=http://localhost
 APP_TIMEZONE=Asia/Shanghai
-APP_LOCALE=zh-CN
+APP_LOCALE=zh_CN
 APP_FALLBACK_LOCALE=en
 LOG_CHANNEL=daily
 
diff --git a/config/common.php b/config/common.php
index 640633c7..cb68bddd 100644
--- a/config/common.php
+++ b/config/common.php
@@ -72,4 +72,9 @@ return [
             10 => '钉钉',
         ],
     ],
+
+    'language' => [
+        'zh_CN' => ['简体中文', 'cn'],
+        'en'    => ['English', 'gb'],
+    ],
 ];
diff --git a/resources/views/admin/layouts.blade.php b/resources/views/admin/layouts.blade.php
index f081a848..f3c0b113 100644
--- a/resources/views/admin/layouts.blade.php
+++ b/resources/views/admin/layouts.blade.php
@@ -36,6 +36,19 @@
                             <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.fullscreen')])}}</span>
                         </a>
                     </li>
+                    <li class="nav-item dropdown">
+                        <a href="javascript:void(0)" class="nav-link" data-toggle="dropdown" role="button">
+                            <span class="icon wb-flag"></span>
+                            <span class="icon wb-chevron-down-mini"></span>
+                        </a>
+                        <div class="dropdown-menu" role="menu">
+                            @foreach (config('common.language') as $key => $value)
+                                <a class="dropdown-item" href="{{route('lang', ['locale' => $key])}}" role="menuitem">
+                                    <i class="fi fi-{{$value[1]}}"></i> <span style="padding: inherit;">{{$value[0]}}</span>
+                                </a>
+                            @endforeach
+                        </div>
+                    </li>
                 </ul>
                 <ul class="nav navbar-toolbar navbar-right navbar-toolbar-right">
                     <li class="nav-item dropdown">
diff --git a/resources/views/admin/tools/convert.blade.php b/resources/views/admin/tools/convert.blade.php
index 043c1f71..96f03bcb 100644
--- a/resources/views/admin/tools/convert.blade.php
+++ b/resources/views/admin/tools/convert.blade.php
@@ -35,7 +35,6 @@
                                 </option>
                             @endforeach
                         </select>
-
                     </div>
                     <div class="col-md-4 form-group">
                         <label for="protocol_param">协议参数</label>
diff --git a/resources/views/auth/layouts.blade.php b/resources/views/auth/layouts.blade.php
index 1d399e5b..6361a6e1 100644
--- a/resources/views/auth/layouts.blade.php
+++ b/resources/views/auth/layouts.blade.php
@@ -39,17 +39,16 @@
                                 <i class="font-size-20 wb-globe"></i>
                             </button>
                             <div class="dropdown-menu dropdown-menu-bullet" aria-labelledby="language" role="menu">
-                                <a class="dropdown-item" href="{{route('lang', ['locale' => 'en'])}}" role="menuitem">
-                                    <i class="fi fi-gb"></i>
-                                    <span style="padding: inherit;">English</span></a>
-                                <a class="dropdown-item" href="{{route('lang', ['locale' => 'zh_CN'])}}" role="menuitem">
-                                    <i class="fi fi-cn"></i>
-                                    <span style="padding: inherit;">简体中文</span></a>
+                                @foreach (config('common.language') as $key => $value)
+                                    <a class="dropdown-item" href="{{route('lang', ['locale' => $key])}}" role="menuitem">
+                                        <i class="fi fi-{{$value[1]}}"></i> <span style="padding: inherit;">{{$value[0]}}</span>
+                                    </a>
+                                @endforeach
                             </div>
                         </div>
                     </div>
                     <div class="panel-body">
-                    <!--[if lt IE 8]><p class="browserupgrade">{{trans('common.update_browser.0')}}<strong>{{trans('common.update_browser.1')}}</strong>
+                        <!--[if lt IE 8]><p class="browserupgrade">{{trans('common.update_browser.0')}}<strong>{{trans('common.update_browser.1')}}</strong>
 {{trans('common.update_browser.2')}}<a href="http://browsehappy.com/" target="_blank">{{trans('common.update_browser.3')}}</a>{{trans('common.update_browser.4')}}</p><![endif]-->
                         @yield('content')
                     </div>
diff --git a/resources/views/user/layouts.blade.php b/resources/views/user/layouts.blade.php
index 4072c6d5..5db0981d 100644
--- a/resources/views/user/layouts.blade.php
+++ b/resources/views/user/layouts.blade.php
@@ -1,3 +1,4 @@
+@php use App\Models\ReferralLog, App\Models\Order; @endphp
 @extends('_layout')
 @section('title', sysConfig('website_name'))
 @section('layout_css')
@@ -48,19 +49,18 @@
                             <span class="icon wb-chevron-down-mini"></span>
                         </a>
                         <div class="dropdown-menu" role="menu">
-                            <a class="dropdown-item" href="{{route('lang', ['locale' => 'en'])}}" role="menuitem">
-                                <i class="fi fi-gb"></i>
-                                <span style="padding: inherit;">English</span></a>
-                            <a class="dropdown-item" href="{{route('lang', ['locale' => 'zh_CN'])}}" role="menuitem">
-                                <i class="fi fi-cn"></i>
-                                <span style="padding: inherit;">简体中文</span></a>
+                            @foreach (config('common.language') as $key => $value)
+                                <a class="dropdown-item" href="{{route('lang', ['locale' => $key])}}" role="menuitem">
+                                    <i class="fi fi-{{$value[1]}}"></i> <span style="padding: inherit;">{{$value[0]}}</span>
+                                </a>
+                            @endforeach
                         </div>
                     </li>
                     <li class="nav-item dropdown">
                         <a href="#" aria-expanded="false" class="nav-link navbar-avatar" data-animation="scale-up"
                            data-toggle="dropdown" role="button">
                         <span class="avatar avatar-online">
-                            <img src="{{Auth::getUser()->avatar}}" alt="{{trans('common.avatar')}}" /><i></i>
+                            <img src="{{Auth::getUser()->avatar}}" alt="{{trans('common.avatar')}}"/><i></i>
                         </span>
                         </a>
                         <div class="dropdown-menu" role="menu">
@@ -138,7 +138,7 @@
                         <span class="site-menu-title">{{trans('user.menu.invoices')}}</span>
                     </a>
                 </li>
-                @if(\App\Models\ReferralLog::uid()->exists() || \App\Models\Order::uid()->whereStatus(2)->exists())
+                @if(ReferralLog::uid()->exists() || Order::uid()->whereStatus(2)->exists())
                     @if(sysConfig('is_invite_register'))
                         <li class="site-menu-item {{request()->routeIs('invite') ? 'active open' : ''}}">
                             <a href="{{route('invite')}}">
@@ -175,7 +175,7 @@
         </div>
     </div>
     <div class="page">
-    <!--[if lt IE 8]><p class="browserupgrade">{{trans('common.update_browser.0')}}<strong>{{trans('common.update_browser.1')}}</strong>
+        <!--[if lt IE 8]><p class="browserupgrade">{{trans('common.update_browser.0')}}<strong>{{trans('common.update_browser.1')}}</strong>
 {{trans('common.update_browser.2')}}<a href="http://browsehappy.com/" target="_blank">{{trans('common.update_browser.3')}}</a>{{trans('common.update_browser.4')}}</p><![endif]-->
         @yield('content')
     </div>
@@ -207,30 +207,30 @@
         @yield('javascript')
         @if(Session::get('admin'))
             <script>
-                $('#return_to_admin').click(function() {
-                    $.ajax({
-                        method: 'POST',
-                        url: '{{route('switch')}}',
-                        data: {'_token': '{{csrf_token()}}'},
-                        dataType: 'json',
-                        success: function(ret) {
-                            swal.fire({
-                                title: ret.message,
-                                icon: 'success',
-                                timer: 1000,
-                                showConfirmButton: false,
-                            }).then(() => window.location.href = '{{route('admin.index')}}');
-                        },
-                        error: function(ret) {
-                            swal.fire({
-                                title: ret.message,
-                                icon: 'error',
-                                timer: 1500,
-                                showConfirmButton: false,
-                            });
-                        },
+              $('#return_to_admin').click(function() {
+                $.ajax({
+                  method: 'POST',
+                  url: '{{route('switch')}}',
+                  data: {'_token': '{{csrf_token()}}'},
+                  dataType: 'json',
+                  success: function(ret) {
+                    swal.fire({
+                      title: ret.message,
+                      icon: 'success',
+                      timer: 1000,
+                      showConfirmButton: false,
+                    }).then(() => window.location.href = '{{route('admin.index')}}');
+                  },
+                  error: function(ret) {
+                    swal.fire({
+                      title: ret.message,
+                      icon: 'error',
+                      timer: 1500,
+                      showConfirmButton: false,
                     });
+                  },
                 });
+              });
             </script>
         @endif
         <!-- 统计 -->