From 96ef2b6548215aba349b216c2b9573a720751355 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 6 Sep 2021 15:00:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=9A=E7=9F=A5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/TaskNotification.vue         | 26 ++++++++++----
 .../api/ApiAutomationNotification.vue         |  4 +--
 .../api/ApiDefinitionNotification.vue         |  4 +--
 .../components/api/ApiHomeNotification.vue    |  4 +--
 .../components/api/ApiReportNotification.vue  |  4 +--
 .../jenkins/JenkinsNotification.vue           |  2 +-
 .../PerformanceReportNotification.vue         |  4 +--
 .../PerformanceTestNotification.vue           |  4 +--
 .../track/DefectTaskNotification.vue          |  2 +-
 .../components/track/TestCaseNotification.vue |  4 +--
 .../track/TestPlanTaskNotification.vue        |  2 +-
 .../track/TestReviewNotification.vue          |  2 +-
 .../track/TrackHomeNotification.vue           |  4 +--
 .../track/TrackReportNotification.vue         |  4 +--
 frontend/src/i18n/en-US.js                    | 34 +++++++++++--------
 frontend/src/i18n/zh-CN.js                    |  6 +++-
 frontend/src/i18n/zh-TW.js                    |  6 +++-
 17 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/TaskNotification.vue b/frontend/src/business/components/settings/organization/TaskNotification.vue
index 0c2e37d487..7897e500e7 100644
--- a/frontend/src/business/components/settings/organization/TaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/TaskNotification.vue
@@ -11,9 +11,11 @@
       <el-collapse-item name="2">
         <template v-slot:title>
           <span style="width: 200px">
-            测试跟踪任务通知
+            {{ $t('organization.message.track') }}
+          </span>
+          <span>
+            {{ $t('organization.message.notice_count') }}: <span class="primary-text">{{ trackNoticeSize }}</span>
           </span>
-          <span>通知数: <span style="color: #783887;">{{ trackNoticeSize }}</span></span>
         </template>
         <track-home-notification @noticeSize="getNoticeSize" :receiver-options="reviewReceiverOptions"
                                  :receive-type-options="receiveTypeOptions"/>
@@ -31,9 +33,11 @@
       <el-collapse-item name="3">
         <template v-slot:title>
           <span style="width: 200px">
-            接口测试任务通知
+            {{ $t('organization.message.api') }}
+          </span>
+          <span>
+            {{ $t('organization.message.notice_count') }}: <span class="primary-text">{{ apiNoticeSize }}</span>
           </span>
-          <span>通知数: <span style="color: #783887;">{{ apiNoticeSize }}</span></span>
         </template>
         <api-home-notification @noticeSize="getNoticeSize" :receiver-options="reviewReceiverOptions"
                                :receive-type-options="receiveTypeOptions"/>
@@ -47,9 +51,11 @@
       <el-collapse-item name="4">
         <template v-slot:title>
           <span style="width: 200px">
-            性能测试任务通知
+            {{ $t('organization.message.performance') }}
+          </span>
+          <span>
+            {{ $t('organization.message.notice_count') }}: <span class="primary-text">{{ performanceNoticeSize }}</span>
           </span>
-          <span>通知数: <span style="color: #783887;">{{ performanceNoticeSize }}</span></span>
         </template>
         <performance-test-notification @noticeSize="getNoticeSize" :receiver-options="reviewReceiverOptions"
                                        :receive-type-options="receiveTypeOptions"/>
@@ -59,7 +65,9 @@
       <el-collapse-item name="1">
         <template v-slot:title>
           <span style="width: 200px">{{ $t('organization.message.jenkins_task_notification') }}</span>
-          <span>通知数: <span style="color: #783887;">{{ jenkinsNoticeSize }}</span></span>
+          <span>
+            {{ $t('organization.message.notice_count') }}: <span class="primary-text">{{ jenkinsNoticeSize }}</span>
+          </span>
         </template>
         <jenkins-notification @noticeSize="getNoticeSize" :jenkins-receiver-options="jenkinsReceiverOptions"
                               :receive-type-options="receiveTypeOptions"/>
@@ -205,4 +213,8 @@ export default {
   height: calc(100vh - 200px);
   overflow: auto;
 }
+
+.primary-text {
+  color: #783887;
+}
 </style>
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
index 2e5ff0903c..4708b6448f 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>接口自动化</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.automation') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
index 0767811671..3b77318158 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>接口定义</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.definition') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
index 93ca9837ff..3dc4ffb9d2 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>首页</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.home') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
index 27a82eef43..ad7d0b43f4 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>测试报告</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.report') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
index 6d742b6897..2368d4f405 100644
--- a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
+      <el-col :span="24">
         <h3>{{ $t('organization.message.jenkins_task_notification') }}</h3>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
