From aa97b8a4b5363dfeda45a5802451a9f1b8f49487 Mon Sep 17 00:00:00 2001 From: chengshiwen Date: Wed, 23 Dec 2020 13:04:50 +0800 Subject: [PATCH] adjust locale for new pr --- .../instance/pages/list/_source/list.vue | 2 +- .../src/js/module/i18n/locale/en_US.js | 36 ++++++++++--------- .../src/js/module/i18n/locale/zh_CN.js | 16 ++++----- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue index c2ffaa3894..6044c17f87 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue @@ -77,7 +77,7 @@ - + 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 5999282bbf..1277d685dd 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -35,7 +35,6 @@ export default { 'Force success': 'Force success', 'Enter this child node': 'Enter this child node', 'Node name': 'Node name', - 'Please enter name (required)': 'Please enter name (required)', 'Run flag': 'Run flag', Normal: 'Normal', 'Prohibition execution': 'Prohibition execution', @@ -50,6 +49,7 @@ export default { '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 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', 'Download Log': 'Download Log', 'Refresh Log': 'Refresh Log', @@ -87,7 +87,8 @@ export default { 'Main class': 'Main class', 'Main jar package': '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', 'Please enter Command-line parameters': 'Please enter Command-line parameters', 'Other parameters': 'Other parameters', @@ -191,12 +192,14 @@ export default { 'Please enter tenant code': 'Please enter tenant code', '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 cannot be all numbers': 'The tenant code cannot be all numbers', 'Edit User': 'Edit User', Tenant: 'Tenant', Email: 'Email', Phone: 'Phone', 'User Type': 'User Type', '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', @@ -204,8 +207,9 @@ export default { Authorize: 'Authorize', 'File resources': 'File resources', 'UDF resources': 'UDF resources', - 'UDF resources directory': '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', 'Create alarm group': 'Create alarm group', 'Group Name': 'Group Name', @@ -256,7 +260,6 @@ export default { 'File Format': 'File Format', 'Folder Format': 'Folder Format', 'File Content': 'File Content', - 'Upload File Size': 'Upload File size cannot exceed 1g', Create: 'Create', 'Please enter the resource content': 'Please enter the resource content', 'Resource content cannot exceed 3000 lines': 'Resource content cannot exceed 3000 lines', @@ -282,7 +285,7 @@ export default { Stop: 'Stop', Pause: 'Pause', 'Recovery Suspend': 'Recovery Suspend', - 'Resume From Forced Success': 'Resume From Forced Success', + 'Resume Forced Success': 'Resume Forced Success', Gantt: 'Gantt', Name: 'Name', 'Node Type': 'Node Type', @@ -335,6 +338,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', 'Resume from forced success': 'Resume from forced success', @@ -352,6 +359,7 @@ export default { Delete: 'Delete', 'Please enter keyword': 'Please enter keyword', '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 area upload': 'Drag area upload', Upload: 'Upload', @@ -437,6 +445,7 @@ export default { '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 must be a positive integer': 'Timeout must be a positive integer', + 'Forced success': 'Forced success', 'Add dependency': 'Add dependency', and: 'and', or: 'or', @@ -446,7 +455,6 @@ export default { hour: 'hour', Running: 'Running', 'Waiting for dependency to complete': 'Waiting for dependency to complete', - 'Forced success': 'Forced success', Selected: 'Selected', CurrentHour: 'CurrentHour', Last1Hour: 'Last1Hour', @@ -538,10 +546,6 @@ export default { 'Next five execution times': 'Next five execution times', 'Execute time': 'Execute time', 'Complement range': 'Complement range', - slot: 'slot', - taskManager: 'taskManager', - jobManagerMemory: 'jobManagerMemory', - taskManagerMemory: 'taskManagerMemory', 'Http Url': 'Http Url', 'Http Method': 'Http Method', 'Http Parameters': 'Http Parameters', @@ -625,8 +629,6 @@ export default { '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': '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', 'Please delete all non-existent resources': 'Please delete all non-existent resources', Kinship: 'Workflow relationship', @@ -637,16 +639,18 @@ export default { KinshipState10: 'Scheduling is not online', 'Dag label display control': 'Dag label display control', 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', 'Connect Timeout': 'Connect Timeout', 'Socket Timeout': 'Socket Timeout', 'Connect timeout be a positive integer': 'Connect timeout be a positive integer', 'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer', 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', Master: 'Master', 'Please select the waterdrop resources': 'Please select the waterdrop resources', 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 225efa40c7..00d27c53dc 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -45,7 +45,6 @@ export default { 'Failed retry interval': '失败重试间隔', Minute: '分', 'Delay execution time': '延时执行时间', - 'Delay execution': '延时执行', Cancel: '取消', 'Confirm add': '确认添加', '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 jar package': '主jar包', 'Please enter main jar package': '请选择主jar包', - 'Please enter main class': '请填写主函数的class', 'Command-line parameters': '命令行参数', 'Please enter Command-line parameters': '请输入命令行参数', 'Other parameters': '其他参数', @@ -95,6 +93,7 @@ export default { Resources: '资源', 'Custom Parameters': '自定义参数', 'Custom template': '自定义模版', + 'Please enter main class': '请填写主函数的class', Datasource: '数据源', methods: '方法', 'Please enter method(optional)': '请输入方法(选填)', @@ -129,6 +128,9 @@ export default { 'SQL Parameter': 'sql参数', 'SQL Statement': 'sql语句', 'UDF Function': 'UDF函数', + FILE: '文件', + UDF: 'UDF', + 'File Subdirectory': '文件子目录', 'Please enter a SQL Statement(required)': '请输入sql语句(必填)', 'Please enter a JSON Statement(required)': '请输入json语句(必填)', 'One form or attachment must be selected': '表格、附件必须勾选一个', @@ -185,7 +187,6 @@ export default { 'Tenant Code': '租户编码', 'Tenant Name': '租户名称', Queue: '队列', - 'Please select a queue': '默认为租户关联队列', 'Please enter the tenant code in English': '请输入租户编码只允许英文', 'Please enter tenant code in English': '请输入英文租户编码', 'Please enter tenant code': '请输入租户编码', @@ -282,7 +283,7 @@ export default { Stop: '停止', Pause: '暂停', 'Recovery Suspend': '恢复运行', - 'Resume From Forced Success': '从强制成功处继续', + 'Resume Forced Success': '从强制成功处继续', Gantt: '甘特图', Name: '名称', 'Node Type': '节点类型', @@ -304,9 +305,6 @@ export default { 'Edit UDF Function': '编辑UDF函数', type: '类型', 'UDF Function Name': 'UDF函数名称', - FILE: '文件', - UDF: 'UDF', - 'File Subdirectory': '文件子目录', 'Please enter a function name': '请输入函数名', 'Package Name': '包名类名', 'Please enter a Package name': '请输入包名类名', @@ -434,9 +432,9 @@ export default { 'Waiting Dependent complete': '等待依赖完成', 'Waiting Dependent start': '等待依赖启动', 'Check interval': '检查间隔', - 'Timeout must be longer than check interval': '超时时间必须比检查间隔长', 'Timeout strategy must be selected': '超时策略必须选一个', 'Timeout must be a positive integer': '超时时长必须为正整数', + 'Timeout must be longer than check interval': '超时时间必须比检查间隔长', 'Add dependency': '添加依赖', and: '且', or: '或', @@ -446,6 +444,7 @@ export default { hour: '时', Running: '正在运行', 'Waiting for dependency to complete': '等待依赖完成', + 'Delay execution': '延时执行', 'Forced success': '强制成功过', Selected: '已选', CurrentHour: '当前小时', @@ -523,6 +522,7 @@ export default { 'Statement cannot be empty': '语句不能为空', 'Process Define Count': '工作流定义数', 'Process Instance Running Count': '正在运行的流程数', + 'Please select a queue': '默认为租户关联队列', 'command number of waiting for running': '待执行的命令数', 'failure command number': '执行失败的命令数', 'tasks number of waiting running': '待运行任务数',