From 978c3ea3cf52ec4871f98f9c9e6bf5e33b18e9b4 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Thu, 10 Apr 2025 22:12:27 +0800
Subject: [PATCH] feat(i18n): update subscription terminology in multiple
 languages for consistency

---
 src/renderer/src/i18n/locales/en-us.json      |  5 ++--
 src/renderer/src/i18n/locales/ja-jp.json      |  3 +--
 src/renderer/src/i18n/locales/ru-ru.json      |  3 +--
 src/renderer/src/i18n/locales/zh-cn.json      |  5 +---
 src/renderer/src/i18n/locales/zh-tw.json      |  3 +--
 .../WebSearchSettings/BasicSettings.tsx       |  4 +--
 .../WebSearchSettings/BlacklistSettings.tsx   | 27 ++++++++++---------
 7 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index ad886b8c..5a27f32d 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1299,9 +1299,8 @@
           "description": "Tavily is a search engine tailored for AI agents, delivering real-time, accurate results, intelligent query suggestions, and in-depth research capabilities.",
           "title": "Tavily"
         },
-       "title": "Web Search",
-        "subscribe": "Subscribe",
-        "subscribe_tooltip": "Subscribe to the blacklist.",
+        "title": "Web Search",
+        "subscribe": "Blacklist Subscription",
         "subscribe_update": "Update now",
         "subscribe_add": "Add Subscription",
         "subscribe_url": "Subscription feed address",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index bab44d01..03d30316 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1299,8 +1299,7 @@
         },
         "title": "ウェブ検索",
         "blacklist_tooltip": "マッチパターン: *://*.example.com/*\n正規表現: /example\\.(net|org)/",
-        "subscribe": "購読",
-        "subscribe_tooltip": "ブラックリストに登録する",
+        "subscribe": "ブラックリスト購読",
         "subscribe_update": "今すぐ更新",
         "subscribe_add": "サブスクリプションを追加",
         "subscribe_url": "フィードのURL",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 6af1f480..97a2f8e8 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1299,8 +1299,7 @@
         },
         "title": "Поиск в Интернете",
         "blacklist_tooltip": "Соответствующий шаблон: *://*.example.com/*\nРегулярное выражение: /example\\.(net|org)/",
-        "subscribe": "Подписка",
-        "subscribe_tooltip": "Подписаться на черный список",
+        "subscribe": "Черный список подписки",
         "subscribe_update": "Обновить сейчас",
         "subscribe_add": "Добавить подписку",
         "subscribe_url": "Адрес источника подписки",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 8bf5b619..c7074215 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1293,8 +1293,7 @@
         "search_max_result": "搜索结果个数",
         "search_provider": "搜索服务商",
         "search_provider_placeholder": "选择一个搜索服务商",
-        "subscribe": "订阅",
-        "subscribe_tooltip": "订阅黑名单列表",
+        "subscribe": "黑名单订阅",
         "subscribe_update": "立即更新",
         "subscribe_add": "添加订阅",
         "subscribe_url": "订阅源地址",
@@ -1381,5 +1380,3 @@
     }
   }
 }
-
-
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index fa2fcb0a..1f5d71c5 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1298,8 +1298,7 @@
         "no_provider_selected": "請選擇搜索服務商後再檢查",
         "check_failed": "驗證失敗",
         "blacklist_tooltip": "匹配模式: *://*.example.com/*\n正则表达式: /example\\.(net|org)/",
-        "subscribe": "訂閱",
-        "subscribe_tooltip": "訂閱黑名單列表",
+        "subscribe": "黑名單訂閱",
         "subscribe_update": "立即更新",
         "subscribe_add": "添加訂閱",
         "subscribe_url": "訂閱源地址",
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
index d3e15c58..937f84c1 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
@@ -46,8 +46,8 @@ const BasicSettings: FC = () => {
           </SettingRowTitle>
           <Switch checked={enhanceMode} onChange={(checked) => dispatch(setEnhanceMode(checked))} />
         </SettingRow>
-        <SettingDivider style={{ marginTop: 15, marginBottom: 12 }} />
-        <SettingRow>
+        <SettingDivider style={{ marginTop: 15, marginBottom: 10 }} />
+        <SettingRow style={{ height: 40 }}>
           <SettingRowTitle>{t('settings.websearch.search_max_result')}</SettingRowTitle>
           <Slider
             defaultValue={maxResults}
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx
index 23d9ffab..3110c3c4 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx
@@ -18,6 +18,7 @@ interface DataType {
   url: string
   name: string
 }
+
 const columns: TableProps<DataType>['columns'] = [
   { title: t('common.name'), dataIndex: 'name', key: 'name' },
   {
@@ -26,6 +27,7 @@ const columns: TableProps<DataType>['columns'] = [
     key: 'url'
   }
 ]
+
 const BlacklistSettings: FC = () => {
   const [errFormat, setErrFormat] = useState(false)
   const [blacklistInput, setBlacklistInput] = useState('')
@@ -231,26 +233,27 @@ const BlacklistSettings: FC = () => {
           {t('common.save')}
         </Button>
         {errFormat && <Alert message={t('settings.websearch.blacklist_tooltip')} type="error" />}
+      </SettingGroup>
+      <SettingGroup theme={theme}>
+        <SettingTitle>
+          {t('settings.websearch.subscribe')}
+          <Button
+            type={subscribeValid ? 'primary' : 'default'}
+            ghost={subscribeValid}
+            disabled={subscribeChecking}
+            onClick={handleAddSubscribe}>
+            {t('settings.websearch.subscribe_add')}
+          </Button>
+        </SettingTitle>
         <SettingDivider />
-        <SettingTitle>{t('settings.websearch.subscribe')}</SettingTitle>
         <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }}>
-          <SettingRow>
-            {t('settings.websearch.subscribe_tooltip')}
-            <Button
-              type={subscribeValid ? 'primary' : 'default'}
-              ghost={subscribeValid}
-              disabled={subscribeChecking}
-              onClick={handleAddSubscribe}>
-              {t('settings.websearch.subscribe_add')}
-            </Button>
-          </SettingRow>
           <Table<DataType>
             rowSelection={{ type: 'checkbox', ...rowSelection }}
             columns={columns}
             dataSource={dataSource}
             pagination={{ position: ['none'] }}
           />
-          <SettingRow>
+          <SettingRow style={{ height: 50 }}>
             <Button
               type={subscribeValid ? 'primary' : 'default'}
               ghost={subscribeValid}