diff --git a/ShadowsocksX-NG2/App/Resources/Connectivity.xcstrings b/ShadowsocksX-NG2/App/Resources/Connectivity.xcstrings index 7ce47859..1a0e7a3d 100644 --- a/ShadowsocksX-NG2/App/Resources/Connectivity.xcstrings +++ b/ShadowsocksX-NG2/App/Resources/Connectivity.xcstrings @@ -18,6 +18,23 @@ } } }, + "测试中...": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Testing..." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "测试中..." + } + } + } + }, "测试中": { "extractionState": "manual", "localizations": { diff --git a/ShadowsocksX-NG2/App/UI/Servers/ConnectivityViews.swift b/ShadowsocksX-NG2/App/UI/Servers/ConnectivityViews.swift index b52b0c18..188829d6 100644 --- a/ShadowsocksX-NG2/App/UI/Servers/ConnectivityViews.swift +++ b/ShadowsocksX-NG2/App/UI/Servers/ConnectivityViews.swift @@ -89,8 +89,13 @@ struct ConnectivityTestButton: View { @ObservedObject var module: ServerConnectivity let node: CatalogTreeNode var body: some View { - Button(ConnectivityCopy.text("延迟测试")) { module.test(node.connectivityServerIDs) } - .disabled(!node.containsServerConfiguration || (!node.isGroup && module.isCooling(node.id))) + let isTesting = node.connectivityServerIDs.contains { module.testing.contains($0) } + Button(ConnectivityCopy.text(isTesting ? "测试中..." : "延迟测试")) { + module.test(node.connectivityServerIDs) + } + .disabled( + isTesting || !node.containsServerConfiguration || (!node.isGroup && module.isCooling(node.id)) + ) } }