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/11/25 11:56:30 UTC
[apisix-dashboard] branch master updated: fix: please input
undefined (#869)
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 b002a19 fix: please input undefined (#869)
b002a19 is described below
commit b002a199ff63727514f93388d984f1083278a2de
Author: litesun <su...@apache.org>
AuthorDate: Wed Nov 25 19:56:23 2020 +0800
fix: please input undefined (#869)
---
web/src/components/Upstream/UpstreamForm.tsx | 6 +++++-
web/src/pages/Upstream/locales/en-US.ts | 4 ++--
web/src/pages/Upstream/locales/zh-CN.ts | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx
index 1db2774..09241a5 100644
--- a/web/src/components/Upstream/UpstreamForm.tsx
+++ b/web/src/components/Upstream/UpstreamForm.tsx
@@ -148,6 +148,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
rules={[
{
required: true,
+ message: formatMessage({ id: 'upstream.step.input.domain.name.or.ip' }),
},
{
pattern: new RegExp(
@@ -167,6 +168,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
rules={[
{
required: true,
+ message: formatMessage({ id: 'upstream.step.input.port' }),
},
]}
>
@@ -180,6 +182,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
rules={[
{
required: true,
+ message: formatMessage({ id: 'upstream.step.input.weight' }),
},
]}
>
@@ -448,7 +451,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
rules={[
{
required: true,
- message: formatMessage({ id: 'upstream.step.input.receive.timeout' }),
+ message: formatMessage({ id: 'upstream.step.input.healthy.checks.successes' }),
},
]}
>
@@ -596,6 +599,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
rules={[
{
required: true,
+ message: formatMessage({ id: `upstream.step.input.${name[1]}.timeout` }),
},
]}
>
diff --git a/web/src/pages/Upstream/locales/en-US.ts b/web/src/pages/Upstream/locales/en-US.ts
index fe91f40..697ee11 100644
--- a/web/src/pages/Upstream/locales/en-US.ts
+++ b/web/src/pages/Upstream/locales/en-US.ts
@@ -36,8 +36,8 @@ export default {
'upstream.step.input.connect.timeout': 'Please input connect timeout',
'upstream.step.send.timeout': 'Send Timeout',
'upstream.step.input.send.timeout': 'Please input send timeout',
- 'upstream.step.receive.timeout': 'Receive Timeout',
- 'upstream.step.input.receive.timeout': 'Please input receive timeout',
+ 'upstream.step.read.timeout': 'Read Timeout',
+ 'upstream.step.input.read.timeout': 'Please input read timeout',
'upstream.step.healthy.check': 'Upstream Healthy Check',
'upstream.step.healthy.checks.healthy': 'Healthy',
'upstream.step.healthy.checks.unhealthy': 'Unhealthy',
diff --git a/web/src/pages/Upstream/locales/zh-CN.ts b/web/src/pages/Upstream/locales/zh-CN.ts
index 1e24469..36525b7 100644
--- a/web/src/pages/Upstream/locales/zh-CN.ts
+++ b/web/src/pages/Upstream/locales/zh-CN.ts
@@ -36,8 +36,8 @@ export default {
'upstream.step.input.connect.timeout': '请输入连接超时时间',
'upstream.step.send.timeout': '发送超时',
'upstream.step.input.send.timeout': '请输入发送超时时间',
- 'upstream.step.receive.timeout': '接收超时',
- 'upstream.step.input.receive.timeout': '请输入接收超时时间',
+ 'upstream.step.read.timeout': '接收超时',
+ 'upstream.step.input.read.timeout': '请输入接收超时时间',
'upstream.step.healthy.check': '上游健康检查',
'upstream.step.healthy.checks.healthy': '健康',
'upstream.step.healthy.checks.unhealthy': '不健康',