diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index c993af9..2e29405 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -47,8 +47,8 @@ UPDATE_ERROR_MSG_INTRO = """\ UPDATE_ERROR_MSG_OUTRO = """\
You are strongly advised to visit our downloads page and check for new -updates manually, or consult our -wiki page for +updates manually, or consult +this webpage for common causes of errors. Alternatively, you can uncheck the "Check for updates" option in our menu, if you are in an air-gapped environment and have another way of learning about updates.
diff --git a/dangerzone/gui/updater.py b/dangerzone/gui/updater.py index 23bd3a5..e8ca367 100644 --- a/dangerzone/gui/updater.py +++ b/dangerzone/gui/updater.py @@ -28,17 +28,18 @@ log = logging.getLogger(__name__) MSG_CONFIRM_UPDATE_CHECKS = """\ -Do you want to be notified about new Dangerzone releases?
+Do you want to be notified about new Dangerzone releases?
-If "Yes", Dangerzone will check GitHub for new releases on startup. If -"No", Dangerzone will make no network requests and won't inform you about new -releases.
+If "Yes", Dangerzone will check the +latest releases page +in github.com on startup. If "No", Dangerzone will make no network requests and +won't inform you about new releases.
If you prefer another way of getting notified about new releases, we suggest adding to your RSS reader our Mastodon feed. For more information -about updates, check our -wiki page.
+about updates, check +this webpage. """ UPDATE_CHECK_COOLDOWN_SECS = 60 * 60 * 12 # Check for updates at most every 12 hours. @@ -214,12 +215,12 @@ class UpdaterThread(QtCore.QThread): res = requests.get(self.GH_RELEASE_URL, timeout=self.REQ_TIMEOUT) except Exception as e: raise RuntimeError( - f"Encountered an exception while querying {self.GH_RELEASE_URL}: {e}" + f"Encountered an exception while checking {self.GH_RELEASE_URL}: {e}" ) if res.status_code != 200: raise RuntimeError( - f"Encountered an HTTP {res.status_code} error while querying" + f"Encountered an HTTP {res.status_code} error while checking" f" {self.GH_RELEASE_URL}" ) diff --git a/tests/gui/test_updater.py b/tests/gui/test_updater.py index b26d61e..7231563 100644 --- a/tests/gui/test_updater.py +++ b/tests/gui/test_updater.py @@ -217,7 +217,7 @@ def test_update_checks( requests_mock.side_effect = Exception("failed") # type: ignore [attr-defined] report = updater.check_for_updates() error_msg = ( - f"Encountered an exception while querying {updater.GH_RELEASE_URL}: failed" + f"Encountered an exception while checking {updater.GH_RELEASE_URL}: failed" ) assert_report_equal(report, UpdateReport(error=error_msg)) @@ -297,7 +297,7 @@ def test_update_checks_cooldown(updater: UpdaterThread, mocker: MockerFixture) - assert cooldown_spy.spy_return == False assert updater.dangerzone.settings.get("updater_last_check") == curtime error_msg = ( - f"Encountered an exception while querying {updater.GH_RELEASE_URL}: failed" + f"Encountered an exception while checking {updater.GH_RELEASE_URL}: failed" ) assert_report_equal(report, UpdateReport(error=error_msg))