From 34ea6a6bc6e456c70e9f8164648f02b3d78264c8 Mon Sep 17 00:00:00 2001
From: Agitator <1482084534@qq.com>
Date: Fri, 23 Oct 2026 16:15:38 +0800
Subject: [PATCH] fix: NetworkDetailsModal i18n
---
src/i18n/resources/zh_CN.json | 10 ++++
.../Zerotier/Networks/NetworkDetailsModal.tsx | 49 ++++++++++++++-----
.../__tests__/ZerotierNetworks.test.tsx | 34 ++++++++++++-
3 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/src/i18n/resources/zh_CN.json b/src/i18n/resources/zh_CN.json
index 3db51a2..5d681a0 100644
--- a/src/i18n/resources/zh_CN.json
+++ b/src/i18n/resources/zh_CN.json
@@ -33,6 +33,16 @@
"NETWORK ID": "网络 ID",
"NAME": "名称",
"STATUS": "状态",
+ "Ethernet": "以太网",
+ "Device": "设备",
+ "Type": "类型",
+ "Allow Managed Addresses": "允许托管地址",
+ "Allow Assignment of Global IPs": "允许分配全局 IP",
+ "Allow Default Router Override": "允许覆盖默认路由",
+ "Allow DNS Configuration": "允许 DNS 配置",
+ "Managed Addresses": "托管地址",
+ "Managed Routes": "托管路由",
+ "{{target}} via {{device}}": "{{target}} 经由 {{device}}",
"Refresh": "刷新",
"Join New": "加入网络",
"Search by Network ID...": "搜索网络 ID...",
diff --git a/src/pages/Zerotier/Networks/NetworkDetailsModal.tsx b/src/pages/Zerotier/Networks/NetworkDetailsModal.tsx
index 5bc5eb1..21e0f84 100644
--- a/src/pages/Zerotier/Networks/NetworkDetailsModal.tsx
+++ b/src/pages/Zerotier/Networks/NetworkDetailsModal.tsx
@@ -1,6 +1,7 @@
import { Checkbox, CheckboxGroup, Divider, Modal, ModalBody, ModalContent, ModalProps } from '@heroui/react'
import classNames from 'classnames'
import { useEffect, useState } from 'react'
+import { Trans } from 'react-i18next'
import CopyText from '../../../components/base/CopyText.tsx'
import { updateNetwork } from '../../../services/zerotierService.ts'
@@ -55,35 +56,47 @@ function NetworkDetailsModal({
-
Network ID
+
+ NETWORK ID
+
{networkDetails?.id}
-
Name
+
+ NAME
+
{networkDetails?.name}
-
Status
+
+ STATUS
+
{networkDetails?.status}
-
Ethernet
+
+ Ethernet
+
{networkDetails?.mac}
-
Device
+
+ Device
+
{networkDetails?.portDeviceName}
-
Type
+
+ Type
+
{networkDetails?.type}
@@ -97,21 +110,23 @@ function NetworkDetailsModal({
onValueChange={onSelectedChange}
>
- Allow Managed Addresses
+ Allow Managed Addresses
- Allow Assignment of Global lPs
+ Allow Assignment of Global IPs
- Allow Default Router Override
+ Allow Default Router Override
- Allow DNS Configuration
+ Allow DNS Configuration
-
Managed Addresses
+
+ Managed Addresses
+
{networkDetails?.assignedAddresses?.length ? (
networkDetails.assignedAddresses.map((address) => (
@@ -123,11 +138,19 @@ function NetworkDetailsModal({
)}
-
Managed Routes
+
+ Managed Routes
+
{networkDetails?.routes?.length ? (
networkDetails.routes.map((route) => (
- {route.target} via {networkDetails.portDeviceName}
+ {/* i18next escapes interpolated values as HTML entities; React already escapes text */}
+
+ {'{{target}} via {{device}}'}
+
))
) : (
diff --git a/src/pages/Zerotier/Networks/__tests__/ZerotierNetworks.test.tsx b/src/pages/Zerotier/Networks/__tests__/ZerotierNetworks.test.tsx
index 7532850..6602db5 100644
--- a/src/pages/Zerotier/Networks/__tests__/ZerotierNetworks.test.tsx
+++ b/src/pages/Zerotier/Networks/__tests__/ZerotierNetworks.test.tsx
@@ -1,5 +1,7 @@
-import { fireEvent, waitFor } from '@testing-library/react'
+import { fireEvent, waitFor, within } from '@testing-library/react'
+import i18n from 'i18next'
+import { Language } from '../../../../typings/enum.ts'
import { render } from '../../../../utils/testUtils/setupTest.tsx'
import { mockConfigIPC } from '../../../../utils/testUtils/tauriMocks.ts'
import ZerotierNetworks from '../ZerotierNetworks.tsx'
@@ -8,6 +10,10 @@ beforeEach(() => {
mockConfigIPC()
})
+afterEach(async () => {
+ await i18n.changeLanguage(Language.en_US)
+})
+
describe('ZerotierNetworks', () => {
it('should list the networks joined by this node', async () => {
const { getByText } = render(
)
@@ -46,4 +52,30 @@ describe('ZerotierNetworks', () => {
await waitFor(() => expect(getByText('Join New Network')).toBeTruthy())
expect(getByText('Enter 16-digit Network ID')).toBeTruthy()
})
+
+ it('should localize static labels while keeping fetched values unchanged', async () => {
+ await i18n.changeLanguage(Language.zh_CN)
+ const { findByRole, getByText } = render(
)
+
+ await waitFor(() => expect(getByText('882d314dd3dbd4dd')).toBeTruthy())
+ fireEvent.click(getByText('882d314dd3dbd4dd'))
+
+ const modal = within(await findByRole('dialog'))
+
+ expect(modal.getByText('网络 ID')).toBeTruthy()
+ expect(modal.getByText('名称')).toBeTruthy()
+ expect(modal.getByText('状态')).toBeTruthy()
+ expect(modal.getByText('以太网')).toBeTruthy()
+ expect(modal.getByText('设备')).toBeTruthy()
+ expect(modal.getByText('类型')).toBeTruthy()
+ expect(modal.getByText('允许托管地址')).toBeTruthy()
+ expect(modal.getByText('允许分配全局 IP')).toBeTruthy()
+ expect(modal.getByText('允许覆盖默认路由')).toBeTruthy()
+ expect(modal.getByText('允许 DNS 配置')).toBeTruthy()
+ expect(modal.getByText('托管地址')).toBeTruthy()
+ expect(modal.getByText('托管路由')).toBeTruthy()
+ expect(modal.getByText('172.24.0.0/24 经由 ethernet_32772')).toBeTruthy()
+ expect(modal.getByText('OK')).toBeTruthy()
+ expect(modal.getByText('PRIVATE')).toBeTruthy()
+ })
})