From 63717c06b0db84a3c363fad320c82c84514148f9 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 4 May 2021 10:04:33 +1000 Subject: [PATCH 1/2] Re-instate the locale key string error_tor_protocol_error, for surfacing Alert dialogs in the UI when Stem throws a ProtocolError back from Tor --- desktop/src/onionshare/resources/locale/en.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index a3489698..7a71e629 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -193,5 +193,6 @@ "settings_error_bundled_tor_broken": "OnionShare could not connect to Tor:\n{}", "gui_rendezvous_cleanup": "Waiting for Tor circuits to close to be sure your files have successfully transferred.\n\nThis might take a few minutes.", "gui_rendezvous_cleanup_quit_early": "Quit Early", - "error_port_not_available": "OnionShare port not available" -} \ No newline at end of file + "error_port_not_available": "OnionShare port not available", + "error_tor_protocol_error": "OnionShare experienced a protocol error with Tor:\n{}" +} From 9f40daef813dfcd9a419ed7a686795a576a19c1b Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 4 May 2021 10:12:15 +1000 Subject: [PATCH 2/2] Make the error_tor_protocol_error the same string that it used to be, so that translations are still correct --- desktop/src/onionshare/resources/locale/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index 7a71e629..7c74736a 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -194,5 +194,5 @@ "gui_rendezvous_cleanup": "Waiting for Tor circuits to close to be sure your files have successfully transferred.\n\nThis might take a few minutes.", "gui_rendezvous_cleanup_quit_early": "Quit Early", "error_port_not_available": "OnionShare port not available", - "error_tor_protocol_error": "OnionShare experienced a protocol error with Tor:\n{}" + "error_tor_protocol_error": "There was an error with Tor: {}" }