From 95f30cfc8f49e6aae91e12d99f5f4d988bfae2ce Mon Sep 17 00:00:00 2001 From: 49659410+tx0c <> Date: Mon, 25 Sep 2023 19:19:04 +0000 Subject: [PATCH] fix(search): Search result remove count resolves thematters/matters-server#3536 --- lang/default.json | 8 ++++---- lang/en.json | 8 ++++---- lang/zh-Hans.json | 8 ++++---- lang/zh-Hant.json | 8 ++++---- src/views/Search/AggregateResults/Articles.tsx | 7 +++---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/lang/default.json b/lang/default.json index fb0f54ee44..c752e0383d 100644 --- a/lang/default.json +++ b/lang/default.json @@ -1379,6 +1379,10 @@ "defaultMessage": "Articles has been collected", "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx" }, + "l9LpDx": { + "defaultMessage": "{q} - Matters Search", + "description": "src/views/Search/AggregateResults/Articles.tsx" + }, "lI2l2/": { "defaultMessage": "Incorrect verification code. Please check your input, or try resend", "description": "CODE_INVALID" @@ -1616,10 +1620,6 @@ "ub1kHa": { "defaultMessage": "Add to collection" }, - "uclzDH": { - "defaultMessage": "{q}: {totalCount, plural, =0 {} one {} other {# Results}} - Matters Search", - "description": "src/views/Search/AggregateResults/Articles.tsx" - }, "ui1+QC": { "defaultMessage": "End of the results" }, diff --git a/lang/en.json b/lang/en.json index 1fa257fa57..470c57c12c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1379,6 +1379,10 @@ "defaultMessage": "Articles has been collected", "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx" }, + "l9LpDx": { + "defaultMessage": "{q} - Matters Search", + "description": "src/views/Search/AggregateResults/Articles.tsx" + }, "lI2l2/": { "defaultMessage": "Incorrect verification code. Please check your input, or try resend", "description": "CODE_INVALID" @@ -1616,10 +1620,6 @@ "ub1kHa": { "defaultMessage": "Add to collection" }, - "uclzDH": { - "defaultMessage": "{q}: {totalCount, plural, =0 {} one {} other {# Results}} - Matters Search", - "description": "src/views/Search/AggregateResults/Articles.tsx" - }, "ui1+QC": { "defaultMessage": "End of the results" }, diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json index c3c6da647d..d5c5ebcd83 100644 --- a/lang/zh-Hans.json +++ b/lang/zh-Hans.json @@ -1379,6 +1379,10 @@ "defaultMessage": "作品被关联", "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx" }, + "l9LpDx": { + "defaultMessage": "{q} - Matters 搜索", + "description": "src/views/Search/AggregateResults/Articles.tsx" + }, "lI2l2/": { "defaultMessage": "验证码不正确,请检查输入内容或重新发送", "description": "CODE_INVALID" @@ -1616,10 +1620,6 @@ "ub1kHa": { "defaultMessage": "加入选集" }, - "uclzDH": { - "defaultMessage": "{q}: {totalCount, plural, =0 {} other {# 条结果}} - Matters 搜索", - "description": "src/views/Search/AggregateResults/Articles.tsx" - }, "ui1+QC": { "defaultMessage": "已显示所有结果" }, diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json index 75c9b22d65..af2c27de1e 100644 --- a/lang/zh-Hant.json +++ b/lang/zh-Hant.json @@ -1379,6 +1379,10 @@ "defaultMessage": "作品被關聯", "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx" }, + "l9LpDx": { + "defaultMessage": "{q} - Matters 搜尋", + "description": "src/views/Search/AggregateResults/Articles.tsx" + }, "lI2l2/": { "defaultMessage": "驗證碼不正確,請檢查輸入內容或重新發送", "description": "CODE_INVALID" @@ -1616,10 +1620,6 @@ "ub1kHa": { "defaultMessage": "加入選集" }, - "uclzDH": { - "defaultMessage": "{q}: {totalCount, plural, =0 {} other {# 條結果}} - Matters 搜尋", - "description": "src/views/Search/AggregateResults/Articles.tsx" - }, "ui1+QC": { "defaultMessage": "已顯示所有結果" }, diff --git a/src/views/Search/AggregateResults/Articles.tsx b/src/views/Search/AggregateResults/Articles.tsx index 515dcc2608..8a9424953c 100644 --- a/src/views/Search/AggregateResults/Articles.tsx +++ b/src/views/Search/AggregateResults/Articles.tsx @@ -51,7 +51,7 @@ const AggregateArticleResults = () => { // pagination const connectionPath = 'search' - const { edges, pageInfo, totalCount } = data?.search || {} + const { edges, pageInfo } = data?.search || {} const intl = useIntl() @@ -106,11 +106,10 @@ const AggregateArticleResults = () => {