From 41e5d8bcc71f9a918aae0a6b8128e00ee08e38d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=92=E7=88=BD=E5=B8=88=E5=8F=94?=
 <43847794+vlssu@users.noreply.github.com>
Date: Wed, 8 Mar 2023 09:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=89=E5=8C=96=E9=83=A8=E5=88=86=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Requests/Api/Application/Users/StoreUserRequest.php   | 8 ++++----
 app/Services/Subusers/SubuserCreationService.php          | 4 ++--
 resources/views/admin/users/index.blade.php               | 2 +-
 resources/views/admin/users/new.blade.php                 | 8 ++++----
 resources/views/admin/users/view.blade.php                | 6 +++---
 resources/views/layouts/admin.blade.php                   | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
index 569dba3406..1e8e54edf6 100644
--- a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
+++ b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
@@ -52,10 +52,10 @@ public function validated($key = null, $default = null): array
     public function attributes(): array
     {
         return [
-            'external_id' => 'Third Party Identifier',
-            'name_first' => 'First Name',
-            'name_last' => 'Last Name',
-            'root_admin' => 'Root Administrator Status',
+            'external_id' => '第三方识别码',
+            'name_first' => '名字',
+            'name_last' => '姓氏',
+            'root_admin' => '管理员状态',
         ];
     }
 }
diff --git a/app/Services/Subusers/SubuserCreationService.php b/app/Services/Subusers/SubuserCreationService.php
index c207b0d071..550c4ca450 100644
--- a/app/Services/Subusers/SubuserCreationService.php
+++ b/app/Services/Subusers/SubuserCreationService.php
@@ -58,8 +58,8 @@ public function handle(Server $server, string $email, array $permissions): Subus
                 $user = $this->userCreationService->handle([
                     'email' => $email,
                     'username' => $username,
-                    'name_first' => 'Server',
-                    'name_last' => 'Subuser',
+                    'name_first' => '服务器',
+                    'name_last' => '子用户',
                     'root_admin' => false,
                 ]);
             }
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index 2aad387fbc..1aa841d2da 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content-header')
-    <h1>用户<small>此系统上所有注册用户.</small></h1>
+    <h1>用户<small>此系统上所有注册用户。</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">管理</a></li>
         <li class="active">用户</li>
diff --git a/resources/views/admin/users/new.blade.php b/resources/views/admin/users/new.blade.php
index 9a3f474eb0..c3541d202f 100644
--- a/resources/views/admin/users/new.blade.php
+++ b/resources/views/admin/users/new.blade.php
@@ -35,15 +35,15 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="name_first" class="control-label">姓</label>
+                        <label for="name_last" class="control-label">姓</label>
                         <div>
-                            <input type="text" autocomplete="off" name="name_first" value="{{ old('name_first') }}" class="form-control" />
+                            <input type="text" autocomplete="off" name="name_last" value="{{ old('name_last') }}" class="form-control" />
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="name_last" class="control-label">名</label>
+                        <label for="name_first" class="control-label">名</label>
                         <div>
-                            <input type="text" autocomplete="off" name="name_last" value="{{ old('name_last') }}" class="form-control" />
+                            <input type="text" autocomplete="off" name="name_first" value="{{ old('name_first') }}" class="form-control" />
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/resources/views/admin/users/view.blade.php b/resources/views/admin/users/view.blade.php
index 96b20bd991..a5596cebe8 100644
--- a/resources/views/admin/users/view.blade.php
+++ b/resources/views/admin/users/view.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content-header')
-    <h1>{{ $user->name_first }} {{ $user->name_last}}<small>{{ $user->username }}</small></h1>
+    <h1>{{ $user->name_last}} {{ $user->name_first }}<small>{{ $user->username }}</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">管理</a></li>
         <li><a href="{{ route('admin.users') }}">用户</a></li>
@@ -37,13 +37,13 @@
                     <div class="form-group">
                         <label for="registered" class="control-label">姓</label>
                         <div>
-                            <input type="text" name="name_first" value="{{ $user->name_first }}" class="form-control form-autocomplete-stop">
+                            <input type="text" name="name_last" value="{{ $user->name_last }}" class="form-control form-autocomplete-stop">
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="registered" class="control-label">名</label>
                         <div>
-                            <input type="text" name="name_last" value="{{ $user->name_last }}" class="form-control form-autocomplete-stop">
+                            <input type="text" name="name_first" value="{{ $user->name_first }}" class="form-control form-autocomplete-stop">
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index b9d5182226..ae3d1f52cb 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -53,7 +53,7 @@
                             <li class="user-menu">
                                 <a href="{{ route('account') }}">
                                     <img src="https://cravatar.cn/avatar/{{ md5(strtolower(Auth::user()->email)) }}?s=160" class="user-image" alt="User Image">
-                                    <span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span>
+                                    <span class="hidden-xs">{{ Auth::user()->name_last }} {{ Auth::user()->name_first }}</span>
                                 </a>
                             </li>
                             <li>