翻译

.gitignore

@@ -13,6 +13,7 @@ Homestead.yaml
 auth.json
 npm-debug.log
 yarn-error.log
+dcat_admin_ide_helper.del
 /.fleet
 /.idea
 /.vscode

app/Admin/Actions/Grid/InquiryAssignment.php

@@ -13,11 +13,6 @@ use Dcat\Admin\Widgets\Modal;
 
 class InquiryAssignment extends BatchAction
 {
-    /**
-     * @return string
-     */
-	protected $title = 'Inquiry Assignment';
-
 
     /**
      * 初始化操作
@@ -30,7 +25,7 @@ class InquiryAssignment extends BatchAction
         // 实例化表单类
         return Modal::make()
             ->lg()
-            ->title($this->title)
+            ->title(admin_trans_label('inquiry_assignment'))
             ->body(InquiryAssignmentForm::make())
             //->on('click',$this->getModalScript2())
             ->onShow($this->getModalScript())
@@ -45,10 +40,15 @@ class InquiryAssignment extends BatchAction
      * @return string
      */
     public function getModalScript(){
-        $warning = __('No data selected!');
+        $warning = admin_trans_label('no_selected_data');
         return <<<JS
-            var key = {$this->getSelectedKeysScript()}
-            $('#inquiryIds').val(key);
+            try {
+                var key = {$this->getSelectedKeysScript()}
+                $('#inquiryIds').val(key);
+            } catch (e) {
+                Dcat.error('{$warning}');
+                return false;
+            }
         JS;
     }
 

app/Admin/Actions/Tools/InquiryHandle.php

@@ -33,7 +33,8 @@ class InquiryHandle extends AbstractTool
 //        return '您确定要发送新的提醒消息吗？';
 
         // 显示标题和内容
-        return ['Are you sure you want to process these orders?', ''];
+        $msg = admin_trans_label('confirm_process_inquiry');
+        return [$msg, ''];
     }
 
     /**
@@ -50,7 +51,7 @@ class InquiryHandle extends AbstractTool
             if ($result === false) {
                 return $this->response()->error('Failed to process!')->refresh();
             }
-            return $this->response()->success('Success')->refresh();
+            return $this->response()->success(admin_trans_label('update_success'))->refresh();
         } else {
             return $this->response()->error('No data selected!')->refresh();
         }
@@ -61,19 +62,22 @@ class InquiryHandle extends AbstractTool
 
 
     public function actionScript(){
-        $warning = __('No data selected!');
+        $warning = admin_trans_label('no_selected_data');
 
         return <<<JS
 function (data, target, action) {
-    var key = {$this->getSelectedKeysScript()}
-
-    if (key.length === 0) {
+    try {
+        var key = {$this->getSelectedKeysScript()}
+        if (key.length === 0) {
+            Dcat.warning('{$warning}');
+            return false;
+        }
+        // 设置主键为复选框选中的行ID数组
+        action.options.key = key;
+    } catch (e) {
         Dcat.warning('{$warning}');
         return false;
     }
-
-    // 设置主键为复选框选中的行ID数组
-    action.options.key = key;
 }
 JS;
     }

app/Admin/Forms/InquiryAssignment.php

@@ -27,12 +27,12 @@ class InquiryAssignment extends Form
         }
         //分配数据
         DistInquiry::assignData($ids, $distId);
-        return $this->response()->success('allocation successful')->refresh();
+        return $this->response()->success(admin_trans_label('update_success'))->refresh();
     }
 
     public function form()
     {
-        $this->selectTable('distId', 'Select Distributor')
+        $this->selectTable('distId', admin_trans_label('select_distributor'))
             ->title('distId')
             ->model(DistAdminDistributor::class, 'id', 'client_code')
             ->from(DistDistributorTable::make());

app/Distributor/Actions/AppearanceEnable.php

@@ -22,8 +22,9 @@ class AppearanceEnable extends RowAction
 
     public function confirm()
     {
+        $msg = admin_trans_label('confirm_enable_appearance');
         return [
-            "Confirm to enable this appearance?",
+            $msg,
             $this->row->title,
         ];
     }
@@ -35,7 +36,7 @@ class AppearanceEnable extends RowAction
         $appearanceId = $this->getKey();
         DistAdminDistributor::enableTheme($appearanceId);
         // 返回响应结果并刷新页面
-        return $this->response()->success("Success")->refresh();
+        return $this->response()->success(admin_trans_label('update_success'))->refresh();
     }
     /**
      * 设置要POST到接口的数据

app/Distributor/Controllers/DistAppearanceController.php

@@ -49,9 +49,9 @@ class DistAppearanceController extends AdminDistController
             $grid->column('describe')->width('40%');
             $grid->column('isEnabled')->display(function () use ($distInfo) {
                 if ($this->id == $distInfo->appearance_id) {
-                    return '<span class="label" style="background:#21b978;">Yes</span>';
+                    return '<span class="label" style="background:#21b978;">'.admin_trans_label('Yes').'</span>';
                 } else {
-                    return '<span class="label" style="background:#d2d6de;">No</span>';
+                    return '<span class="label" style="background:#d2d6de;">'.admin_trans_label('No').'</span>';
                 }
 
             });

lang/en/global.php

@@ -174,6 +174,11 @@ return [
         'import' => 'Import',
         'update_success' => 'Update Success',
         'upload_failed' => 'Upload Failed',
+        'confirm_enable_appearance' => 'Are you sure to enable appearance?',
+        'inquiry_assignment' => 'Inquiry Assignment',
+        'no_selected_data' => 'No selected data',
+        'select_distributor' => 'Select Distributor',
+        'confirm_process_inquiry' => 'Are you sure to process inquiry?',
     ],
     'options' => [
         //

lang/zh_CN/global.php

@@ -177,6 +177,11 @@ return [
         'import'         => '导入',
         'update_success'         => '更新成功',
         'upload_failed'    => '上传失败',
+        'confirm_enable_appearance' => '确认启用主题？',
+        'inquiry_assignment'    => '询价分配',
+        'no_selected_data'       => '未选择数据',
+        'select_distributor'     => '分销商',
+        'confirm_process_inquiry' => '确认处理询价？',
     ],
     'options' => [
         //