You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/12/01 09:19:52 UTC

[dolphinscheduler] branch 2.0.1-prepare updated: [2.0.1-cherrypick][#6922] Improve English support. (#7104)

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch 2.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.1-prepare by this push:
     new c158e57  [2.0.1-cherrypick][#6922] Improve English support. (#7104)
c158e57 is described below

commit c158e5790bba3e3cb2684d6397fd20264379900f
Author: songjianet <17...@qq.com>
AuthorDate: Wed Dec 1 17:19:45 2021 +0800

    [2.0.1-cherrypick][#6922] Improve English support. (#7104)
    
    * [Feature][Workflow relationship] Improve English support.
    
    * [Feature][Workflow relationship] Improve English support.
---
 .../pages/kinship/_source/graphGridOption.js       | 17 +++----
 .../src/js/module/i18n/locale/en_US.js             | 56 +++++++++++++++++++--
 .../src/js/module/i18n/locale/zh_CN.js             | 57 ++++++++++++++++++++--
 3 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
index 5ad2408..4bbcc3b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
@@ -66,15 +66,14 @@ export default function (locations, links, sourceWorkFlowCode, isShowLabel) {
       formatter: (params) => {
         if (!params.data.name) return ''
         const { name, scheduleStartTime, scheduleEndTime, crontab, workFlowPublishStatus, schedulePublishStatus } = params.data
-        const str = `
-      工作流名字:${name}<br/>
-      调度开始时间:${scheduleStartTime}<br/>
-      调度结束时间:${scheduleEndTime}<br/>
-      crontab表达式:${crontab}<br/>
-      工作流发布状态:${workFlowPublishStatus}<br/>
-      调度发布状态:${schedulePublishStatus}<br/>
-      `
-        return str
+        return `
+          ${i18n.$t('workflowName')}:${name}<br/>
+          ${i18n.$t('scheduleStartTime')}:${scheduleStartTime}<br/>
+          ${i18n.$t('scheduleEndTime')}:${scheduleEndTime}<br/>
+          ${i18n.$t('crontabExpression')}:${crontab}<br/>
+          ${i18n.$t('workflowPublishStatus')}:${workFlowPublishStatus}<br/>
+          ${i18n.$t('schedulePublishStatus')}:${schedulePublishStatus}<br/>
+        `
       },
       color: '#2D303A',
       textStyle: {
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 f2164e2..1876c7c 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -420,8 +420,6 @@ export default {
   'Notification strategy': 'Notification strategy',
   'Notification group': 'Notification group',
   'Please select a notification group': 'Please select a notification group',
-  receivers: 'receivers',
-  receiverCcs: 'receiverCcs',
   'Whether it is a complement process?': 'Whether it is a complement process?',
   'Schedule date': 'Schedule date',
   'Mode of execution': 'Mode of execution',
@@ -712,5 +710,57 @@ export default {
   condition: 'condition',
   'The condition content cannot be empty': 'The condition content cannot be empty',
   'Reference from': 'Reference from',
-  'No more...': 'No more...'
+  'No more...': 'No more...',
+  'Task Definition': 'Task Definition',
+  'Create task': 'Create task',
+  'Task Type': 'Task Type',
+  'Process execute type': 'Process execute type',
+  parallel: 'parallel',
+  'Serial wait': 'Serial wait',
+  'Serial discard': 'Serial discard',
+  'Serial priority': 'Serial priority',
+  'Recover serial wait': 'Recover serial wait',
+  IsEnableProxy: 'Enable Proxy',
+  WebHook: 'WebHook',
+  Keyword: 'Keyword',
+  Proxy: 'Proxy',
+  receivers: 'Receivers',
+  receiverCcs: 'ReceiverCcs',
+  transportProtocol: 'Transport Protocol',
+  serverHost: 'SMTP Host',
+  serverPort: 'SMTP Port',
+  sender: 'Sender',
+  enableSmtpAuth: 'SMTP Auth',
+  starttlsEnable: 'SMTP STARTTLS Enable',
+  sslEnable: 'SMTP SSL Enable',
+  smtpSslTrust: 'SMTP SSL Trust',
+  url: 'URL',
+  requestType: 'Request Type',
+  headerParams: 'Headers',
+  bodyParams: 'Body',
+  contentField: 'Content Field',
+  path: 'Script Path',
+  userParams: 'User Params',
+  corpId: 'CorpId',
+  secret: 'Secret',
+  userSendMsg: 'UserSendMsg',
+  agentId: 'AgentId',
+  users: 'Users',
+  Username: 'Username',
+  showType: 'Show Type',
+  'Please select a task type (required)': 'Please select a task type (required)',
+  layoutType: 'Layout Type',
+  gridLayout: 'Grid',
+  dagreLayout: 'Dagre',
+  rows: 'Rows',
+  cols: 'Cols',
+  processOnline: 'Online',
+  searchNode: 'Search Node',
+  dagScale: 'Scale',
+  workflowName: 'Workflow Name',
+  scheduleStartTime: 'Schedule Start Time',
+  scheduleEndTime: 'Schedule End Time',
+  crontabExpression: 'Crontab',
+  workflowPublishStatus: 'Workflow Publish Status',
+  schedulePublishStatus: 'Schedule Publish Status'
 }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 82330ee..3339880 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -419,8 +419,6 @@ export default {
   'Notification strategy': '通知策略',
   'Notification group': '通知组',
   'Please select a notification group': '请选择通知组',
-  receivers: '收件人',
-  receiverCcs: '抄送人',
   'Whether it is a complement process?': '是否补数',
   'Schedule date': '调度日期',
   'Mode of execution': '执行方式',
@@ -711,5 +709,58 @@ export default {
   condition: '条件',
   'The condition content cannot be empty': '条件内容不能为空',
   'Reference from': '使用已有任务',
-  'No more...': '没有更多了...'
+  'No more...': '没有更多了...',
+  'Task Definition': '任务定义',
+  'Create task': '创建任务',
+  'Task Type': '任务类型',
+  'Process execute type': '执行策略',
+  parallel: '并行',
+  'Serial wait': '串行等待',
+  'Serial discard': '串行抛弃',
+  'Serial priority': '串行优先',
+  'Recover serial wait': '串行恢复',
+  IsEnableProxy: '启用代理',
+  WebHook: 'Web钩子',
+  Keyword: '密钥',
+  Proxy: '代理',
+  receivers: '收件人',
+  receiverCcs: '抄送人',
+  transportProtocol: '邮件协议',
+  serverHost: 'SMTP服务器',
+  serverPort: 'SMTP端口',
+  sender: '发件人',
+  enableSmtpAuth: '请求认证',
+  starttlsEnable: 'STARTTLS连接',
+  sslEnable: 'SSL连接',
+  smtpSslTrust: 'SSL证书信任',
+  url: 'URL',
+  requestType: '请求方式',
+  headerParams: '请求头',
+  bodyParams: '请求体',
+  contentField: '内容字段',
+  path: '脚本路径',
+  userParams: '自定义参数',
+  corpId: '企业ID',
+  secret: '密钥',
+  teamSendMsg: '群发信息',
+  userSendMsg: '群员信息',
+  agentId: '应用ID',
+  users: '群员',
+  Username: '用户名',
+  showType: '内容展示类型',
+  'Please select a task type (required)': '请选择任务类型(必选)',
+  layoutType: '布局类型',
+  gridLayout: '网格布局',
+  dagreLayout: '层次布局',
+  rows: '行数',
+  cols: '列数',
+  processOnline: '已上线',
+  searchNode: '搜索节点',
+  dagScale: '缩放',
+  workflowName: '工作流名称',
+  scheduleStartTime: '定时开始时间',
+  scheduleEndTime: '定时结束时间',
+  crontabExpression: 'Crontab',
+  workflowPublishStatus: '工作流上线状态',
+  schedulePublishStatus: '定时状态'
 }