Fix 部分翻译未被正确调用 & 文件优化

app/Http/Controllers/UserController.php

@@ -543,10 +543,10 @@ class UserController extends Controller
         $user = auth()->loginUsingId(Session::get('admin'));
         Session::forget('admin');
         if ($user) {
-            return Response::json(['status' => 'success', 'message' => trans('toggle_action', ['action' => trans('common.success')])]);
+            return Response::json(['status' => 'success', 'message' => trans('common.toggle_action', ['action' => trans('common.success')])]);
         }
 
-        return Response::json(['status' => 'fail', 'message' => trans('toggle_action', ['action' => trans('common.failed')])]);
+        return Response::json(['status' => 'fail', 'message' => trans('common.toggle_action', ['action' => trans('common.failed')])]);
     }
 
     public function charge(Request $request): ?JsonResponse

app/Observers/NodeObserver.php

@@ -35,7 +35,7 @@ class NodeObserver
 
     public function updated(Node $node): void
     {
-        if ($node->is_ddns == 0 && sysConfig('ddns_mode')) {
+        if ($node->is_ddns === 0 && sysConfig('ddns_mode')) {
             $changes = $node->getChanges();
             if (Arr::hasAny($changes, ['ip', 'ipv6', 'server'])) {
                 if (Arr::exists($changes, 'server')) {

resources/views/admin/inviteList.blade.php

@@ -96,9 +96,8 @@
           $.ajax({
             method: 'POST',
             url: '{{route('admin.invite.create')}}',
-            async: false,
-            data: {_token: '{{csrf_token()}}'},
             dataType: 'json',
+            data: {_token: '{{csrf_token()}}'},
             success: function(ret) {
               if (ret.status === 'success') {
                 swal.fire({title: ret.message, icon: 'success', timer: 1000, showConfirmButton: false}).then(() => window.location.reload());

resources/views/admin/layouts.blade.php

@@ -8,7 +8,7 @@
     <nav class="site-navbar navbar navbar-default navbar-fixed-top navbar-mega navbar-inverse bg-indigo-600" role="navigation">
         <div class="navbar-header">
             <button type="button" class="navbar-toggler hamburger hamburger-close navbar-toggler-left hided" data-toggle="menubar">
-                <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.navigation')])}}</span>
+                <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.navigation')])}}</span>
                 <span class="hamburger-bar"></span>
             </button>
             <button type="button" class="navbar-toggler collapsed" data-target="#site-navbar-collapse" data-toggle="collapse">
@@ -25,14 +25,14 @@
                     <li class="nav-item hidden-float" id="toggleMenubar">
                         <a class="nav-link" data-toggle="menubar" href="#" role="button">
                             <i class="icon hamburger hamburger-arrow-left">
-                                <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.menubar')])}}</span>
+                                <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.menubar')])}}</span>
                                 <span class="hamburger-bar"></span>
                             </i>
                         </a>
                     </li>
                     <li class="nav-item hidden-sm-down">
                         <a class="nav-link icon icon-fullscreen" data-toggle="fullscreen" href="#" role="button">
-                            <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.fullscreen')])}}</span>
+                            <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.fullscreen')])}}</span>
                         </a>
                     </li>
                 </ul>

resources/views/admin/node/info.blade.php

@@ -511,7 +511,7 @@
         $.ajax({
           method: @isset($node) 'PUT' @else 'POST' @endisset,
           url: '{{isset($node)? route('admin.node.update', $node) : route('admin.node.store')}}',
-          async: false,
+          dataType: 'json',
           data: {
             _token: '{{csrf_token()}}',
             is_ddns: document.getElementById('is_ddns').checked ? 1 : 0,
@@ -556,7 +556,6 @@
             relay_port: $('#relay_port').val(),
             relay_server: $('#relay_server').val(),
           },
-          dataType: 'json',
           success: function(ret) {
             if (ret.status === 'success') {
               swal.fire({
@@ -573,9 +572,13 @@
             let str = '';
             const errors = data.responseJSON;
             if ($.isEmptyObject(errors) === false) {
-              $.each(errors.errors, function(index, value) {
-                str += '<li>' + value + '</li>';
-              });
+              if ($.isEmptyObject(errors.message) === false && typeof errors.message === 'string') {
+                str += errors.message;
+              } else {
+                $.each(errors.errors, function(index, value) {
+                  str += '<li>' + value + '</li>';
+                });
+              }
               swal.fire({title: '提示', html: str, icon: 'error', confirmButtonText: '{{trans('common.confirm')}}'});
             }
           },
@@ -653,7 +656,7 @@
         }
       });
 
-      $('#obfs').on('changed.bs.select', function(e, clickedIndex, isSelected, previousValue) {
+      $('#obfs').on('changed.bs.select', function() {
         const obfs_param = $('.obfs_param');
         if ($('#obfs').val() === 'plain') {
           $('#obfs_param').val('');
@@ -663,12 +666,12 @@
         }
       });
 
-      $('#v2_ws').on('changed.bs.select', function(e, clickedIndex, isSelected, previousValue) {
+      $('#v2_ws').on('changed.bs.select', function() {
         $('#v2_host').val($('#v2_ws').val());
       });
 
       // 设置V2Ray详细设置
-      $('#v2_net').on('changed.bs.select', function(e, clickedIndex, isSelected, previousValue) {
+      $('#v2_net').on('changed.bs.select', function() {
         const type = $('.v2_type');
         const type_option = $('#type_option');
         const host = $('.v2_host');

resources/views/admin/tools/convert.blade.php

@@ -95,7 +95,7 @@
             $.ajax({
               method: 'POST',
               url: '{{route('admin.tools.convert')}}',
-              async: false,
+              dataType: 'json',
               data: {
                 _token: '{{csrf_token()}}',
                 method: $('#method').val(),
@@ -106,7 +106,6 @@
                 obfs_param: $('#obfs_param').val(),
                 content: content,
               },
-              dataType: 'json',
               success: function(ret) {
                 if (ret.status === 'success') {
                   $('#result').val(ret.data);

resources/views/admin/tools/decompile.blade.php

@@ -46,9 +46,8 @@
             $.ajax({
               method: 'POST',
               url: '{{route('admin.tools.decompile')}}',
-              async: false,
-              data: {_token: '{{csrf_token()}}', content: content},
               dataType: 'json',
+              data: {_token: '{{csrf_token()}}', content: content},
               success: function(ret) {
                 if (ret.status === 'success') {
                   $('#result').val(ret.data);

resources/views/admin/user/info.blade.php

@@ -448,7 +448,7 @@
         $.ajax({
           method: @isset($user)'PUT' @else 'POST' @endisset,
           url: '{{isset($user)? route('admin.user.update', $user) : route('admin.user.store')}}',
-          async: false,
+          dataType: 'json',
           data: {
             _token: '{{csrf_token()}}',
             username: $('#username').val(),
@@ -474,7 +474,6 @@
             invite_num: $('#invite_num').val(),
             status: $('input:radio[name=\'status\']:checked').val(),
           },
-          dataType: 'json',
           success: function(ret) {
             if (ret.status === 'success') {
               swal.fire({

resources/views/auth/register.blade.php

@@ -175,9 +175,8 @@
           $.ajax({
             method: 'POST',
             url: '{{route('sendVerificationCode')}}',
-            async: false,
-            data: {_token: '{{csrf_token()}}', email: email},
             dataType: 'json',
+            data: {_token: '{{csrf_token()}}', email: email},
             success: function(ret) {
               if (ret.status === 'success') {
                 swal.fire({title: ret.message, icon: 'success'});

resources/views/user/buy.blade.php

@@ -76,9 +76,8 @@
         $.ajax({
           method: 'POST',
           url: '{{route('redeemCoupon')}}',
-          async: false,
-          data: {_token: '{{csrf_token()}}', coupon_sn: coupon_sn, price: '{{$goods->price}}'},
           dataType: 'json',
+          data: {_token: '{{csrf_token()}}', coupon_sn: coupon_sn, price: '{{$goods->price}}'},
           success: function(ret) {
             $('.input-group-prepend').remove();
             if (ret.status === 'success') {
@@ -149,7 +148,7 @@
         $.ajax({
           method: 'POST',
           url: '{{route('purchase')}}',
-          async: false,
+          dataType: 'json',
           data: {
             _token: '{{csrf_token()}}',
             goods_id: goods_id,
@@ -157,7 +156,6 @@
             method: method,
             pay_type: pay_type,
           },
-          dataType: 'json',
           success: function(ret) {
             if (ret.status === 'success') {
               swal.fire({

resources/views/user/invite.blade.php

@@ -84,10 +84,9 @@
       function makeInvite() {
         $.ajax({
           method: 'POST',
-          async: false,
+          dataType: 'json',
           url: '{{route('createInvite')}}',
           data: {_token: '{{csrf_token()}}'},
-          dataType: 'json',
           success: function(ret) {
             if (ret.status === 'success') {
               swal.fire({title: ret.message, icon: 'success'}).then(() => window.location.reload());

resources/views/user/invoices.blade.php

@@ -9,7 +9,7 @@
                 <h1 class="panel-title cyan-600"><i class="icon wb-bookmark"></i>{{trans('user.menu.invoices')}}</h1>
                 @if($prepaidPlan)
                     <div class="panel-actions">
-                        <button onclick="closePlan()" class="btn btn-primary"> {{trans('active', ['attribute' => trans('user.status.prepaid')])}}</button>
+                        <button onclick="closePlan()" class="btn btn-primary"> {{trans('common.active_item', ['attribute' => trans('user.status.prepaid')])}}</button>
                     </div>
                 @endif
             </div>
@@ -88,9 +88,8 @@
             $.ajax({
               method: 'POST',
               url: '{{route('cancelPlan')}}',
-              async: false,
-              data: {_token: '{{csrf_token()}}'},
               dataType: 'json',
+              data: {_token: '{{csrf_token()}}'},
               success: function(ret) {
                 if (ret.status === 'success') {
                   swal.fire({title: ret.message, icon: 'success', timer: 1000, showConfirmButton: false}).then(() => window.location.reload());
@@ -115,9 +114,8 @@
             $.ajax({
               method: 'PUT',
               url: '{{route('closeOrder', '')}}/' + id,
-              async: false,
-              data: {_token: '{{csrf_token()}}'},
               dataType: 'json',
+              data: {_token: '{{csrf_token()}}'},
               success: function(ret) {
                 if (ret.status === 'success') {
                   swal.fire({title: ret.message, icon: 'success', timer: 1000, showConfirmButton: false}).then(() => window.location.reload());

resources/views/user/layouts.blade.php

@@ -10,7 +10,7 @@
         <div class="navbar-header">
             <button type="button" class="navbar-toggler hamburger hamburger-close navbar-toggler-left hided"
                     data-toggle="menubar">
-                <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.navigation')])}}</span>
+                <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.navigation')])}}</span>
                 <span class="hamburger-bar"></span>
             </button>
             <button type="button" class="navbar-toggler collapsed" data-target="#site-navbar-collapse"
@@ -30,14 +30,14 @@
                     <li class="nav-item hidden-float" id="toggleMenubar">
                         <a class="nav-link" data-toggle="menubar" href="#" role="button">
                             <i class="icon hamburger hamburger-arrow-left">
-                                <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.menubar')])}}</span>
+                                <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.menubar')])}}</span>
                                 <span class="hamburger-bar"></span>
                             </i>
                         </a>
                     </li>
                     <li class="nav-item hidden-sm-down" id="toggleFullscreen">
                         <a class="nav-link icon icon-fullscreen" data-toggle="fullscreen" href="#" role="button">
-                            <span class="sr-only">{{trans('toggle_action', ['action' => trans('common.function.fullscreen')])}}</span>
+                            <span class="sr-only">{{trans('common.toggle_action', ['action' => trans('common.function.fullscreen')])}}</span>
                         </a>
                     </li>
                 </ul>