feat(i18n): modify some i18n according to the proposal#331 (#366)

Author: liuxiran

src/components/ActionBar/ActionBar.tsx

@@ -37,7 +37,6 @@ const style: CSSProperties = {
 };
 
 const ActionBar: React.FC<Props> = ({ step, lastStep, onChange, withResultView }) => {
-
   const { formatMessage } = useIntl();
 
   if (step > lastStep && !withResultView) {
@@ -50,12 +49,14 @@ const ActionBar: React.FC<Props> = ({ step, lastStep, onChange, withResultView }
       <Row gutter={10} justify="end">
         <Col>
           <Button type="primary" onClick={() => onChange(step - 1)} disabled={step === 1}>
-            {formatMessage({ id: 'actionbar.last.step' })}
+            {formatMessage({ id: 'component.actionbar.button.preStep' })}
           </Button>
         </Col>
         <Col>
           <Button type="primary" onClick={() => onChange(step + 1)}>
-            {step < lastStep ? formatMessage({ id: 'actionbar.next.step' }) : formatMessage({ id: 'actionbar.submit' })}
+            {step < lastStep
+              ? formatMessage({ id: 'component.actionbar.button.nextStep' })
+              : formatMessage({ id: 'component.global.button.submit' })}
           </Button>
         </Col>
       </Row>

src/components/ActionBar/locales/en-US.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 export default {
-  'actionbar.last.step': 'Last Step',
-  'actionbar.next.step': 'Next Step',
-  'actionbar.submit': 'Submit',
+  'component.actionbar.button.preStep': 'Previous',
+  'component.actionbar.button.nextStep': 'Next',
 };

src/components/ActionBar/locales/zh-CN.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 export default {
-  'actionbar.last.step': '上一步',
-  'actionbar.next.step': '下一步',
-  'actionbar.submit': '提交',
+  'component.actionbar.button.preStep': '上一步',
+  'component.actionbar.button.nextStep': '下一步',
 };

src/locales/en-US/component.ts

@@ -20,7 +20,7 @@ export default {
   'component.tagSelect.all': 'All',
   'component.global.remove': 'Remove',
   'component.global.cancel': 'Cancel',
-  'component.global.submit': 'Submit',
+  'component.global.button.submit': 'Submit',
   'component.global.create': 'Create',
   'component.global.add': 'Add',
   'component.global.save': 'Save',

src/locales/zh-CN/component.ts

@@ -20,7 +20,7 @@ export default {
   'component.tagSelect.all': '全部',
   'component.global.remove': '删除',
   'component.global.cancel': '取消',
-  'component.global.submit': '提交',
+  'component.global.button.submit': '提交',
   'component.global.create': '创建',
   'component.global.add': '新建',
   'component.global.save': '保存',

src/pages/Setting/Setting.tsx

@@ -65,7 +65,11 @@ const Setting: React.FC = () => {
         resolve();
       }),
     ]).then(() => {
-      notification.success({ message: formatMessage({ id: 'setting.update.configuration.successfully' }) });
+      notification.success({
+        message: formatMessage({
+          id: 'page.setting.notification.update.configuration.successfully',
+        }),
+      });
       setTimeout(() => {
         window.location.reload();
       }, 500);
@@ -74,22 +78,34 @@ const Setting: React.FC = () => {
 
   return (
     <>
-      <PageContainer title={formatMessage({ id: 'set' })}>
+      <PageContainer title={formatMessage({ id: 'page.setting.pageContainer.title' })}>
         <Card>
           <Row>
             <Col span={10}>
               <Form form={form} labelCol={{ span: 7 }}>
                 {!isWorkspace && (
-                  <Form.Item label={formatMessage({ id: 'setting.api.address' })} name="baseURL">
+                  <Form.Item
+                    label={formatMessage({ id: 'page.setting.form.item.baseURL' })}
+                    name="baseURL"
+                  >
                     <Input />
                   </Form.Item>
                 )}
                 {canFetchGrafana && (
                   <Form.Item
-                    label={formatMessage({ id: 'setting.grafana.address' })}
+                    label={formatMessage({ id: 'page.setting.form.item.grafanaURL' })}
                     name="grafanaURL"
-                    extra={formatMessage({ id: 'setting.grafana.address.rule' })}
-                    rules={[{ pattern: new RegExp(/^https?:\/\//), message: formatMessage({ id: 'setting.grafana.address.illegality' }) }]}
+                    extra={formatMessage({
+                      id: 'page.setting.form.item.grafanaURL.inputHelpMessage',
+                    })}
+                    rules={[
+                      {
+                        pattern: new RegExp(/^https?:\/\//),
+                        message: formatMessage({
+                          id: 'page.setting.form.item.grafanaURL.inputErrorMessage',
+                        }),
+                      },
+                    ]}
                   >
                     <Input />
                   </Form.Item>

src/pages/Setting/locales/en-US.ts

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 export default {
-  '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',
+  'page.setting.notification.update.configuration.successfully':
+    'Update Configuration Successfully',
+  'page.setting.pageContainer.title': 'Setting',
+  'page.setting.form.item.baseURL': 'API Address',
+  'page.setting.form.item.grafanaURL': 'Grafana Address',
+  'page.setting.form.item.grafanaURL.inputHelpMessage':
+    'Grafana address should begin with HTTP or HTTPS',
+  'page.setting.form.item.grafanaURL.inputErrorMessage': 'Address is illegality',
 };

src/pages/Setting/locales/zh-CN.ts

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 export default {
-  'setting.update.configuration.successfully': '更新配置成功',
-  'setting':'设置',
-  'setting.api.address':'API 地址',
-  'setting.grafana.address':'Grafana 地址',
-  'setting.grafana.address.rule':'Grafana 地址需以 HTTP 或 HTTPS 开头',
-  'setting.grafana.address.illegality':'非法的地址',
+  'page.setting.notification.update.configuration.successfully': '更新配置成功',
+  'page.setting.pageContainer.title': '设置',
+  'page.setting.form.item.baseURL': 'API 基础地址',
+  'page.setting.form.item.grafanaURL': 'Grafana 地址',
+  'page.setting.form.item.grafanaURL.inputHelpMessage': 'Grafana 地址需以 HTTP 或 HTTPS 开头',
+  'page.setting.form.item.grafanaURL.inputErrorMessage': '非法的地址',
 };