Browse Source

adjust locale for new pr

pull/3/MERGE
chengshiwen 4 years ago
parent
commit
aa97b8a4b5
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  2. 36
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  3. 16
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -77,7 +77,7 @@
<el-button type="success" size="mini" icon="el-icon-circle-close" :disabled="scope.row.state !== 'FAILURE'" @click="_restore(scope.row,scope.$index)" circle></el-button> <el-button type="success" size="mini" icon="el-icon-circle-close" :disabled="scope.row.state !== 'FAILURE'" @click="_restore(scope.row,scope.$index)" circle></el-button>
</span> </span>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('Resume From Forced Success')" placement="top" :enterable="false"> <el-tooltip :content="$t('Resume Forced Success')" placement="top" :enterable="false">
<span> <span>
<el-button type="success" size="mini" icon="el-icon-stopwatch" :disabled="!(scope.row.state === 'FAILURE' || scope.row.state === 'NEED_FAULT_TOLERANCE' || scope.row.state === 'KILL')" @click="_resumeFromForcedSuccess(scope.row,scope.$index)" circle></el-button> <el-button type="success" size="mini" icon="el-icon-stopwatch" :disabled="!(scope.row.state === 'FAILURE' || scope.row.state === 'NEED_FAULT_TOLERANCE' || scope.row.state === 'KILL')" @click="_resumeFromForcedSuccess(scope.row,scope.$index)" circle></el-button>
</span> </span>

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

