From f874e8dcce759456e1576be2d1616c11c09f39ae Mon Sep 17 00:00:00 2001 From: xsbai Date: Fri, 19 Jun 2020 16:43:56 +0800 Subject: [PATCH 1/3] fix issue #3018 [BUG]i18n incomplete --- .../js/conf/home/pages/security/pages/users/_source/list.vue | 2 +- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 1 + dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue index cb4a78f0b4..78681075ca 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue @@ -26,7 +26,7 @@ {{$t('User Name')}} - 用户类型 + {{$t('User Type')}} {{$t('Tenant')}} 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 c8d82d4246..cec9859bb9 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -181,6 +181,7 @@ export default { 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', 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 e65449092e..540452efe4 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -184,6 +184,7 @@ export default { Tenant: '租户', Email: '邮件', Phone: '手机', + 'User Type':'用户类型', 'Please enter phone number': '请输入手机', 'Please enter email': '请输入邮箱', 'Please enter the correct email format': '请输入正确的邮箱格式', From 0654757f15ec40c5c44baa44304c8d48750a582a Mon Sep 17 00:00:00 2001 From: xsbai Date: Mon, 22 Jun 2020 09:10:24 +0800 Subject: [PATCH 2/3] modifiy the error comment --- .../dolphinscheduler/api/controller/ResourcesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java index cc09b2d650..0e63189e74 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java @@ -63,7 +63,7 @@ public class ResourcesController extends BaseController { private UdfFuncService udfFuncService; /** - * create resource + * create dirctory * * @param loginUser login user * @param alias alias From f7533e0bd0f78346a4c1f7687a03eed18ef6ef24 Mon Sep 17 00:00:00 2001 From: xsbai Date: Mon, 22 Jun 2020 09:15:13 +0800 Subject: [PATCH 3/3] modifiy the error comment --- .../dolphinscheduler/api/controller/ResourcesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java index 0e63189e74..a0ec666ed7 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java @@ -63,7 +63,7 @@ public class ResourcesController extends BaseController { private UdfFuncService udfFuncService; /** - * create dirctory + * create directory * * @param loginUser login user * @param alias alias