From 8bc451ff083202650db247e844f6cb9d7766d28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A=E7=9A=84=E8=A5=BF=E7=BA=A2=E6=9F=BF?= Date: Sun, 15 Jun 2025 05:19:30 +0800 Subject: [PATCH] fix: proxy mode description displays incorrectly (#3719) * fix: proxy mode description display incorrectly * fix: update language json --------- Co-authored-by: Tunglies --- src/components/home/clash-mode-card.tsx | 13 ++++++++++--- src/locales/en.json | 6 +++--- src/locales/ru.json | 6 +++--- src/locales/tr.json | 6 +++--- src/locales/zh.json | 6 +++--- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/components/home/clash-mode-card.tsx b/src/components/home/clash-mode-card.tsx index 8faafceb..ceda0aec 100644 --- a/src/components/home/clash-mode-card.tsx +++ b/src/components/home/clash-mode-card.tsx @@ -23,6 +23,15 @@ export const ClashModeCard = () => { // 直接使用API返回的模式，不维护本地状态 const currentMode = clashConfig?.mode?.toLowerCase(); + const modeDescription = useMemo(() => { + if (typeof currentMode === "string" && currentMode.length > 0) { + return t( + `${currentMode[0].toLocaleUpperCase()}${currentMode.slice(1)} Mode Description`, + ); + } + return t("Mode Description Not Available"); + }, [currentMode]); + // 模式图标映射 const modeIcons = useMemo( () => ({ @@ -148,9 +157,7 @@ export const ClashModeCard = () => { }} > - {t( - `${currentMode?.charAt(0).toUpperCase()}${currentMode?.slice(1)} Mode Description`, - )} + {modeDescription} diff --git a/src/locales/en.json b/src/locales/en.json index eaea973f..bbbf4dbe 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -213,9 +213,9 @@ "TUN Mode Disabled": "TUN mode is disabled, suitable for special applications", "TUN Mode Service Required": "TUN mode requires service mode, please install the service first", "TUN Mode Intercept Info": "TUN mode can take over all application traffic, suitable for special applications that do not follow the system proxy settings", - "rule Mode Description": "Routes traffic according to preset rules, provides flexible proxy strategies", - "global Mode Description": "All traffic goes through proxy servers, suitable for scenarios requiring global internet access", - "direct Mode Description": "All traffic doesn't go through proxy nodes, but is forwarded by Clash kernel to target servers, suitable for specific scenarios requiring kernel traffic distribution", + "Rule Mode Description": "Routes traffic according to preset rules, provides flexible proxy strategies", + "Global Mode Description": "All traffic goes through proxy servers, suitable for scenarios requiring global internet access", + "Direct Mode Description": "All traffic doesn't go through proxy nodes, but is forwarded by Clash kernel to target servers, suitable for specific scenarios requiring kernel traffic distribution", "Stack": "Tun Stack", "System and Mixed Can Only be Used in Service Mode": "System and Mixed Can Only be Used in Service Mode", "Device": "Device Name", diff --git a/src/locales/ru.json b/src/locales/ru.json index 4b957cf4..f4aa2350 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -210,9 +210,9 @@ "TUN Mode Disabled": "Режим TUN отключен", "TUN Mode Service Required": "Режим TUN требует установленную службу Clash Verge", "TUN Mode Intercept Info": "Режим TUN может перехватить трафик всех приложений, подходит для приложений, которые не работают в режиме системного прокси.", - "rule Mode Description": "Направляет трафик в соответствии с предустановленными правилами", - "global Mode Description": "Направляет весь трафик через прокси-серверы", - "direct Mode Description": "Весь трафик обходит прокси, но передается ядром Clash для целевых серверов, подходит для конкретных сценариев, требующих распределения трафика ядра", + "Rule Mode Description": "Направляет трафик в соответствии с предустановленными правилами", + "Global Mode Description": "Направляет весь трафик через прокси-серверы", + "Direct Mode Description": "Весь трафик обходит прокси, но передается ядром Clash для целевых серверов, подходит для конкретных сценариев, требующих распределения трафика ядра", "Stack": "Стек", "System and Mixed Can Only be Used in Service Mode": "Стэк System и Mixed могут использоваться только в режиме системной службы", "Device": "Имя устройства", diff --git a/src/locales/tr.json b/src/locales/tr.json index 8b427b36..bc24c32d 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -213,9 +213,9 @@ "TUN Mode Disabled": "TUN modu devre dışı, özel uygulamalar için uygundur", "TUN Mode Service Required": "TUN modu hizmet modu gerektirir, lütfen önce hizmeti kurun", "TUN Mode Intercept Info": "TUN modu tüm uygulama trafiğini ele alabilir, sistem vekil ayarlarını takip etmeyen özel uygulamalar için uygundur", - "rule Mode Description": "Trafiği önceden ayarlanmış kurallara göre yönlendirir, esnek vekil stratejileri sağlar", - "global Mode Description": "Tüm trafik vekil sunucuları üzerinden geçer, küresel internet erişimi gerektiren senaryolar için uygundur", - "direct Mode Description": "Tüm trafik vekil düğümleri üzerinden geçmez, ancak Clash çekirdeği tarafından hedef sunuculara yönlendirilir, çekirdek trafik dağıtımı gerektiren özel senaryolar için uygundur", + "Rule Mode Description": "Trafiği önceden ayarlanmış kurallara göre yönlendirir, esnek vekil stratejileri sağlar", + "Global Mode Description": "Tüm trafik vekil sunucuları üzerinden geçer, küresel internet erişimi gerektiren senaryolar için uygundur", + "Direct Mode Description": "Tüm trafik vekil düğümleri üzerinden geçmez, ancak Clash çekirdeği tarafından hedef sunuculara yönlendirilir, çekirdek trafik dağıtımı gerektiren özel senaryolar için uygundur", "Stack": "Tun Yığını", "System and Mixed Can Only be Used in Service Mode": "Sistem ve Karışık Modlar Sadece Hizmet Modunda Kullanılabilir", "Device": "Cihaz Adı", diff --git a/src/locales/zh.json b/src/locales/zh.json index 14030788..cc0eb733 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -213,9 +213,9 @@ "TUN Mode Disabled": "TUN 模式已关闭，适用于特殊应用", "TUN Mode Service Required": "TUN模式需要服务模式，请先安装服务", "TUN Mode Intercept Info": "TUN模式可以接管所有应用流量，适用于特殊不遵循系统代理设置的应用", - "rule Mode Description": "基于预设规则智能判断流量走向，提供灵活的代理策略", - "global Mode Description": "所有流量均通过代理服务器，适用于需要全局科学上网的场景", - "direct Mode Description": "所有流量不经过代理节点，但经过Clash内核转发连接目标服务器，适用于需要通过内核进行分流的特定场景", + "Rule Mode Description": "基于预设规则智能判断流量走向，提供灵活的代理策略", + "Global Mode Description": "所有流量均通过代理服务器，适用于需要全局科学上网的场景", + "Direct Mode Description": "所有流量不经过代理节点，但经过Clash内核转发连接目标服务器，适用于需要通过内核进行分流的特定场景", "Stack": "TUN 模式堆栈", "System and Mixed Can Only be Used in Service Mode": "System 和 Mixed 只能在服务模式下使用", "Device": "TUN 网卡名称",