This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch dev-2.1.3 in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 3b58d3740d94eacd8417c9cfe786668dfd3619d1 Author: benjobs <[email protected]> AuthorDate: Wed Jan 17 19:23:52 2024 +0800 [Improve] i18n improvement --- .../core/service/impl/FlinkClusterServiceImpl.java | 3 ++- .../src/locales/lang/en/flink/app.ts | 20 ++++++++++---------- .../src/locales/lang/en/sys.ts | 2 +- .../src/locales/lang/zh-CN/sys.ts | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java index d309eb5d3..079f400b3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java @@ -286,7 +286,8 @@ public class FlinkClusterServiceImpl extends ServiceImpl<FlinkClusterMapper, Fli boolean existsRunningJob = applicationService.existsRunningJobByClusterId(flinkCluster.getId()); if (existsRunningJob) { throw new ApiAlertException( - "some app is running on this cluster, the cluster cannot be shutdown"); + "There are some jobs running on the cluster, so the cluster cannot be shut down. \uD83D\uDE14\n" + + "\n"); } // 4) shutdown diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts index cde802766..6bc8ec70a 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts +++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts @@ -16,8 +16,8 @@ */ export default { id: 'ID', - appName: 'Application Name', - searchName: 'Name', + appName: 'Job Name', + searchName: 'Job Name', tags: 'Tags', owner: 'Owner', flinkVersion: 'Flink Version', @@ -125,7 +125,7 @@ export default { errorLog: 'Error Log', errorSummary: 'Error Summary', errorStack: 'Error Stack', - logTitle: 'Start Log : Application Name [ {0} ]', + logTitle: 'Start Log : Job Name [ {0} ]', refreshTime: 'last refresh time', refresh: 'refresh', start: 'Start Application', @@ -215,13 +215,13 @@ export default { programJarIsRequiredMessage: 'Program Jar is required', useSysHadoopConf: 'Use System Hadoop Conf', flinkVersionIsRequiredMessage: 'Flink Version is required', - appNamePlaceholder: 'Please enter application Name', - appNameIsRequiredMessage: 'The application Name is required', - appNameNotUniqueMessage: 'The application Name is already exists, must be unique. ', + appNamePlaceholder: 'Please enter job Name', + appNameIsRequiredMessage: 'The job Name is required', + appNameNotUniqueMessage: 'The job Name is already exists, must be unique. ', appNameExistsInYarnMessage: - 'The application name is already exists in YARN, cannot be repeated. Please check', + 'The job name is already exists in YARN, cannot be repeated. Please check', appNameExistsInK8sMessage: - 'The application name is already exists in Kubernetes,cannot be repeated. Please check', + 'The job name is already exists in Kubernetes,cannot be repeated. Please check', flinkClusterIsRequiredMessage: 'Flink Cluster is required', flinkSqlIsRequiredMessage: 'Flink SQL is required', tagsPlaceholder: 'Please enter tags,if more than one, separate them with commas(,)', @@ -236,8 +236,8 @@ export default { serviceAccountPlaceholder: 'Please enter kubernetes service-account, e.g: default', kubernetesNamespacePlaceholder: 'Please enter kubernetes Namespace, e.g: default', kubernetesClusterIdPlaceholder: 'Please enter Kubernetes clusterId', - appNameValid: 'The application name is invalid', - appNameRole: 'The application name is invalid', + appNameValid: 'The job name is invalid', + appNameRole: 'The job name is invalid', appNameK8sClusterIdRole: 'The current deployment mode is K8s Application mode, and the job name will be used as the clusterId in K8s. Therefore, the job name must follow the following rules:', appNameK8sClusterIdRoleLength: 'must be no more than 45 characters', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts index f41e40c3e..9ab4fa2d3 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts +++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts @@ -17,7 +17,7 @@ export default { api: { operationFailed: 'Operation failed', - errorTip: 'Error Tip', + errorTip: 'Ooop', errorMessage: 'The operation failed, the system is abnormal!', timeoutMessage: 'Login timed out, please log in again!', apiTimeoutMessage: 'The interface request timed out, please refresh the page and try again!', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts index 00f3fbefa..ddac5abdb 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts +++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts @@ -17,7 +17,7 @@ export default { api: { operationFailed: '操作失败', - errorTip: '错误提示', + errorTip: '出错啦！', errorMessage: '操作失败,系统异常!', timeoutMessage: '登录超时,请重新登录!', apiTimeoutMessage: '接口请求超时,请刷新页面重试!',
