morgan pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 62bbac0a by Henry Wilkes at 2026-08-06T16:04:02+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 45059: Add "Advanced" connection settings to the config. - - - - - 8a72a606 by Henry Wilkes at 2026-08-06T16:04:02+00:00 fixup! Tor Browser strings TB 45059: Advanced connection setting strings. - - - - - e3be1a74 by Henry Wilkes at 2026-08-06T16:04:02+00:00 fixup! Tor Browser localization migration scripts. TB 45059: Add a string migration for the "Advanced" heading. - - - - - 4 changed files: - browser/components/preferences/preferences.js - browser/components/torpreferences/config/connection.mjs - toolkit/locales/en-US/toolkit/global/tor-browser.ftl - + tools/torbrowser/l10n/migrations/bug-45059-advanced-connection-settings.py Changes: ===================================== browser/components/preferences/preferences.js ===================================== @@ -271,7 +271,7 @@ const CONFIG_PANES = Object.freeze({ connection: { l10nId: "tor-connection-settings-pane", iconSrc: "chrome://browser/content/torconnect/tor-connect.svg", - groupIds: ["connectionStatus", "torBridges"], + groupIds: ["connectionStatus", "torBridges", "torAdvanced"], module: "chrome://browser/content/torpreferences/config/connection.mjs", visible: () => { return TorConnect.enabled; ===================================== browser/components/torpreferences/config/connection.mjs ===================================== @@ -192,6 +192,29 @@ SettingGroupManager.registerGroups({ }, ], }, + torAdvanced: { + inProgress: true, + l10nId: "tor-advanced-group", + headingLevel: 2, + items: [ + { + id: "torAdvancedGroup", + control: "moz-box-group", + items: [ + { + id: "torAdvancedConfigure", + l10nId: "tor-advanced-configure-button", + control: "moz-box-button", + }, + { + id: "torViewLog", + l10nId: "tor-view-log-button2", + control: "moz-box-button", + }, + ], + }, + ], + }, }); Preferences.addSetting({ @@ -561,3 +584,33 @@ Preferences.addSetting({ ); }, }); + +Preferences.addSetting({ + id: "torAdvancedGroup", +}); + +Preferences.addSetting({ + id: "torAdvancedConfigure", + deps: ["torSettingsReady"], + visible({ torSettingsReady }) { + // The dialog needs to be able to read TorSettings, so we keep this hidden + // until it is ready. + return torSettingsReady.value; + }, + onUserClick() { + window.gSubDialog.open( + "chrome://browser/content/torpreferences/connectionSettingsDialog.xhtml", + { features: "resizable=yes" } + ); + }, +}); + +Preferences.addSetting({ + id: "torViewLog", + onUserClick() { + window.gSubDialog.open( + "chrome://browser/content/torpreferences/torLogDialog.xhtml", + { features: "resizable=yes" } + ); + }, +}); ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -507,6 +507,13 @@ request-bridge-dialog-captcha-failed = The solution is not correct. Please try a ## Tor advanced settings. +tor-advanced-group = + .label = Advanced +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +tor-advanced-configure-button = + .label = Configure how { -brand-short-name } connects to the internet +tor-view-log-button2 = + .label = View the Tor log tor-advanced-settings-heading = Advanced tor-advanced-settings-description = Configure how { -brand-short-name } connects to the internet. # Button that opens the advanced connection settings dialog. ===================================== tools/torbrowser/l10n/migrations/bug-45059-advanced-connection-settings.py ===================================== @@ -0,0 +1,15 @@ +from fluent.migrate.helpers import transforms_from + + +def migrate(ctx): + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + transforms_from( + """ +tor-advanced-group = + .label = { COPY_PATTERN(path, "tor-advanced-settings-heading") } +""", + path="tor-browser.ftl", + ), + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0926955... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0926955... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
morgan (@morgan)