From bf31aca654442289d3289e465e467c7643411f1d Mon Sep 17 00:00:00 2001
From: jiangfeng <popular_style_k@qq.com>
Date: Tue, 21 Jul 2020 17:11:19 +0800
Subject: [PATCH 1/2] i18n set

---
 src/pages/Setting/Setting.tsx      | 15 +++++++++------
 src/pages/Setting/locales/en-US.ts |  8 ++++++++
 src/pages/Setting/locales/zh-CN.ts |  8 ++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/Setting/locales/en-US.ts
 create mode 100644 src/pages/Setting/locales/zh-CN.ts

diff --git a/src/pages/Setting/Setting.tsx b/src/pages/Setting/Setting.tsx
index cf418b9d36..211f7b3136 100644
--- a/src/pages/Setting/Setting.tsx
+++ b/src/pages/Setting/Setting.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Card, Form, Input, Row, Col, notification } from 'antd';
+import { useIntl } from 'umi';
 
 import { setBaseURL, getBaseURL } from '@/helpers';
 import ActionBar from '@/components/ActionBar';
@@ -15,6 +16,8 @@ const Setting: React.FC = () => {
   const isWorkspace = false;
   const canFetchGrafana = (isSuperAdmin && !isWorkspace) || isWorkspace;
 
+  const { formatMessage } = useIntl();
+
   useEffect(() => {
     form.setFieldsValue({
       baseURL: getBaseURL(),
@@ -46,7 +49,7 @@ const Setting: React.FC = () => {
         resolve();
       }),
     ]).then(() => {
-      notification.success({ message: '更新配置成功' });
+      notification.success({ message: formatMessage({ id: 'set.update.configuration.successfully' }) });
       setTimeout(() => {
         window.location.reload();
       }, 500);
@@ -55,22 +58,22 @@ const Setting: React.FC = () => {
 
   return (
     <>
-      <PageContainer title="设置">
+      <PageContainer title={formatMessage({ id: 'set' })}>
         <Card>
           <Row>
             <Col span={10}>
               <Form form={form} labelCol={{ span: 7 }}>
                 {!isWorkspace && (
-                  <Form.Item label="API 地址" name="baseURL">
+                  <Form.Item label={formatMessage({ id: 'set.api.address' })} name="baseURL">
                     <Input />
                   </Form.Item>
                 )}
                 {canFetchGrafana && (
                   <Form.Item
-                    label="Grafana 地址"
+                    label={formatMessage({ id: 'set.grafana.address' })}
                     name="grafanaURL"
-                    extra="Grafana 地址，需以 http 或 https 开头"
-                    rules={[{ pattern: new RegExp(/^https?:\/\//), message: '非法的地址' }]}
+                    extra={formatMessage({ id: 'set.grafana.address.rule' })}
+                    rules={[{ pattern: new RegExp(/^https?:\/\//), message: formatMessage({ id: 'set.grafana.address.illegality' }) }]}
                   >
                     <Input />
                   </Form.Item>
diff --git a/src/pages/Setting/locales/en-US.ts b/src/pages/Setting/locales/en-US.ts
new file mode 100644
index 0000000000..576c87c0d0
--- /dev/null
+++ b/src/pages/Setting/locales/en-US.ts
@@ -0,0 +1,8 @@
+export default {
+  'set.update.configuration.successfully': 'Update Configuration Successfully',
+  'set':'Set',
+  'set.api.address':'API Address',
+  'set.grafana.address':'Grafana Address',
+  'set.grafana.address.rule':'Grafana address should begin with HTTP or HTTPS',
+  'set.grafana.address.illegality':'Address is illegality',
+};
diff --git a/src/pages/Setting/locales/zh-CN.ts b/src/pages/Setting/locales/zh-CN.ts
new file mode 100644
index 0000000000..9ab9b7ebaf
--- /dev/null
+++ b/src/pages/Setting/locales/zh-CN.ts
@@ -0,0 +1,8 @@
+export default {
+  'set.update.configuration.successfully': '更新配置成功',
+  'set':'设置',
+  'set.api.address':'API 地址',
+  'set.grafana.address':'Grafana 地址',
+  'set.grafana.address.rule':'Grafana 地址需以 HTTP 或 HTTPS 开头',
+  'set.grafana.address.illegality':'非法的地址',
+};

From a985aafd791b2829bdb45eecab866a7d1edd937e Mon Sep 17 00:00:00 2001
From: jiangfeng <popular_style_k@qq.com>
Date: Fri, 24 Jul 2020 18:07:08 +0800
Subject: [PATCH 2/2] change set to setting

---
 src/pages/Setting/Setting.tsx      | 10 +++++-----
 src/pages/Setting/locales/en-US.ts | 12 ++++++------
 src/pages/Setting/locales/zh-CN.ts | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/Setting/Setting.tsx b/src/pages/Setting/Setting.tsx
index 211f7b3136..565fe8230d 100644
--- a/src/pages/Setting/Setting.tsx
+++ b/src/pages/Setting/Setting.tsx
@@ -49,7 +49,7 @@ const Setting: React.FC = () => {
         resolve();
       }),
     ]).then(() => {
-      notification.success({ message: formatMessage({ id: 'set.update.configuration.successfully' }) });
+      notification.success({ message: formatMessage({ id: 'setting.update.configuration.successfully' }) });
       setTimeout(() => {
         window.location.reload();
       }, 500);
@@ -64,16 +64,16 @@ const Setting: React.FC = () => {
             <Col span={10}>
               <Form form={form} labelCol={{ span: 7 }}>
                 {!isWorkspace && (
-                  <Form.Item label={formatMessage({ id: 'set.api.address' })} name="baseURL">
+                  <Form.Item label={formatMessage({ id: 'setting.api.address' })} name="baseURL">
                     <Input />
                   </Form.Item>
                 )}
                 {canFetchGrafana && (
                   <Form.Item
-                    label={formatMessage({ id: 'set.grafana.address' })}
+                    label={formatMessage({ id: 'setting.grafana.address' })}
                     name="grafanaURL"
-                    extra={formatMessage({ id: 'set.grafana.address.rule' })}
-                    rules={[{ pattern: new RegExp(/^https?:\/\//), message: formatMessage({ id: 'set.grafana.address.illegality' }) }]}
+                    extra={formatMessage({ id: 'setting.grafana.address.rule' })}
+                    rules={[{ pattern: new RegExp(/^https?:\/\//), message: formatMessage({ id: 'setting.grafana.address.illegality' }) }]}
                   >
                     <Input />
                   </Form.Item>
diff --git a/src/pages/Setting/locales/en-US.ts b/src/pages/Setting/locales/en-US.ts
index 576c87c0d0..71e6630e41 100644
--- a/src/pages/Setting/locales/en-US.ts
+++ b/src/pages/Setting/locales/en-US.ts
@@ -1,8 +1,8 @@
 export default {
-  'set.update.configuration.successfully': 'Update Configuration Successfully',
-  'set':'Set',
-  'set.api.address':'API Address',
-  'set.grafana.address':'Grafana Address',
-  'set.grafana.address.rule':'Grafana address should begin with HTTP or HTTPS',
-  'set.grafana.address.illegality':'Address is illegality',
+  'setting.update.configuration.successfully': 'Update Configuration Successfully',
+  'setting':'Setting',
+  'setting.api.address':'API Address',
+  'setting.grafana.address':'Grafana Address',
+  'setting.grafana.address.rule':'Grafana address should begin with HTTP or HTTPS',
+  'setting.grafana.address.illegality':'Address is illegality',
 };
diff --git a/src/pages/Setting/locales/zh-CN.ts b/src/pages/Setting/locales/zh-CN.ts
index 9ab9b7ebaf..87933caf74 100644
--- a/src/pages/Setting/locales/zh-CN.ts
+++ b/src/pages/Setting/locales/zh-CN.ts
@@ -1,8 +1,8 @@
 export default {
-  'set.update.configuration.successfully': '更新配置成功',
-  'set':'设置',
-  'set.api.address':'API 地址',
-  'set.grafana.address':'Grafana 地址',
-  'set.grafana.address.rule':'Grafana 地址需以 HTTP 或 HTTPS 开头',
-  'set.grafana.address.illegality':'非法的地址',
+  'setting.update.configuration.successfully': '更新配置成功',
+  'setting':'设置',
+  'setting.api.address':'API 地址',
+  'setting.grafana.address':'Grafana 地址',
+  'setting.grafana.address.rule':'Grafana 地址需以 HTTP 或 HTTPS 开头',
+  'setting.grafana.address.illegality':'非法的地址',
 };