@ -35,7 +35,6 @@ export default {
'Force success': 'Force success', 'Force success': 'Force success',
'Enter this child node': 'Enter this child node', 'Enter this child node': 'Enter this child node',
'Node name': 'Node name', 'Node name': 'Node name',
'Please enter name (required)': 'Please enter name (required)',
'Run flag': 'Run flag', 'Run flag': 'Run flag',
Normal: 'Normal', Normal: 'Normal',
'Prohibition execution': 'Prohibition execution', 'Prohibition execution': 'Prohibition execution',
@ -50,6 +49,7 @@ export default {
'Confirm add': 'Confirm add', 'Confirm add': 'Confirm add',
'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': 'The newly created sub-Process has not yet been executed and cannot enter the sub-Process', 'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': 'The newly created sub-Process has not yet been executed and cannot enter the sub-Process',
'The task has not been executed and cannot enter the sub-Process': 'The task has not been executed and cannot enter the sub-Process', 'The task has not been executed and cannot enter the sub-Process': 'The task has not been executed and cannot enter the sub-Process',
'Please enter name (required)': 'Please enter name (required)',
'Name already exists': 'Name already exists', 'Name already exists': 'Name already exists',
'Download Log': 'Download Log', 'Download Log': 'Download Log',
'Refresh Log': 'Refresh Log', 'Refresh Log': 'Refresh Log',
@ -87,7 +87,8 @@ export default {
'Main class': 'Main class', 'Main class': 'Main class',
'Main jar package': 'Main jar package', 'Main jar package': 'Main jar package',
'Please enter main jar package': 'Please enter main jar package', 'Please enter main jar package': 'Please enter main jar package',
'Please enter main class': 'Please enter main class', 'Main package': 'Main package',
'Please enter main package': 'Please enter main package',
'Command-line parameters': 'Command-line parameters', 'Command-line parameters': 'Command-line parameters',
'Please enter Command-line parameters': 'Please enter Command-line parameters', 'Please enter Command-line parameters': 'Please enter Command-line parameters',
'Other parameters': 'Other parameters', 'Other parameters': 'Other parameters',
@ -191,12 +192,14 @@ export default {
'Please enter tenant code': 'Please enter tenant code', 'Please enter tenant code': 'Please enter tenant code',
'Please enter tenant Name': 'Please enter tenant Name', 'Please enter tenant Name': 'Please enter tenant Name',
'The tenant code. Only letters or a combination of letters and numbers are allowed': 'The tenant code. Only letters or a combination of letters and numbers are allowed', 'The tenant code. Only letters or a combination of letters and numbers are allowed': 'The tenant code. Only letters or a combination of letters and numbers are allowed',
'The tenant code cannot be all numbers': 'The tenant code cannot be all numbers',
'Edit User': 'Edit User', 'Edit User': 'Edit User',
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 email': 'Please enter email', 'Please enter email': 'Please enter email',
'Please enter the correct email format': 'Please enter the correct email format', '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', 'Please enter the correct mobile phone format': 'Please enter the correct mobile phone format',
@ -204,8 +207,9 @@ export default {
Authorize: 'Authorize', Authorize: 'Authorize',
'File resources': 'File resources', 'File resources': 'File resources',
'UDF resources': 'UDF resources', 'UDF resources': 'UDF resources',
'UDF resources directory': 'UDF resources directory',
'Please select UDF resources directory': 'Please select UDF resources directory', 'Please select UDF resources directory': 'Please select UDF resources directory',
'UDF resources directory': 'UDF resources directory',
'Upload File Size': 'Upload File size cannot exceed 1g',
'Edit alarm group': 'Edit alarm group', 'Edit alarm group': 'Edit alarm group',
'Create alarm group': 'Create alarm group', 'Create alarm group': 'Create alarm group',
'Group Name': 'Group Name', 'Group Name': 'Group Name',
@ -256,7 +260,6 @@ export default {
'File Format': 'File Format', 'File Format': 'File Format',
'Folder Format': 'Folder Format', 'Folder Format': 'Folder Format',
'File Content': 'File Content', 'File Content': 'File Content',
'Upload File Size': 'Upload File size cannot exceed 1g',
Create: 'Create', Create: 'Create',
'Please enter the resource content': 'Please enter the resource content', 'Please enter the resource content': 'Please enter the resource content',
'Resource content cannot exceed 3000 lines': 'Resource content cannot exceed 3000 lines', 'Resource content cannot exceed 3000 lines': 'Resource content cannot exceed 3000 lines',
@ -282,7 +285,7 @@ export default {
Stop: 'Stop', Stop: 'Stop',
Pause: 'Pause', Pause: 'Pause',
'Recovery Suspend': 'Recovery Suspend', 'Recovery Suspend': 'Recovery Suspend',
'Resume From Forced Success': 'Resume From Forced Success', 'Resume Forced Success': 'Resume Forced Success',
Gantt: 'Gantt', Gantt: 'Gantt',
Name: 'Name', Name: 'Name',
'Node Type': 'Node Type', 'Node Type': 'Node Type',
@ -335,6 +338,10 @@ export default {
'Resume the suspension process': 'Resume the suspension process', 'Resume the suspension process': 'Resume the suspension process',
'Execute from the failed nodes': 'Execute from the failed nodes', 'Execute from the failed nodes': 'Execute from the failed nodes',
'Complement Data': 'Complement Data', 'Complement Data': 'Complement Data',
slot: 'slot',
taskManager: 'taskManager',
jobManagerMemory: 'jobManagerMemory',
taskManagerMemory: 'taskManagerMemory',
'Scheduling execution': 'Scheduling execution', 'Scheduling execution': 'Scheduling execution',
'Recovery waiting thread': 'Recovery waiting thread', 'Recovery waiting thread': 'Recovery waiting thread',
'Resume from forced success': 'Resume from forced success', 'Resume from forced success': 'Resume from forced success',
@ -352,6 +359,7 @@ export default {
Delete: 'Delete', Delete: 'Delete',
'Please enter keyword': 'Please enter keyword', 'Please enter keyword': 'Please enter keyword',
'File Upload': 'File Upload', 'File Upload': 'File Upload',
'File ReUpload': 'File ReUpload',
'Drag the file into the current upload window': 'Drag the file into the current upload window', 'Drag the file into the current upload window': 'Drag the file into the current upload window',
'Drag area upload': 'Drag area upload', 'Drag area upload': 'Drag area upload',
Upload: 'Upload', Upload: 'Upload',
@ -437,6 +445,7 @@ export default {
'Timeout must be longer than check interval': 'Timeout must be longer than check interval', 'Timeout must be longer than check interval': 'Timeout must be longer than check interval',
'Timeout strategy must be selected': 'Timeout strategy must be selected', 'Timeout strategy must be selected': 'Timeout strategy must be selected',
'Timeout must be a positive integer': 'Timeout must be a positive integer', 'Timeout must be a positive integer': 'Timeout must be a positive integer',
'Forced success': 'Forced success',
'Add dependency': 'Add dependency', 'Add dependency': 'Add dependency',
and: 'and', and: 'and',
or: 'or', or: 'or',
@ -446,7 +455,6 @@ export default {
hour: 'hour', hour: 'hour',
Running: 'Running', Running: 'Running',
'Waiting for dependency to complete': 'Waiting for dependency to complete', 'Waiting for dependency to complete': 'Waiting for dependency to complete',
'Forced success': 'Forced success',
Selected: 'Selected', Selected: 'Selected',
CurrentHour: 'CurrentHour', CurrentHour: 'CurrentHour',
Last1Hour: 'Last1Hour', Last1Hour: 'Last1Hour',
@ -538,10 +546,6 @@ export default {
'Next five execution times': 'Next five execution times', 'Next five execution times': 'Next five execution times',
'Execute time': 'Execute time', 'Execute time': 'Execute time',
'Complement range': 'Complement range', 'Complement range': 'Complement range',
slot: 'slot',
taskManager: 'taskManager',
jobManagerMemory: 'jobManagerMemory',
taskManagerMemory: 'taskManagerMemory',
'Http Url': 'Http Url', 'Http Url': 'Http Url',
'Http Method': 'Http Method', 'Http Method': 'Http Method',
'Http Parameters': 'Http Parameters', 'Http Parameters': 'Http Parameters',
@ -625,8 +629,6 @@ export default {
'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': 'conditions node Successful and failed branch flow are required', 'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required',
'No resources exist': 'No resources exist',
'Please delete all non-existing resources': 'Please delete all non-existing resources',
'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',
Kinship: 'Workflow relationship', Kinship: 'Workflow relationship',
@ -637,16 +639,18 @@ export default {
KinshipState10: 'Scheduling is not online', KinshipState10: 'Scheduling is not online',
'Dag label display control': 'Dag label display control', 'Dag label display control': 'Dag label display control',
Enable: 'Enable', Enable: 'Enable',
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',
'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',
'No resources exist': 'No resources exist',
'Please delete all non-existing resources': 'Please delete all non-existing resources',
'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',
'Please Enter Url': 'Please Enter Url eg. 127.0.0.1:7077', 'Please Enter Url': 'Please Enter Url eg. 127.0.0.1:7077',
Master: 'Master', Master: 'Master',
'Please select the waterdrop resources': 'Please select the waterdrop resources', 'Please select the waterdrop resources': 'Please select the waterdrop resources',

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

@ -45,7 +45,6 @@ export default {
'Failed retry interval': '失败重试间隔', 'Failed retry interval': '失败重试间隔',
Minute: '分', Minute: '分',
'Delay execution time': '延时执行时间', 'Delay execution time': '延时执行时间',
'Delay execution': '延时执行',
Cancel: '取消', Cancel: '取消',
'Confirm add': '确认添加', 'Confirm add': '确认添加',
'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': '新创建子工作流还未执行不能进入子工作流', 'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': '新创建子工作流还未执行不能进入子工作流',
@ -87,7 +86,6 @@ export default {
'Main class': '主函数的class', 'Main class': '主函数的class',
'Main jar package': '主jar包', 'Main jar package': '主jar包',
'Please enter main jar package': '请选择主jar包', 'Please enter main jar package': '请选择主jar包',
'Please enter main class': '请填写主函数的class',
'Command-line parameters': '命令行参数', 'Command-line parameters': '命令行参数',
'Please enter Command-line parameters': '请输入命令行参数', 'Please enter Command-line parameters': '请输入命令行参数',
'Other parameters': '其他参数', 'Other parameters': '其他参数',
@ -95,6 +93,7 @@ export default {
Resources: '资源', Resources: '资源',
'Custom Parameters': '自定义参数', 'Custom Parameters': '自定义参数',
'Custom template': '自定义模版', 'Custom template': '自定义模版',
'Please enter main class': '请填写主函数的class',
Datasource: '数据源', Datasource: '数据源',
methods: '方法', methods: '方法',
'Please enter method(optional)': '请输入方法(选填)', 'Please enter method(optional)': '请输入方法(选填)',
@ -129,6 +128,9 @@ export default {
'SQL Parameter': 'sql参数', 'SQL Parameter': 'sql参数',
'SQL Statement': 'sql语句', 'SQL Statement': 'sql语句',
'UDF Function': 'UDF函数', 'UDF Function': 'UDF函数',
FILE: '文件',
UDF: 'UDF',
'File Subdirectory': '文件子目录',
'Please enter a SQL Statement(required)': '请输入sql语句(必填)', 'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
'Please enter a JSON Statement(required)': '请输入json语句(必填)', 'Please enter a JSON Statement(required)': '请输入json语句(必填)',
'One form or attachment must be selected': '表格附件必须勾选一个', 'One form or attachment must be selected': '表格附件必须勾选一个',
@ -185,7 +187,6 @@ export default {
'Tenant Code': '租户编码', 'Tenant Code': '租户编码',
'Tenant Name': '租户名称', 'Tenant Name': '租户名称',
Queue: '队列', 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': '请输入英文租户编码',
'Please enter tenant code': '请输入租户编码', 'Please enter tenant code': '请输入租户编码',
@ -282,7 +283,7 @@ export default {
Stop: '停止', Stop: '停止',
Pause: '暂停', Pause: '暂停',
'Recovery Suspend': '恢复运行', 'Recovery Suspend': '恢复运行',
'Resume From Forced Success': '从强制成功处继续', 'Resume Forced Success': '从强制成功处继续',
Gantt: '甘特图', Gantt: '甘特图',
Name: '名称', Name: '名称',
'Node Type': '节点类型', 'Node Type': '节点类型',
@ -304,9 +305,6 @@ export default {
'Edit UDF Function': '编辑UDF函数', 'Edit UDF Function': '编辑UDF函数',
type: '类型', type: '类型',
'UDF Function Name': 'UDF函数名称', 'UDF Function Name': 'UDF函数名称',
FILE: '文件',
UDF: 'UDF',
'File Subdirectory': '文件子目录',
'Please enter a function name': '请输入函数名', 'Please enter a function name': '请输入函数名',
'Package Name': '包名类名', 'Package Name': '包名类名',
'Please enter a Package name': '请输入包名类名', 'Please enter a Package name': '请输入包名类名',
@ -434,9 +432,9 @@ export default {
'Waiting Dependent complete': '等待依赖完成', 'Waiting Dependent complete': '等待依赖完成',
'Waiting Dependent start': '等待依赖启动', 'Waiting Dependent start': '等待依赖启动',
'Check interval': '检查间隔', 'Check interval': '检查间隔',
'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
'Timeout strategy must be selected': '超时策略必须选一个', 'Timeout strategy must be selected': '超时策略必须选一个',
'Timeout must be a positive integer': '超时时长必须为正整数', 'Timeout must be a positive integer': '超时时长必须为正整数',
'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
'Add dependency': '添加依赖', 'Add dependency': '添加依赖',
and: '且', and: '且',
or: '或', or: '或',
@ -446,6 +444,7 @@ export default {
hour: '时', hour: '时',
Running: '正在运行', Running: '正在运行',
'Waiting for dependency to complete': '等待依赖完成', 'Waiting for dependency to complete': '等待依赖完成',
'Delay execution': '延时执行',
'Forced success': '强制成功过', 'Forced success': '强制成功过',
Selected: '已选', Selected: '已选',
CurrentHour: '当前小时', CurrentHour: '当前小时',
@ -523,6 +522,7 @@ export default {
'Statement cannot be empty': '语句不能为空', 'Statement cannot be empty': '语句不能为空',
'Process Define Count': '工作流定义数', 'Process Define Count': '工作流定义数',
'Process Instance Running Count': '正在运行的流程数', 'Process Instance Running Count': '正在运行的流程数',
'Please select a queue': '默认为租户关联队列',
'command number of waiting for running': '待执行的命令数', 'command number of waiting for running': '待执行的命令数',
'failure command number': '执行失败的命令数', 'failure command number': '执行失败的命令数',
'tasks number of waiting running': '待运行任务数', 'tasks number of waiting running': '待运行任务数',

Loading…
Cancel
Save