index 9758dab9ae..c097586fc3 100644
--- a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>报告</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.report') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
index bb4cdb6c04..ae2708ddc6 100644
--- a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>测试</h5>
+      <el-col :span="24">
+        <h5>{{ $t('commons.performance') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
index 70196ec88d..7ac4b123b6 100644
--- a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
+      <el-col :span="24">
         <h5>{{ $t('test_track.issue.issue') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
diff --git a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
index 9c6b0e4ca5..95518e4cfa 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>测试用例</h5>
+      <el-col :span="24">
+        <h5>{{$t('test_track.case.test_case')}}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
index db6c61fef3..b3f025c730 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
+      <el-col :span="24">
         <h5>{{ $t('test_track.plan.test_plan') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
diff --git a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
index 999da6c1e4..73c7e9d293 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
+      <el-col :span="24">
         <h5>{{ $t('test_track.review.test_review') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
diff --git a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
index b461bd36cb..de7ac1f4a5 100644
--- a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>首页</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.home') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
index cdf80abbd4..ec504d0048 100644
--- a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
-        <h5>报告</h5>
+      <el-col :span="24">
+        <h5>{{ $t('i18n.report') }}</h5>
         <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel"
                    v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 44efe8fbd3..e92ac79bda 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -393,7 +393,11 @@ export default {
         '3. When selecting the receiver, it must be the person included in the group you created. The mobile phone number of the receiver is required and it is the mobile phone number used by the nailing enterprise',
       message: 'Event, receiver and receiving method are required\n',
       message_webhook: 'Webhook is required when the receiving mode is nail or enterprise robot or lark',
-      template: "Template"
+      template: "Template",
+      track: 'Track notification',
+      api: 'Api notification',
+      performance: 'Performance notification',
+      notice_count: 'Number',
     },
     integration: {
       select_defect_platform: 'Please select the defect management platform to be integrated:',
@@ -434,12 +438,12 @@ export default {
       azure_storytype: 'Azure story type',
       input_azure_issuetype: 'Please enter the issue type',
       input_azure_storytype: 'Please enter the story type',
-      azure_pat:'PersonalAccessTokens',
-      azure_devops_url:'Azure Devops url',
-      azure_organization_id:'Azure Organization ID',
-      input_azure_pat:'Please enter Personal Access Token',
-      input_azure_url:'Please enter Azure Devops Url',
-      input_azure_id:'Please enter Azure Organization ID',
+      azure_pat: 'PersonalAccessTokens',
+      azure_devops_url: 'Azure Devops url',
+      azure_organization_id: 'Azure Organization ID',
+      input_azure_pat: 'Please enter Personal Access Token',
+      input_azure_url: 'Please enter Azure Devops Url',
+      input_azure_id: 'Please enter Azure Organization ID',
       use_tip_azure: 'Azure Devops URL+PersonalAccessTokens(User Settings-Personal Access Tokens-New Token)',
     }
   },
@@ -514,7 +518,7 @@ export default {
     select_project: 'please select project',
     select_group: 'please select group',
     add_user_group_batch: 'Batch Add User Group',
-    add_project_batch : 'Batch Add User To Project',
+    add_project_batch: 'Batch Add User To Project',
     add_project_batch_tip: 'Add a read-only user group for members by default (system)',
   },
   group: {
@@ -698,11 +702,11 @@ export default {
     csv_has_header: 'Contains Title',
     csv_split: 'CSV Split',
     on_sample_error: 'After a Sampler error',
-    continue:'Continue',
-    startnextloop:'Start the next loop',
-    stopthread:'Stop thread',
-    stoptest:'Stop test',
-    stoptestnow:'Stop the test immediately',
+    continue: 'Continue',
+    startnextloop: 'Start the next loop',
+    stopthread: 'Stop thread',
+    stoptest: 'Stop test',
+    stoptestnow: 'Stop the test immediately',
     report: {
       diff: "Compare",
       set_default: 'Set to Default',
@@ -833,8 +837,8 @@ export default {
         batch_delete: "Batch deletion",
         delete_confirm: "Confirm deletion",
         batch_to_performance_confirm: "Confirm Batch Create Performance Test",
-        batch_copy_confirm:"Confirm batch copy",
-        batch_copy_end:"Batch Copy Over",
+        batch_copy_confirm: "Confirm batch copy",
+        batch_copy_end: "Batch Copy Over",
         delete_case_confirm: "Confirm case deletion",
         delete_confirm_step: "Confirm deletion step",
         assertions_rule: "Assertion rule",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index cf9c1dc0b1..8608daaf25 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -396,7 +396,11 @@ export default {
         '       3.选择接收人时必须是你所建的群里包含的人,接收人手机号为必填项且为钉钉企业所使用的手机号',
       message: '事件，接收人，接收方式为必填项',
       message_webhook: '接收方式为钉钉和企业机器人,飞书时，webhook为必填项',
-      template: "模版"
+      template: "模版",
+      track: '测试跟踪任务通知',
+      api: '接口测试任务通知',
+      performance: '性能测试任务通知',
+      notice_count: '通知数',
     },
     integration: {
       select_defect_platform: '请选择要集成的缺陷管理平台：',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index e74faec050..8d36781c1c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -395,7 +395,11 @@ export default {
         '       3.選擇接收人時必須是你所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號',
       message: '事件，接收人，接收方式為必填項',
       message_webhook: '接收方式為釘釘和企業機器人,飛書時，webhook為必填項',
-      template: "模版"
+      template: "模版",
+      track: '測試跟踪任務通知',
+      api: '接口測試任務通知',
+      performance: '性能測試任務通知',
+      notice_count: '通知數',
     },
     integration: {
       select_defect_platform: '請選擇要集成的缺陷管理平臺：',