From ce8ee95d46d41d9765ebb7350bbf201b0528ea20 Mon Sep 17 00:00:00 2001 From: chengshiwen Date: Wed, 3 Feb 2021 22:18:38 +0800 Subject: [PATCH] [Improvement][UI] Arrange locale in order --- .../src/js/module/i18n/locale/en_US.js | 10 ++++------ .../src/js/module/i18n/locale/zh_CN.js | 14 ++++---------- 2 files changed, 8 insertions(+), 16 deletions(-) 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 7a864c9781..5c3de1f3fd 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -34,6 +34,7 @@ export default { 'View log': 'View log', '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', @@ -46,7 +47,6 @@ 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', @@ -187,7 +187,6 @@ 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', @@ -200,9 +199,8 @@ export default { Authorize: 'Authorize', 'File resources': 'File resources', 'UDF resources': 'UDF resources', - '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', + 'Please select UDF resources directory': 'Please select UDF resources directory', 'Edit alarm group': 'Edit alarm group', 'Create alarm group': 'Create alarm group', 'Group Name': 'Group Name', @@ -251,6 +249,7 @@ 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', @@ -343,7 +342,6 @@ 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', @@ -560,8 +558,8 @@ export default { 'Please enter Target Dir(required)': 'Please enter Target Dir(required)', 'Please enter Export Dir(required)': 'Please enter Export Dir(required)', 'Please enter Hive Database(required)': 'Please enter Hive Databasec(required)', - 'Please enter hive target dir': 'Please enter hive target dir', 'Please enter Hive Table(required)': 'Please enter Hive Table(required)', + 'Please enter hive target dir': 'Please enter hive target dir', 'Please enter Hive Partition Keys': 'Please enter Hive Partition Key', 'Please enter Hive Partition Values': 'Please enter Partition Value', 'Please enter Replace Delimiter': 'Please enter Replace Delimiter', 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 67e66713e3..3368438d97 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -129,9 +129,6 @@ 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': '表格、附件必须勾选一个', @@ -184,6 +181,7 @@ 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': '请输入租户编码', @@ -297,6 +295,9 @@ 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': '请输入包名类名', @@ -506,7 +507,6 @@ 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': '待运行任务数', @@ -612,12 +612,6 @@ export default { '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': '用户名长度在3～39之间', - 'Timeout Settings': '超时设置', - 'Connect Timeout':'连接超时', - 'Socket Timeout':'Socket超时', - 'Connect timeout be a positive integer': '连接超时必须为数字', - 'Socket Timeout be a positive integer': 'Socket超时必须为数字', - 'ms':'毫秒', zkDirectory: 'zk注册目录', 'Directory detail': '查看目录详情', 'Connection name': '连线名',