This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 486ebdb9b [INLONG-6972][Dashboard] Change all "consumption" to
"subscription" for data consumption (#6973)
486ebdb9b is described below
commit 486ebdb9bffaeee351e6ca8038534d3a36804064
Author: kinfuy <37766068+kin...@users.noreply.github.com>
AuthorDate: Wed Dec 21 09:38:05 2022 +0800
[INLONG-6972][Dashboard] Change all "consumption" to "subscription" for
data consumption (#6973)
---
inlong-dashboard/src/configs/menus/index.ts | 2 +-
inlong-dashboard/src/i18n.ts | 8 ++++----
inlong-dashboard/src/locales/cn.json | 14 +++++++-------
inlong-dashboard/src/locales/en.json | 12 ++++++------
inlong-dashboard/src/pages/ConsumeDetail/index.tsx | 6 +++---
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/inlong-dashboard/src/configs/menus/index.ts
b/inlong-dashboard/src/configs/menus/index.ts
index 26199c40c..ed6c28c86 100644
--- a/inlong-dashboard/src/configs/menus/index.ts
+++ b/inlong-dashboard/src/configs/menus/index.ts
@@ -33,7 +33,7 @@ const menus: MenuItemType[] = [
},
{
path: '/consume',
- name: i18n.t('configs.menus.Consumes'),
+ name: i18n.t('configs.menus.Subscribe'),
},
{
name: i18n.t('configs.menus.Clusters'),
diff --git a/inlong-dashboard/src/i18n.ts b/inlong-dashboard/src/i18n.ts
index 4a3e035f7..f71bfb580 100644
--- a/inlong-dashboard/src/i18n.ts
+++ b/inlong-dashboard/src/i18n.ts
@@ -26,8 +26,8 @@ const resources = {
en: {
translation: {
'configs.menus.Process': 'Approval',
- 'configs.menus.Groups': 'Inlong Groups',
- 'configs.menus.Consumes': 'Inlong Consumes',
+ 'configs.menus.Groups': 'Integration',
+ 'configs.menus.Subscribe': 'Subscription',
'configs.menus.Clusters': 'Clusters',
'configs.menus.ClusterTags': 'ClusterTags',
'configs.menus.SystemManagement': 'System',
@@ -39,8 +39,8 @@ const resources = {
cn: {
translation: {
'configs.menus.Process': '审批管理',
- 'configs.menus.Groups': '数据流组',
- 'configs.menus.Consumes': '数据消费',
+ 'configs.menus.Groups': '数据集成',
+ 'configs.menus.Subscribe': '数据订阅',
'configs.menus.Clusters': '集群管理',
'configs.menus.ClusterTags': '标签管理',
'configs.menus.SystemManagement': '系统管理',
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 81ab02f8f..ebe11ada6 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -384,8 +384,8 @@
"meta.Consume.FilterEnabled": "是否过滤消费",
"meta.Consume.Yes": "是",
"meta.Consume.No": "否",
- "meta.Consume.Owner": "消费责任人",
- "meta.Consume.OwnersExtra": "可查看、修改消费信息",
+ "meta.Consume.Owner": "订阅责任人",
+ "meta.Consume.OwnersExtra": "可查看、修改订阅信息",
"meta.Nodes.Name": "节点名称",
"meta.Nodes.Type": "类型",
"meta.Nodes.Owners": "责任人",
@@ -546,17 +546,17 @@
"pages.Approvals.GroupId": "数据流组 ID",
"pages.Approvals.MyApplication": "我的申请",
"pages.Approvals.MyApproval": "我的审批",
- "pages.ConsumeCreate.ConsumerInformation": "消费信息",
+ "pages.ConsumeCreate.SubscriptionInformation": "订阅信息",
"pages.ConsumeCreate.Prev": "上一步",
"pages.ConsumeCreate.Next": "下一步",
"pages.ConsumeCreate.Submit": "提交审批",
"pages.ConsumeCreate.Back": "返回",
- "pages.ConsumeCreate.NewConsume": "新建消费",
+ "pages.ConsumeCreate.NewSubscribe": "新建订阅",
"pages.ConsumeDashboard.config.BeAllocated": "待分配",
"pages.ConsumeDashboard.config.ApplicationStatus": "申请状态",
"pages.ConsumeDashboard.config.Reject": "已驳回",
"pages.ConsumeDashboard.config.OperatingStatus": "运行状态",
- "pages.ConsumeDashboard.config.Total": "消费总数",
+ "pages.ConsumeDashboard.config.Total": "订阅总数",
"pages.ConsumeDashboard.config.Pending": "待审批",
"pages.ConsumeDashboard.config.ConsumerGroup": "消费组",
"pages.ConsumeDashboard.config.ConsumeInlongGroupId": "数据流组ID",
@@ -568,8 +568,8 @@
"pages.ConsumeDashboard.status.NoStatus": "暂无",
"pages.ConsumeDashboard.status.Passed": "已通过",
"pages.ConsumeDashboard.status.Cancelled": "已取消",
- "pages.ConsumeDashboard.NewConsume": "新建消费",
- "pages.ConsumeDetail.ConsumeDetails": "消费详情",
+ "pages.ConsumeDashboard.NewSubscribe": "新建订阅",
+ "pages.ConsumeDetail.SubscribeDetails": "订阅详情",
"pages.Clusters.Type": "类型",
"pages.Clusters.TypeAll": "全部",
"pages.Clusters.Create": "新建集群",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 0bd7ec404..06020ce3e 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -384,8 +384,8 @@
"meta.Consume.FilterEnabled": "Filter Enabled",
"meta.Consume.Yes": "Yes",
"meta.Consume.No": "No",
- "meta.Consume.Owner": "Consume Owners",
- "meta.Consume.OwnersExtra": "Can view, modify consume info",
+ "meta.Consume.Owner": "Subscription Owners",
+ "meta.Consume.OwnersExtra": "Can view, modify subscription info",
"meta.Nodes.Name": "Name",
"meta.Nodes.Type": "Type",
"meta.Nodes.Owners": "Owners",
@@ -543,12 +543,12 @@
"pages.Approvals.GroupId": "Inlong Group ID",
"pages.Approvals.MyApplication": "My Application",
"pages.Approvals.MyApproval": "My Approval",
- "pages.ConsumeCreate.ConsumerInformation": "Consumer information",
+ "pages.ConsumeCreate.SubscriptionInformation": "Subscription information",
"pages.ConsumeCreate.Prev": "Prev",
"pages.ConsumeCreate.Next": "Next",
"pages.ConsumeCreate.Submit": "Submit",
"pages.ConsumeCreate.Back": "Back",
- "pages.ConsumeCreate.NewConsume": "NewConsume",
+ "pages.ConsumeCreate.NewSubscribe": "NewSubscribe",
"pages.ConsumeDashboard.config.BeAllocated": "Be allocated",
"pages.ConsumeDashboard.config.ApplicationStatus": "Application status",
"pages.ConsumeDashboard.config.Reject": "Reject",
@@ -565,9 +565,9 @@
"pages.ConsumeDashboard.status.NoStatus": "NoStatus",
"pages.ConsumeDashboard.status.Passed": "Passed",
"pages.ConsumeDashboard.status.Cancelled": "Cancelled",
- "pages.ConsumeDashboard.NewConsume": "Create",
+ "pages.ConsumeDashboard.NewSubscribe": "Create",
"pages.ConsumeDetail.Info.config.ConsumerGroupID": "Consumer group ID",
- "pages.ConsumeDetail.ConsumeDetails": "Consume Detail",
+ "pages.ConsumeDetail.SubscribeDetails": "Subscription Detail",
"pages.Clusters.Type": "Type",
"pages.Clusters.TypeAll": "All",
"pages.Clusters.Create": "Create",
diff --git a/inlong-dashboard/src/pages/ConsumeDetail/index.tsx
b/inlong-dashboard/src/pages/ConsumeDetail/index.tsx
index 6eb736ef8..dcadd70fd 100644
--- a/inlong-dashboard/src/pages/ConsumeDetail/index.tsx
+++ b/inlong-dashboard/src/pages/ConsumeDetail/index.tsx
@@ -55,7 +55,7 @@ const Comp: React.FC = () => {
const list = useMemo(
() => [
{
- label: t('pages.ConsumeDetail.ConsumeDetails'),
+ label: t('pages.ConsumeDetail.SubscribeDetails'),
value: 'consumeDetail',
content: Info,
},
@@ -132,8 +132,8 @@ const Comp: React.FC = () => {
breadcrumb={[
{
name: isCreate
- ? t('pages.ConsumeCreate.NewConsume')
- : `${t('pages.ConsumeDetail.ConsumeDetails')}${data?.id}`,
+ ? t('pages.ConsumeCreate.NewSubscribe')
+ : `${t('pages.ConsumeDetail.SubscribeDetails')}${data?.id}`,
},
]}
useDefaultContainer={!isCreate}
