BrettonYe пре 2 година
родитељ
комит
156081a4fc

+ 9 - 9
resources/lang/en/admin.php

@@ -205,14 +205,14 @@ return [
                 'title' => 'Deploy :type_label Backend',
                 'attribute' => 'Backend Deployment',
                 'command' => 'Instructions',
-                'update' => 'Update: ',
-                'uninstall' => 'Uninstall: ',
-                'start' => 'Start: ',
-                'stop' => 'Stop: ',
-                'status' => 'Status: ',
-                'recent_logs' => 'Recent Logs: ',
-                'real_time_logs' => 'Real-time Logs: ',
-                'restart' => 'Restart: ',
+                'update' => 'Update',
+                'uninstall' => 'Uninstall',
+                'start' => 'Start',
+                'stop' => 'Stop',
+                'status' => 'Status',
+                'recent_logs' => 'Recent Logs',
+                'real_time_logs' => 'Real-time Logs',
+                'restart' => 'Restart',
                 'same' => 'Same Above',
                 'trojan_hint' => 'Please fill in node <a href=":url" target="_blank">domain</a> and resolve domain DNS to node IP',
             ],
@@ -526,7 +526,7 @@ return [
         'is_email_filtering' => 'Email Filtering',
         'is_forbid_robot' => 'Forbid Bots',
         'is_free_code' => 'Free Invitation Codes',
-        'is_invite_register' => 'Invitation Registration',
+        'is_invite_register' => 'Invitation to Register',
         'is_otherPay' => 'Custom Payment',
         'is_QQPay' => 'QQ Pay',
         'is_rand_port' => 'Random Port',

+ 8 - 8
resources/lang/ja/admin.php

@@ -205,14 +205,14 @@ return [
                 'title' => ':type_label バックエンドのデプロイ',
                 'attribute' => 'バックエンドのデプロイ',
                 'command' => 'コマンド',
-                'update' => 'アップデート:',
-                'uninstall' => 'アンインストール:',
-                'start' => '開始:',
-                'stop' => '停止:',
-                'status' => 'ステータス:',
-                'recent_logs' => '最近のログ:',
-                'real_time_logs' => 'リアルタイムログ:',
-                'restart' => '再起動:',
+                'update' => 'アップデート',
+                'uninstall' => 'アンインストール',
+                'start' => '開始',
+                'stop' => '停止',
+                'status' => 'ステータス',
+                'recent_logs' => '最近のログ',
+                'real_time_logs' => 'リアルタイムログ',
+                'restart' => '再起動',
                 'same' => '上と同じ',
                 'trojan_hint' => '先に<a href=":url" target="_blank">ドメイン</a>を設定し、DNSをIPに解決してください',
             ],

+ 1 - 1
resources/lang/ja/notification.php

@@ -6,7 +6,7 @@ return [
     'attribute' => '通知',
     'new' => '新しいメッセージが:num件あります',
     'empty' => '新しいメッセージはありません',
-    'payment_received' => '支払いを受け取りました。金額: :amount。注文の詳細を見る',
+    'payment_received' => '支払いを受け取りました。金額: :amount。注文の詳細を見る',
     'account_expired' => 'アカウントの有効期限切れ注意',
     'account_expired_content' => ':days日後にアカウントが期限切れとなります。サービスを継続するためには早めに更新してください。',
     'account_expired_blade' => ':days日後にアカウントが期限切れになります。早めに更新してください。',

+ 8 - 8
resources/lang/zh_CN/admin.php

@@ -205,14 +205,14 @@ return [
                 'title' => '部署 :type_label 后端',
                 'attribute' => '部署后端',
                 'command' => '操作命令',
-                'update' => '更新',
-                'uninstall' => '卸载',
-                'start' => '启动',
-                'stop' => '停止',
-                'status' => '状态',
-                'recent_logs' => '近期日志',
-                'real_time_logs' => '实时日志',
-                'restart' => '重启',
+                'update' => '更新',
+                'uninstall' => '卸载',
+                'start' => '启动',
+                'stop' => '停止',
+                'status' => '状态',
+                'recent_logs' => '近期日志',
+                'real_time_logs' => '实时日志',
+                'restart' => '重启',
                 'same' => '同上',
                 'trojan_hint' => '请先<a href=":url" target="_blank">填写节点域名</a>并将域名解析到节点对应的IP上',
             ],

+ 1 - 1
resources/lang/zh_CN/notification.php

@@ -6,7 +6,7 @@ return [
     'attribute' => '通知',
     'new' => '您有:num条新消息',
     'empty' => '您当前没有新消息',
-    'payment_received' => '您的订单支付成功,金额为:amount,请点击查看订单详情',
+    'payment_received' => '您的订单支付成功,金额为:amount,请点击查看订单详情',
     'account_expired' => '账号过期提醒',
     'account_expired_content' => '您的账号将在:days天后过期,为避免影响正常使用,请及时续费',
     'account_expired_blade' => '您的账号将于:days天后过期,请及时续费',

+ 2 - 2
resources/views/admin/coupon/create.blade.php

@@ -111,7 +111,7 @@
                                     <input type="number" class="form-control col-md-3" name="minimum" id="minimum"
                                            value="{{old('minimum')}}" step="0.01"/>
                                 </div>
-                                <span class="text-help"> {!! trans('admin.coupon.minimum_hint', ['num' => 'N']).trans('admin.zero_unlimited_hint') !!} </span>
+                                <span class="text-help"> {!! trans('admin.coupon.minimum_hint', ['num' => 'N']).' '.trans('admin.zero_unlimited_hint') !!} </span>
                             </div>
                         </div>
                         <div class="form-group row">
@@ -122,7 +122,7 @@
                                            value="{{old('used')}}" step="1"/>
                                     <span class="input-group-text">{{ trans('admin.times') }}</span>
                                 </div>
-                                <span class="text-help"> {!! trans('admin.coupon.used_hint', ['num' => 'N']).trans('admin.zero_unlimited_hint') !!}</span>
+                                <span class="text-help"> {!! trans('admin.coupon.used_hint', ['num' => 'N']).' '.trans('admin.zero_unlimited_hint') !!}</span>
                             </div>
                         </div>
                         <div class="form-group row">

+ 29 - 29
resources/views/admin/node/auth.blade.php

@@ -101,19 +101,19 @@
                                 <br>
                                 <br>
                                 <div class="text-center red-700 mb-5">{{ trans('admin.node.auth.deploy.command') }}</div>
-                                {{ trans('admin.node.auth.deploy.update') }}{{ trans('admin.node.auth.deploy.same') }}
+                                {{ trans('admin.node.auth.deploy.update') }}: {{ trans('admin.node.auth.deploy.same') }}
                                 <br>
-                                {{ trans('admin.node.auth.deploy.uninstall') }}curl -L -s https://bit.ly/3oO3HZy | bash -s -- --remove
+                                {{ trans('admin.node.auth.deploy.uninstall') }}: curl -L -s https://bit.ly/3oO3HZy | bash -s -- --remove
                                 <br>
-                                {{ trans('admin.node.auth.deploy.start') }}systemctl start vnet-v2ray
+                                {{ trans('admin.node.auth.deploy.start') }}: systemctl start vnet-v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.stop') }}systemctl stop vnet-v2ray
+                                {{ trans('admin.node.auth.deploy.stop') }}: systemctl stop vnet-v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.status') }}systemctl status vnet-v2ray
+                                {{ trans('admin.node.auth.deploy.status') }}: systemctl status vnet-v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.recent_logs') }}journalctl -x -n 300 --no-pager -u vnet-v2ray
+                                {{ trans('admin.node.auth.deploy.recent_logs') }}: journalctl -x -n 300 --no-pager -u vnet-v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.real_time_logs') }}journalctl -u vnet-v2ray -f
+                                {{ trans('admin.node.auth.deploy.real_time_logs') }}: journalctl -u vnet-v2ray -f
                             </div>
                             <div class="alert alert-info text-break">
                                 <div class="text-center red-700 mb-5">V2Ray-Poseidon</div>
@@ -126,19 +126,19 @@
                                 <br>
                                 <br>
                                 <div class="text-center red-700 mb-5">{{ trans('admin.node.auth.deploy.command') }}</div>
-                                {{ trans('admin.node.auth.deploy.update') }}curl -L -s https://bit.ly/2HswWko | bash
+                                {{ trans('admin.node.auth.deploy.update') }}: curl -L -s https://bit.ly/2HswWko | bash
                                 <br>
-                                {{ trans('admin.node.auth.deploy.uninstall') }}curl -L -s https://mrw.so/5IHPR4 | bash
+                                {{ trans('admin.node.auth.deploy.uninstall') }}: curl -L -s https://mrw.so/5IHPR4 | bash
                                 <br>
-                                {{ trans('admin.node.auth.deploy.start') }}systemctl start v2ray
+                                {{ trans('admin.node.auth.deploy.start') }}: systemctl start v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.stop') }}systemctl stop v2ray
+                                {{ trans('admin.node.auth.deploy.stop') }}: systemctl stop v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.status') }}systemctl status v2ray
+                                {{ trans('admin.node.auth.deploy.status') }}: systemctl status v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.recent_logs') }}journalctl -x -n 300 --no-pager -u v2ray
+                                {{ trans('admin.node.auth.deploy.recent_logs') }}: journalctl -x -n 300 --no-pager -u v2ray
                                 <br>
-                                {{ trans('admin.node.auth.deploy.real_time_logs') }}journalctl -u v2ray -f
+                                {{ trans('admin.node.auth.deploy.real_time_logs') }}: journalctl -u v2ray -f
                             </div>
                         @elseif($auth->node->type === 3)
                             @if(!$auth->node->server)
@@ -158,19 +158,19 @@
                                     <br>
                                     <br>
                                     <div class="text-center red-700 mb-5">{{ trans('admin.node.auth.deploy.command') }}</div>
-                                    {{ trans('admin.node.auth.deploy.update') }}curl -L -s https://mrw.so/6cMfGy | bash
+                                    {{ trans('admin.node.auth.deploy.update') }}: curl -L -s https://mrw.so/6cMfGy | bash
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.uninstall') }}curl -L -s https://mrw.so/5ulpvu | bash
+                                    {{ trans('admin.node.auth.deploy.uninstall') }}: curl -L -s https://mrw.so/5ulpvu | bash
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.start') }}systemctl start trojanp
+                                    {{ trans('admin.node.auth.deploy.start') }}: systemctl start trojanp
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.stop') }}systemctl stop trojanp
+                                    {{ trans('admin.node.auth.deploy.stop') }}: systemctl stop trojanp
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.status') }}systemctl status trojanp
+                                    {{ trans('admin.node.auth.deploy.status') }}: systemctl status trojanp
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.recent_logs') }}journalctl -x -n 300 --no-pager -u trojanp
+                                    {{ trans('admin.node.auth.deploy.recent_logs') }}: journalctl -x -n 300 --no-pager -u trojanp
                                     <br>
-                                    {{ trans('admin.node.auth.deploy.real_time_logs') }}journalctl -u trojanp -f
+                                    {{ trans('admin.node.auth.deploy.real_time_logs') }}: journalctl -u trojanp -f
                                 </div>
                             @endif
                         @else
@@ -185,21 +185,21 @@
                                 <br>
                                 <br>
                                 <div class="text-center red-700 mb-5">{{ trans('admin.node.auth.deploy.command') }}</div>
-                                {{ trans('admin.node.auth.deploy.update') }}{{ trans('admin.node.auth.deploy.same') }}
+                                {{ trans('admin.node.auth.deploy.update') }}: {{ trans('admin.node.auth.deploy.same') }}
                                 <br>
-                                {{ trans('admin.node.auth.deploy.uninstall') }}curl -L -s https://bit.ly/3828OP1 | bash -s -- --remove
+                                {{ trans('admin.node.auth.deploy.uninstall') }}: curl -L -s https://bit.ly/3828OP1 | bash -s -- --remove
                                 <br>
-                                {{ trans('admin.node.auth.deploy.start') }}systemctl start vnet
+                                {{ trans('admin.node.auth.deploy.start') }}: systemctl start vnet
                                 <br>
-                                {{ trans('admin.node.auth.deploy.stop') }}systemctl stop vnet
+                                {{ trans('admin.node.auth.deploy.stop') }}: systemctl stop vnet
                                 <br>
-                                {{ trans('admin.node.auth.deploy.restart') }}systemctl restart vnet
+                                {{ trans('admin.node.auth.deploy.restart') }}: systemctl restart vnet
                                 <br>
-                                {{ trans('admin.node.auth.deploy.status') }}systemctl status vnet
+                                {{ trans('admin.node.auth.deploy.status') }}: systemctl status vnet
                                 <br>
-                                {{ trans('admin.node.auth.deploy.recent_logs') }}journalctl -x -n 300 --no-pager -u vnet
+                                {{ trans('admin.node.auth.deploy.recent_logs') }}: journalctl -x -n 300 --no-pager -u vnet
                                 <br>
-                                {{ trans('admin.node.auth.deploy.real_time_logs') }}journalctl -u vnet -f
+                                {{ trans('admin.node.auth.deploy.real_time_logs') }}: journalctl -u vnet -f
                             </div>
                         @endif
                     </div>

+ 1 - 1
resources/views/auth/free.blade.php

@@ -1,7 +1,7 @@
 @extends('auth.layouts')
 @section('title',sysConfig('website_name'))
 @section('content')
-    <h4 class="caption-subject font-dark bold">{{trans('common.free').trans('auth.invite.attribute')}}</h4>
+    <h4 class="caption-subject font-dark bold">{{ '['.trans('common.free').'] '.trans('auth.invite.attribute')}}</h4>
     <div class="table-responsive">
         <table class="table table-hover text-center">
             @if(sysConfig('is_invite_register'))

+ 1 - 1
resources/views/user/buy.blade.php

@@ -188,7 +188,7 @@
             }
           },
           error: function() {
-            swal.fire('{{trans('common.status.unknown').trans('common.error')}}', '{{trans('user.shop.call4help')}}', 'error');
+            swal.fire('{{trans('http-statuses.unknownError')}}', '{{trans('user.shop.call4help')}}', 'error');
           },
         });
       }

+ 1 - 1
resources/views/user/components/payment/default.blade.php

@@ -4,7 +4,7 @@
         <div class="panel panel-bordered">
             <div class="panel-heading">
                 <h1 class="panel-title cyan-600">
-                    <i class="icon wb-payment"></i>{{sysConfig('website_name').trans('user.shop.pay_online')}}
+                    <i class="icon wb-payment"></i>{{sysConfig('website_name').' - '.trans('user.shop.pay_online')}}
                 </h1>
             </div>
             <div class="panel-body border-primary ml-auto mr-auto w-p75">

+ 1 - 1
resources/views/user/index.blade.php

@@ -160,7 +160,7 @@
                                             </div>
                                         @endif
                                         <div class="form-group row">
-                                            <label class="col-md-auto col-form-label" for="client">{{trans('user.client').trans('common.customize')}}</label>
+                                            <label class="col-md-auto col-form-label" for="client">{{  trans('user.client') }}</label>
                                             <div class="col">
                                                 <select class="form-control" id="client" name="client" data-plugin="selectpicker" data-style="btn-primary btn-outline"
                                                         title="{{trans('common.default')}}">