From b5b94bc685fd2251551df826dab3575ab262f6dc Mon Sep 17 00:00:00 2001 From: ruiyunzhao <91191418+CR-Yun@users.noreply.github.com> Date: Sun, 30 Aug 2026 20:45:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(subscription):=20=E6=97=A0=E6=9C=89?= =?UTF-8?q?=E6=95=88=E8=AE=A2=E9=98=85=E6=97=B6=E5=89=8D=E7=AB=AF=E5=A6=82?= =?UTF-8?q?=E5=AE=9E=E6=98=BE=E7=A4=BA=E3=80=8C=E4=BB=85=E7=94=A8=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E3=80=8D=E5=81=8F=E5=A5=BD=20(#6222)=20(#7086)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Claude --- .../components/subscription-plans-card.tsx | 24 +++++++++---------- web/src/i18n/locales/en.json | 3 ++- web/src/i18n/locales/fr.json | 3 ++- web/src/i18n/locales/ja.json | 3 ++- web/src/i18n/locales/ru.json | 3 ++- web/src/i18n/locales/vi.json | 3 ++- web/src/i18n/locales/zh-TW.json | 3 ++- web/src/i18n/locales/zh.json | 3 ++- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/web/src/features/wallet/components/subscription-plans-card.tsx b/web/src/features/wallet/components/subscription-plans-card.tsx index 5c7dd54e87..2600c0502d 100644 --- a/web/src/features/wallet/components/subscription-plans-card.tsx +++ b/web/src/features/wallet/components/subscription-plans-card.tsx @@ -194,8 +194,6 @@ export function SubscriptionPlansCard({ const isSubPref = billingPreference === 'subscription_first' || billingPreference === 'subscription_only' - const displayPref = - disablePref && isSubPref ? 'wallet_first' : billingPreference const planPurchaseCountMap = useMemo(() => { const map = new Map() @@ -332,12 +330,12 @@ export function SubscriptionPlansCard({ label: getBillingPreferenceLabel('wallet_only', t), }, ]} - value={displayPref} + value={billingPreference} onValueChange={(v) => v !== null && handlePreferenceChange(v)} > - {getBillingPreferenceLabel(displayPref, t)} + {getBillingPreferenceLabel(billingPreference, t)} @@ -381,15 +379,15 @@ export function SubscriptionPlansCard({ {disablePref && isSubPref && (

- {t( - 'Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.', - { - pref: - billingPreference === 'subscription_only' - ? t('Subscription Only') - : t('Subscription First'), - } - )} + {billingPreference === 'subscription_only' + ? t( + 'Preference saved as {{pref}}, but no active subscription. Requests will be rejected.', + { pref: t('Subscription Only') } + ) + : t( + 'Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.', + { pref: t('Subscription First') } + )}

)} diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index f1a410f7e7..63f6efe3b7 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "Pre-consumed", "Pre-Consumed Quota": "Pre-Consumed Quota", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.", "Preferences": "Preferences", "Prefill Group Management": "Prefill Group Management", "Prefill Groups": "Prefill Groups", @@ -5538,4 +5539,4 @@ "Zhipu V4": "Zhipu V4", "Zoom": "Zoom" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/fr.json b/web/src/i18n/locales/fr.json index e81b95fcee..176d3100cc 100644 --- a/web/src/i18n/locales/fr.json +++ b/web/src/i18n/locales/fr.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "Pré-consommé", "Pre-Consumed Quota": "Quota pré-consommé", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "Préférence enregistrée comme {{pref}}, mais aucun abonnement actif. Le portefeuille sera utilisé automatiquement.", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "Préférence enregistrée comme {{pref}}, mais aucun abonnement actif. Les demandes seront rejetées.", "Preferences": "Préférences", "Prefill Group Management": "Gestion des groupes de préremplissage", "Prefill Groups": "Groupes de préremplissage", @@ -5538,4 +5539,4 @@ "Zhipu V4": "Zhipu V4", "Zoom": "Zoom" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/ja.json b/web/src/i18n/locales/ja.json index 5a9a00a665..e07847df1b 100644 --- a/web/src/i18n/locales/ja.json +++ b/web/src/i18n/locales/ja.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "事前消費", "Pre-Consumed Quota": "事前消費クォータ", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "設定は{{pref}}として保存されましたが、アクティブなサブスクリプションがありません。ウォレットが自動的に使用されます。", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "設定は{{pref}}として保存されましたが、アクティブなサブスクリプションがありません。リクエストは拒否されます。", "Preferences": "環境設定", "Prefill Group Management": "プリフィルグループ管理", "Prefill Groups": "プリフィルグループ", @@ -5538,4 +5539,4 @@ "Zhipu V4": "Zhipu V 4", "Zoom": "ズーム" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/ru.json b/web/src/i18n/locales/ru.json index 2575247833..51e85754ec 100644 --- a/web/src/i18n/locales/ru.json +++ b/web/src/i18n/locales/ru.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "Предоплата", "Pre-Consumed Quota": "Предварительно потребленная квота", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "Настройка сохранена как {{pref}}, но нет активной подписки. Кошелёк будет использоваться автоматически.", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "Настройка сохранена как {{pref}}, но нет активной подписки. Запросы будут отклонены.", "Preferences": "Настройки", "Prefill Group Management": "Управление группами автозаполнения", "Prefill Groups": "Группы автозаполнения", @@ -5538,4 +5539,4 @@ "Zhipu V4": "Zhipu V4", "Zoom": "Zoom" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/vi.json b/web/src/i18n/locales/vi.json index f558290194..1a1ab235e6 100644 --- a/web/src/i18n/locales/vi.json +++ b/web/src/i18n/locales/vi.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "Khấu trừ trước", "Pre-Consumed Quota": "Hạn mức đã tiêu thụ trước", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "Tùy chọn đã lưu là {{pref}}, nhưng không có gói đăng ký đang hoạt động. Ví sẽ được sử dụng tự động.", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "Tùy chọn đã lưu là {{pref}}, nhưng không có gói đăng ký đang hoạt động. Các yêu cầu sẽ bị từ chối.", "Preferences": "Tùy chọn", "Prefill Group Management": "Quản lý Nhóm Điền sẵn", "Prefill Groups": "Điền sẵn các nhóm", @@ -5538,4 +5539,4 @@ "Zhipu V4": "Zhipu V4", "Zoom": "Zoom" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/zh-TW.json b/web/src/i18n/locales/zh-TW.json index 94899c98cc..cdb42a32eb 100644 --- a/web/src/i18n/locales/zh-TW.json +++ b/web/src/i18n/locales/zh-TW.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "預扣費", "Pre-Consumed Quota": "預消耗配額", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "已儲存偏好為{{pref}}，目前無生效訂閱，將自動使用錢包", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "已儲存偏好為{{pref}}，目前無生效訂閱，請求將被拒絕", "Preferences": "偏好設定", "Prefill Group Management": "預填充分組管理", "Prefill Groups": "預填充分組", @@ -5538,4 +5539,4 @@ "Zhipu V4": "智譜 V4", "Zoom": "縮放" } -} +} \ No newline at end of file diff --git a/web/src/i18n/locales/zh.json b/web/src/i18n/locales/zh.json index 85278c6308..183e97661c 100644 --- a/web/src/i18n/locales/zh.json +++ b/web/src/i18n/locales/zh.json @@ -3640,6 +3640,7 @@ "Pre-consumed": "预扣费", "Pre-Consumed Quota": "预消耗配额", "Preference saved as {{pref}}, but no active subscription. Wallet will be used automatically.": "已保存偏好为{{pref}}，当前无生效订阅，将自动使用钱包", + "Preference saved as {{pref}}, but no active subscription. Requests will be rejected.": "已保存偏好为{{pref}}，当前无生效订阅，请求将被拒绝", "Preferences": "偏好设置", "Prefill Group Management": "预填充分组管理", "Prefill Groups": "预填充分组", @@ -5538,4 +5539,4 @@ "Zhipu V4": "智谱 V4", "Zoom": "缩放" } -} +} \ No newline at end of file