From d277d9c3eb603033a9461e4f248157363afdbb52 Mon Sep 17 00:00:00 2001 From: jiangfeng Date: Sat, 18 Jul 2020 16:27:12 +0800 Subject: [PATCH 1/2] i18n metrics --- src/locales/zh-CN.ts | 1 + src/pages/Metrics/Metrics.tsx | 8 +++++--- src/pages/Metrics/index.ts | 1 + src/pages/Metrics/locales/en-US.ts | 5 +++++ src/pages/Metrics/locales/zh-CN.ts | 5 +++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/pages/Metrics/locales/en-US.ts create mode 100644 src/pages/Metrics/locales/zh-CN.ts diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index c021df8679..c862e1b457 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2,6 +2,7 @@ import { PluginFormZhCN } from '@/components/PluginForm'; import { ConsumerZhCN } from '@/pages/Consumer'; import { RouteZhCN } from '@/pages/Route'; + import component from './zh-CN/component'; import globalHeader from './zh-CN/globalHeader'; import menu from './zh-CN/menu'; diff --git a/src/pages/Metrics/Metrics.tsx b/src/pages/Metrics/Metrics.tsx index 60f77a26f5..411b842238 100644 --- a/src/pages/Metrics/Metrics.tsx +++ b/src/pages/Metrics/Metrics.tsx @@ -2,11 +2,13 @@ import React, { useState, useEffect } from 'react'; import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { Empty, Button, Card } from 'antd'; import { history } from 'umi'; +import { useIntl } from 'umi'; import { getGrafanaURL } from './service'; const Metrics: React.FC = () => { const [grafanaURL, setGrafanaURL] = useState(); + const { formatMessage } = useIntl(); useEffect(() => { getGrafanaURL().then((url) => { @@ -15,7 +17,7 @@ const Metrics: React.FC = () => { }, []); return ( - + {!grafanaURL && ( { imageStyle={{ height: 60, }} - description={您还未配置 Grafana} + description={{formatMessage({ id: 'metrics.grafana.not.config' })}} > )} diff --git a/src/pages/Metrics/index.ts b/src/pages/Metrics/index.ts index 8e5880233f..318581449b 100644 --- a/src/pages/Metrics/index.ts +++ b/src/pages/Metrics/index.ts @@ -1 +1,2 @@ export { default } from './Metrics'; + diff --git a/src/pages/Metrics/locales/en-US.ts b/src/pages/Metrics/locales/en-US.ts new file mode 100644 index 0000000000..e01792cea6 --- /dev/null +++ b/src/pages/Metrics/locales/en-US.ts @@ -0,0 +1,5 @@ +export default { + 'metrics.monitor': 'Monitor', + 'metrics.grafana.not.config': 'You have not configured Grafana', + 'metrics.grafana.config': 'Configure Now', +}; diff --git a/src/pages/Metrics/locales/zh-CN.ts b/src/pages/Metrics/locales/zh-CN.ts new file mode 100644 index 0000000000..5a9c91b261 --- /dev/null +++ b/src/pages/Metrics/locales/zh-CN.ts @@ -0,0 +1,5 @@ +export default { + 'metrics.monitor': '监控', + 'metrics.grafana.not.config': '您还未配置 Grafana', + 'metrics.grafana.config': '现在配置', +}; From 9165822f40bf049f81d555e5c19b3d2ec87daaa9 Mon Sep 17 00:00:00 2001 From: jiangfeng Date: Fri, 24 Jul 2020 17:54:54 +0800 Subject: [PATCH 2/2] combine import --- src/pages/Metrics/Metrics.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Metrics/Metrics.tsx b/src/pages/Metrics/Metrics.tsx index 411b842238..b3d8af3dfd 100644 --- a/src/pages/Metrics/Metrics.tsx +++ b/src/pages/Metrics/Metrics.tsx @@ -1,8 +1,7 @@ import React, { useState, useEffect } from 'react'; import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { Empty, Button, Card } from 'antd'; -import { history } from 'umi'; -import { useIntl } from 'umi'; +import { history, useIntl } from 'umi'; import { getGrafanaURL } from './service';