From bee455407aebb884eeeaa546a66c14ee0e9cb046 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 1 Sep 2022 17:07:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datasource/DatasourceService.java | 12 ++++++------ .../main/resources/i18n/messages_en_US.properties | 3 +++ .../main/resources/i18n/messages_zh_CN.properties | 3 +++ .../main/resources/i18n/messages_zh_TW.properties | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 964f3eb99a..41af53e43d 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -289,13 +289,13 @@ public class DatasourceService { return ResultHolder.success(datasourceDTO); } if (success > 0 && success < apiDefinitionList.size()) { - return ResultHolder.error("Datasource has invalid tables", datasourceDTO); + return ResultHolder.error(Translator.get("I18N_DS_INVALID_TABLE") , datasourceDTO); } - return ResultHolder.error("Datasource is invalid.", datasourceDTO); + return ResultHolder.error(Translator.get("I18N_DS_INVALID") , datasourceDTO); } return ResultHolder.success(datasourceDTO); } catch (Exception e) { - return ResultHolder.error("Datasource is invalid: " + e.getMessage()); + return ResultHolder.error(Translator.get("I18N_DS_INVALID"), e.getMessage()); } } @@ -327,15 +327,15 @@ public class DatasourceService { return ResultHolder.success(datasource); } if (success > 0 && success < apiDefinitionList.size()) { - return ResultHolder.error("Datasource has invalid tables", datasource); + return ResultHolder.error(Translator.get("I18N_DS_INVALID_TABLE"), datasource); } - return ResultHolder.error("Datasource is invalid.", datasource); + return ResultHolder.error(Translator.get("I18N_DS_INVALID"), datasource); } return ResultHolder.success("Success"); } catch (Exception e) { datasourceStatus = "Error"; - return ResultHolder.error("Datasource is invalid: " + e.getMessage()); + return ResultHolder.error(Translator.get("I18N_DS_INVALID"), e.getMessage()); } finally { Datasource record = new Datasource(); record.setStatus(datasourceStatus); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 2eba3b2e91..781b17971b 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -218,3 +218,6 @@ I18N_SYNC_LOG=Sync log I18N_USER_DONOT_EXIST=User do not exist I18N_USER_SOURCE_PWD_ERROR=Source password error I18N_USER_PWD_FORMAT_ERROR=Password format error + +I18N_DS_INVALID=Datasource is invalid. +I18N_DS_INVALID_TABLE=Datasource has invalid tables \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 2951ccbea8..45b685e32c 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -218,3 +218,6 @@ I18N_SYNC_LOG=\u540C\u6B65\u65E5\u5FD7 I18N_USER_DONOT_EXIST=\u7528\u6237\u4E0D\u5B58\u5728 I18N_USER_SOURCE_PWD_ERROR=\u539F\u59CB\u5BC6\u7801\u9519\u8BEF I18N_USER_PWD_FORMAT_ERROR=\u5BC6\u7801\u683C\u5F0F\u9519\u8BEF + +I18N_DS_INVALID=数据源无效. +I18N_DS_INVALID_TABLE=数据源中有无效的表 \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index c0f0a621da..9e15e5ba61 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -214,3 +214,6 @@ I18N_SYNC_LOG=\u540C\u6B65\u65E5\u8A8C I18N_USER_DONOT_EXIST=\u7528\u6236\u4E0D\u5B58\u5728 I18N_USER_SOURCE_PWD_ERROR=\u539F\u59CB\u5BC6\u78BC\u932F\u8AA4 I18N_USER_PWD_FORMAT_ERROR=\u5BC6\u78BC\u683C\u5F0F\u932F\u8AA4 + +I18N_DS_INVALID=數據源無效. +I18N_DS_INVALID_TABLE=數據源中有無效的表 \ No newline at end of file