diff options
author | Micah Lee <micah@micahflee.com> | 2020-12-01 22:21:25 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 22:21:25 -0800 |
commit | 5f612a94a0356b797a1811f3898e5b4345b6952d (patch) | |
tree | aa8e3a4184ae5361b5a7c0090f8a52a2b9a19e1b /desktop/src/onionshare/settings_dialog.py | |
parent | b0b552931ac371fe3f3dc1b2a69572009143e4c9 (diff) | |
parent | edaa8bd073382027bcb2042c4b14358c17c0a725 (diff) | |
download | onionshare-5f612a94a0356b797a1811f3898e5b4345b6952d.tar.gz onionshare-5f612a94a0356b797a1811f3898e5b4345b6952d.zip |
Merge pull request #1239 from micahflee/1214_onion_error_translations
Translate Tor-related error messages
Diffstat (limited to 'desktop/src/onionshare/settings_dialog.py')
-rw-r--r-- | desktop/src/onionshare/settings_dialog.py | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py index 40de8648..974b7008 100644 --- a/desktop/src/onionshare/settings_dialog.py +++ b/desktop/src/onionshare/settings_dialog.py @@ -27,11 +27,31 @@ import os from onionshare_cli import common from onionshare_cli.settings import Settings -from onionshare_cli.onion import * +from onionshare_cli.onion import ( + Onion, + TorErrorInvalidSetting, + TorErrorAutomatic, + TorErrorSocketPort, + TorErrorSocketFile, + TorErrorMissingPassword, + TorErrorUnreadableCookieFile, + TorErrorAuthError, + TorErrorProtocolError, + BundledTorTimeout, + BundledTorBroken, + TorTooOldEphemeral, + TorTooOldStealth, + PortNotAvailable, +) from . import strings from .widgets import Alert -from .update_checker import * +from .update_checker import ( + UpdateCheckerCheckError, + UpdateCheckerInvalidLatestVersion, + UpdateChecker, + UpdateThread, +) from .tor_connection_dialog import TorConnectionDialog from .gui_common import GuiCommon @@ -698,10 +718,18 @@ class SettingsDialog(QtWidgets.QDialog): TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, - BundledTorNotSupported, BundledTorTimeout, + BundledTorBroken, + TorTooOldEphemeral, + TorTooOldStealth, + PortNotAvailable, ) as e: - Alert(self.common, e.args[0], QtWidgets.QMessageBox.Warning) + message = self.common.gui.get_translated_tor_error(e) + Alert( + self.common, + message, + QtWidgets.QMessageBox.Warning, + ) if settings.get("connection_type") == "bundled": self.tor_status.hide() self._enable_buttons() |