You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/08/06 14:59:22 UTC
[apisix-dashboard] branch master updated: feat(i18n): modify some
i18n according to the proposal#331 (#366)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 873a8d8 feat(i18n): modify some i18n according to the proposal#331 (#366)
873a8d8 is described below
commit 873a8d82b8ecdbf4395a0510997efcefff2f496e
Author: liuxiran <be...@126.com>
AuthorDate: Thu Aug 6 22:59:14 2020 +0800
feat(i18n): modify some i18n according to the proposal#331 (#366)
---
src/components/ActionBar/ActionBar.tsx | 7 ++++---
src/components/ActionBar/locales/en-US.ts | 5 ++---
src/components/ActionBar/locales/zh-CN.ts | 5 ++---
src/locales/en-US/component.ts | 2 +-
src/locales/zh-CN/component.ts | 2 +-
src/pages/Setting/Setting.tsx | 28 ++++++++++++++++++++++------
src/pages/Setting/locales/en-US.ts | 14 ++++++++------
src/pages/Setting/locales/zh-CN.ts | 12 ++++++------
8 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/components/ActionBar/ActionBar.tsx b/src/components/ActionBar/ActionBar.tsx
index 9912d45..8e9b246 100644
--- a/src/components/ActionBar/ActionBar.tsx
+++ b/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>
diff --git a/src/components/ActionBar/locales/en-US.ts b/src/components/ActionBar/locales/en-US.ts
index 63f961a..89ec0b6 100644
--- a/src/components/ActionBar/locales/en-US.ts
+++ b/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',
};
diff --git a/src/components/ActionBar/locales/zh-CN.ts b/src/components/ActionBar/locales/zh-CN.ts
index 271f489..d90b970 100644
--- a/src/components/ActionBar/locales/zh-CN.ts
+++ b/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': '下一步',
};
diff --git a/src/locales/en-US/component.ts b/src/locales/en-US/component.ts
index 57f9e5d..fc5e8da 100644
--- a/src/locales/en-US/component.ts
+++ b/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',
diff --git a/src/locales/zh-CN/component.ts b/src/locales/zh-CN/component.ts
index 51ec318..f2ca2d8 100644
--- a/src/locales/zh-CN/component.ts
+++ b/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': '保存',
diff --git a/src/pages/Setting/Setting.tsx b/src/pages/Setting/Setting.tsx
index d2f044f..3c9770f 100644
--- a/src/pages/Setting/Setting.tsx
+++ b/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>
diff --git a/src/pages/Setting/locales/en-US.ts b/src/pages/Setting/locales/en-US.ts
index dad6420..eac7fdc 100644
--- a/src/pages/Setting/locales/en-US.ts
+++ b/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',
};
diff --git a/src/pages/Setting/locales/zh-CN.ts b/src/pages/Setting/locales/zh-CN.ts
index 329673c..02d7f7d 100644
--- a/src/pages/Setting/locales/zh-CN.ts
+++ b/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': '非法的地址',
};