From 78a25071d1aaf56a6163c3900919cd50929797da Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Tue, 16 Aug 2022 20:37:09 +0800
Subject: [PATCH] improve approval trans

---
 app/Filament/Resources/User/UserResource.php | 4 +++-
 include/constants.php                        | 2 +-
 resources/lang/en/label.php                  | 2 ++
 resources/lang/zh_CN/label.php               | 2 ++
 resources/lang/zh_TW/label.php               | 2 ++
 resources/views/torrent/approval.blade.php   | 4 ++--
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Filament/Resources/User/UserResource.php b/app/Filament/Resources/User/UserResource.php
index df624976..fcb733b1 100644
--- a/app/Filament/Resources/User/UserResource.php
+++ b/app/Filament/Resources/User/UserResource.php
@@ -15,6 +15,7 @@ use Filament\Tables;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Illuminate\Support\HtmlString;
 
 class UserResource extends Resource
 {
@@ -56,7 +57,8 @@ class UserResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('id')->sortable()->searchable(),
-                Tables\Columns\TextColumn::make('username')->searchable()->label(__("label.user.username")),
+                Tables\Columns\TextColumn::make('username')->searchable()->label(__("label.user.username"))
+                    ->formatStateUsing(fn ($record) => new HtmlString(get_username($record->id, false, true, false, true))),
                 Tables\Columns\TextColumn::make('email')->searchable()->label(__("label.email")),
                 Tables\Columns\TextColumn::make('class')->label('Class')
                     ->formatStateUsing(fn(Tables\Columns\Column $column) => $column->getRecord()->classText)
diff --git a/include/constants.php b/include/constants.php
index 54200230..3acaa0a0 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.21');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-13');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-16');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php
index 679c01df..a7cd8e4b 100644
--- a/resources/lang/en/label.php
+++ b/resources/lang/en/label.php
@@ -30,6 +30,8 @@ return [
     'permanent' => 'Permanent',
     'operator' => 'Operator',
     'action' => 'Action',
+    'submit' => 'Submit',
+    'reset' => 'Reset',
     'setting' => [
         'nav_text' => 'Setting',
         'backup' => [
diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php
index 806262d6..2c38b793 100644
--- a/resources/lang/zh_CN/label.php
+++ b/resources/lang/zh_CN/label.php
@@ -30,6 +30,8 @@ return [
     'permanent' => '永久有效',
     'operator' => '操作者',
     'action' => '操作',
+    'submit' => '提交',
+    'reset' => '重置',
     'setting' => [
         'nav_text' => '设置',
         'backup' => [
diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php
index 1fa105db..e1673879 100644
--- a/resources/lang/zh_TW/label.php
+++ b/resources/lang/zh_TW/label.php
@@ -30,6 +30,8 @@ return [
     'permanent' => '永久有效',
     'operator' => '操作者',
     'action' => '操作',
+    'submit' => '提交',
+    'reset' => '重置',
     'setting' => [
         'nav_text' => '設置',
         'backup' => [
diff --git a/resources/views/torrent/approval.blade.php b/resources/views/torrent/approval.blade.php
index 41b01637..4c729b26 100644
--- a/resources/views/torrent/approval.blade.php
+++ b/resources/views/torrent/approval.blade.php
@@ -49,8 +49,8 @@
             </div>
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button class="layui-btn" lay-submit lay-filter="formDemo">Submit</button>
-                    <button type="reset" class="layui-btn layui-btn-primary">Reset</button>
+                    <button class="layui-btn" lay-submit lay-filter="formDemo">{{ __('label.submit') }}</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">{{ __('label.reset') }}</button>
                 </div>
             </div>
         </form>