From 4a6b8aed46f362a676971884a4fe7d3fd278a4d2 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 2 Dec 2019 20:04:52 +0800
Subject: [PATCH] Repair English not translated (#1338)

---
 .../conf/home/pages/dag/_source/formModel/tasks/flink.vue | 2 +-
 .../conf/home/pages/dag/_source/formModel/tasks/http.vue  | 5 +++--
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js    | 8 +++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index d2d6a3778..a71c8d729 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -98,7 +98,7 @@
         </span>
       </div>
       <div class="clearfix list">
-        <span class="sp1">{{$t('jobManagerMemory')}}</span>
+        <span class="sp1" style="word-break:break-all">{{$t('jobManagerMemory')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
index 3e40fce93..2617c4403 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
@@ -60,7 +60,7 @@
       <div slot="text">{{$t('Http Check Condition')}}</div>
       <div slot="content">
         <x-select
-          style="width: 150px;"
+          style="width: 230px;"
           v-model="httpCheckCondition"
           :disabled="isDetails">
           <x-option
@@ -101,6 +101,7 @@
 <script>
   import _ from 'lodash'
   import i18n from '@/module/i18n'
+  import cookie from '@/module/util/cookie'
   import mLocalParams from './_source/localParams'
   import mHttpParams from './_source/httpParams'
   import mListBox from './_source/listBox'
@@ -116,7 +117,7 @@
         httpMethod: 'GET',
         httpMethodList: [{ code: 'GET' }, { code: 'POST' }, { code: 'HEAD' }, { code: 'PUT' }, { code: 'DELETE' }],
         httpCheckCondition: 'STATUS_CODE_DEFAULT',
-        httpCheckConditionList: [{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]
+        httpCheckConditionList: cookie.get('language') == 'en_US'? [{ code: 'STATUS_CODE_DEFAULT',value:'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM',value:'Custom response code' }, { code: 'BODY_CONTAINS',value:'Content includes' }, { code: 'BODY_NOT_CONTAINS',value:'Content does not contain' }]:[{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]
       }
     },
     props: {
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 868e83513..041704df9 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -165,6 +165,7 @@ export default {
   'Tenant Code': 'Tenant Code',
   'Tenant Name': 'Tenant Name',
   'Queue': 'Queue',
+  'Please select a queue': 'Please select a queue',
   'Please enter the tenant code in English': 'Please enter the tenant code in English',
   'Please enter tenant code in English': 'Please enter tenant code in English',
   'Edit User': 'Edit User',
@@ -172,6 +173,7 @@ export default {
   'Email': 'Email',
   'Phone': 'Phone',
   'Please enter phone number': 'Please enter phone number',
+  'Please enter main class': 'Please enter main class',
   'Please enter email': 'Please enter email',
   'Please enter the correct email format': 'Please enter the correct email format',
   'Please enter the correct mobile phone format': 'Please enter the correct mobile phone format',
@@ -296,6 +298,10 @@ export default {
   'Resume the suspension process': 'Resume the suspension process',
   'Execute from the failed nodes': 'Execute from the failed nodes',
   'Complement Data': 'Complement Data',
+  'slot':'slot',
+  'taskManager':'taskManager',
+  'jobManagerMemory':'jobManagerMemory',
+  'taskManagerMemory':'taskManagerMemory',
   'Scheduling execution': 'Scheduling execution',
   'Recovery waiting thread': 'Recovery waiting thread',
   'Submitted successfully': 'Submitted successfully',
@@ -449,7 +455,7 @@ export default {
   'Task queue': 'Task queue',
   'Error command count': 'Error command count',
   'Normal command count': 'Normal command count',
-  'Manage': 'Manage',
+  'Manage': ' Manage',
   'Number of connections': 'Number of connections',
   'Sent': 'Sent',
   'Received': 'Received',
-- 
GitLab