Browse Source

fix bug

Delete invalid field: executorcores

Modify verification prompt
pull/3/MERGE
BoYiZhang 4 years ago
parent
commit
bc98ab525f
  1. 21
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  2. 21
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

21
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -98,7 +98,7 @@ export default {
Script: 'Script', Script: 'Script',
'Please enter script(required)': 'Please enter script(required)', 'Please enter script(required)': 'Please enter script(required)',
'Deploy Mode': 'Deploy Mode', 'Deploy Mode': 'Deploy Mode',
'Flink Version': 'Flink Version', 'Flink Version':'Flink Version',
'Driver core number': 'Driver core number', 'Driver core number': 'Driver core number',
'Please enter driver core number': 'Please enter driver core number', 'Please enter driver core number': 'Please enter driver core number',
'Driver memory use': 'Driver memory use', 'Driver memory use': 'Driver memory use',
@ -185,7 +185,7 @@ export default {
Tenant: 'Tenant', Tenant: 'Tenant',
Email: 'Email', Email: 'Email',
Phone: 'Phone', Phone: 'Phone',
'User Type': 'User Type', 'User Type':'User Type',
'Please enter phone number': 'Please enter phone number', 'Please enter phone number': 'Please enter phone number',
'Please enter main class': 'Please enter main class', 'Please enter main class': 'Please enter main class',
'Please enter email': 'Please enter email', 'Please enter email': 'Please enter email',
@ -432,9 +432,11 @@ export default {
Running: 'Running', Running: 'Running',
'Waiting for dependency to complete': 'Waiting for dependency to complete', 'Waiting for dependency to complete': 'Waiting for dependency to complete',
Selected: 'Selected', Selected: 'Selected',
CurrentHour: 'CurrentHour',
Last1Hour: 'Last1Hour', Last1Hour: 'Last1Hour',
Last2Hours: 'Last2Hours', Last2Hours: 'Last2Hours',
Last3Hours: 'Last3Hours', Last3Hours: 'Last3Hours',
Last24Hours: 'Last24Hours',
today: 'today', today: 'today',
Last1Days: 'Last1Days', Last1Days: 'Last1Days',
Last2Days: 'Last2Days', Last2Days: 'Last2Days',
@ -601,15 +603,18 @@ export default {
'Custom Job': 'Custom Job', 'Custom Job': 'Custom Job',
'Custom Script': 'Custom Script', 'Custom Script': 'Custom Script',
'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow', 'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required', 'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required',
'Unauthorized or deleted resources': 'Unauthorized or deleted resources', 'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
'Please delete all non-existent resources': 'Please delete all non-existent resources', 'Please delete all non-existent resources': 'Please delete all non-existent resources',
Enable: 'Enable', 'Enable': 'Enable',
Disable: 'Disable',
'Timeout Settings': 'Timeout Settings', 'Timeout Settings': 'Timeout Settings',
'Connect Timeout': 'Connect Timeout', 'Connect Timeout':'Connect Timeout',
'Socket Timeout': 'Socket Timeout', 'Socket Timeout':'Socket Timeout',
'Connect timeout be a positive integer': 'Connect timeout be a positive integer', 'Connect timeout be a positive integer': 'Connect timeout be a positive integer',
'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer', 'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer',
ms: 'ms' 'ms':'ms',
'Disable': 'Disable',
'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!',
'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading',
'User name length is between 3 and 39': 'User name length is between 3 and 39'
} }

21
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -173,7 +173,7 @@ export default {
'Project Name': '项目名称', 'Project Name': '项目名称',
'Please enter name': '请输入名称', 'Please enter name': '请输入名称',
'Owned Users': '所属用户', 'Owned Users': '所属用户',
'Process Pid': '进程pid', 'Process Pid': '进程Pid',
'Zk registration directory': 'zk注册目录', 'Zk registration directory': 'zk注册目录',
cpuUsage: 'cpuUsage', cpuUsage: 'cpuUsage',
memoryUsage: 'memoryUsage', memoryUsage: 'memoryUsage',
@ -188,7 +188,7 @@ export default {
Tenant: '租户', Tenant: '租户',
Email: '邮件', Email: '邮件',
Phone: '手机', Phone: '手机',
'User Type': '用户类型', 'User Type':'用户类型',
'Please enter phone number': '请输入手机', 'Please enter phone number': '请输入手机',
'Please enter email': '请输入邮箱', 'Please enter email': '请输入邮箱',
'Please enter the correct email format': '请输入正确的邮箱格式', 'Please enter the correct email format': '请输入正确的邮箱格式',
@ -427,9 +427,11 @@ export default {
Running: '正在运行', Running: '正在运行',
'Waiting for dependency to complete': '等待依赖完成', 'Waiting for dependency to complete': '等待依赖完成',
Selected: '已选', Selected: '已选',
CurrentHour: '当前小时',
Last1Hour: '前1小时', Last1Hour: '前1小时',
Last2Hours: '前2小时', Last2Hours: '前2小时',
Last3Hours: '前3小时', Last3Hours: '前3小时',
Last24Hours: '前24小时',
today: '今天', today: '今天',
Last1Days: '昨天', Last1Days: '昨天',
Last2Days: '前两天', Last2Days: '前两天',
@ -601,15 +603,18 @@ export default {
'Custom Job': '自定义任务', 'Custom Job': '自定义任务',
'Custom Script': '自定义脚本', 'Custom Script': '自定义脚本',
'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点', 'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填', 'Successful branch flow and failed branch flow are required': 'conditions节点成功和失败分支流转必填',
'Unauthorized or deleted resources': '未授权或已删除资源', 'Unauthorized or deleted resources': '未授权或已删除资源',
'Please delete all non-existent resources': '请删除所有未授权或已删除资源', 'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
Enable: '启用', 'Enable': '启用',
Disable: '停用', 'Disable': '停用',
'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在请选择正确的Worker分组',
'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存',
'User name length is between 3 and 39': '用户名长度在339之间',
'Timeout Settings': '超时设置', 'Timeout Settings': '超时设置',
'Connect Timeout': '连接超时', 'Connect Timeout':'连接超时',
'Socket Timeout': 'Socket超时', 'Socket Timeout':'Socket超时',
'Connect timeout be a positive integer': '连接超时必须为数字', 'Connect timeout be a positive integer': '连接超时必须为数字',
'Socket Timeout be a positive integer': 'Socket超时必须为数字', 'Socket Timeout be a positive integer': 'Socket超时必须为数字',
ms: '毫秒' 'ms':'毫秒'
} }

Loading…
Cancel
Save