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
-
8a72a606
by Henry Wilkes at 2026-08-06T16:04:02+00:00
-
e3be1a74
by Henry Wilkes at 2026-08-06T16:04:02+00:00
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:
| ... | ... | @@ -271,7 +271,7 @@ const CONFIG_PANES = Object.freeze({ |
| 271 | 271 | connection: {
|
| 272 | 272 | l10nId: "tor-connection-settings-pane",
|
| 273 | 273 | iconSrc: "chrome://browser/content/torconnect/tor-connect.svg",
|
| 274 | - groupIds: ["connectionStatus", "torBridges"],
|
|
| 274 | + groupIds: ["connectionStatus", "torBridges", "torAdvanced"],
|
|
| 275 | 275 | module: "chrome://browser/content/torpreferences/config/connection.mjs",
|
| 276 | 276 | visible: () => {
|
| 277 | 277 | return TorConnect.enabled;
|
| ... | ... | @@ -192,6 +192,29 @@ SettingGroupManager.registerGroups({ |
| 192 | 192 | },
|
| 193 | 193 | ],
|
| 194 | 194 | },
|
| 195 | + torAdvanced: {
|
|
| 196 | + inProgress: true,
|
|
| 197 | + l10nId: "tor-advanced-group",
|
|
| 198 | + headingLevel: 2,
|
|
| 199 | + items: [
|
|
| 200 | + {
|
|
| 201 | + id: "torAdvancedGroup",
|
|
| 202 | + control: "moz-box-group",
|
|
| 203 | + items: [
|
|
| 204 | + {
|
|
| 205 | + id: "torAdvancedConfigure",
|
|
| 206 | + l10nId: "tor-advanced-configure-button",
|
|
| 207 | + control: "moz-box-button",
|
|
| 208 | + },
|
|
| 209 | + {
|
|
| 210 | + id: "torViewLog",
|
|
| 211 | + l10nId: "tor-view-log-button2",
|
|
| 212 | + control: "moz-box-button",
|
|
| 213 | + },
|
|
| 214 | + ],
|
|
| 215 | + },
|
|
| 216 | + ],
|
|
| 217 | + },
|
|
| 195 | 218 | });
|
| 196 | 219 | |
| 197 | 220 | Preferences.addSetting({
|
| ... | ... | @@ -561,3 +584,33 @@ Preferences.addSetting({ |
| 561 | 584 | );
|
| 562 | 585 | },
|
| 563 | 586 | });
|
| 587 | + |
|
| 588 | +Preferences.addSetting({
|
|
| 589 | + id: "torAdvancedGroup",
|
|
| 590 | +});
|
|
| 591 | + |
|
| 592 | +Preferences.addSetting({
|
|
| 593 | + id: "torAdvancedConfigure",
|
|
| 594 | + deps: ["torSettingsReady"],
|
|
| 595 | + visible({ torSettingsReady }) {
|
|
| 596 | + // The dialog needs to be able to read TorSettings, so we keep this hidden
|
|
| 597 | + // until it is ready.
|
|
| 598 | + return torSettingsReady.value;
|
|
| 599 | + },
|
|
| 600 | + onUserClick() {
|
|
| 601 | + window.gSubDialog.open(
|
|
| 602 | + "chrome://browser/content/torpreferences/connectionSettingsDialog.xhtml",
|
|
| 603 | + { features: "resizable=yes" }
|
|
| 604 | + );
|
|
| 605 | + },
|
|
| 606 | +});
|
|
| 607 | + |
|
| 608 | +Preferences.addSetting({
|
|
| 609 | + id: "torViewLog",
|
|
| 610 | + onUserClick() {
|
|
| 611 | + window.gSubDialog.open(
|
|
| 612 | + "chrome://browser/content/torpreferences/torLogDialog.xhtml",
|
|
| 613 | + { features: "resizable=yes" }
|
|
| 614 | + );
|
|
| 615 | + },
|
|
| 616 | +}); |
| ... | ... | @@ -507,6 +507,13 @@ request-bridge-dialog-captcha-failed = The solution is not correct. Please try a |
| 507 | 507 | |
| 508 | 508 | ## Tor advanced settings.
|
| 509 | 509 | |
| 510 | +tor-advanced-group =
|
|
| 511 | + .label = Advanced
|
|
| 512 | +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
|
|
| 513 | +tor-advanced-configure-button =
|
|
| 514 | + .label = Configure how { -brand-short-name } connects to the internet
|
|
| 515 | +tor-view-log-button2 =
|
|
| 516 | + .label = View the Tor log
|
|
| 510 | 517 | tor-advanced-settings-heading = Advanced
|
| 511 | 518 | tor-advanced-settings-description = Configure how { -brand-short-name } connects to the internet.
|
| 512 | 519 | # Button that opens the advanced connection settings dialog.
|
| 1 | +from fluent.migrate.helpers import transforms_from
|
|
| 2 | + |
|
| 3 | + |
|
| 4 | +def migrate(ctx):
|
|
| 5 | + ctx.add_transforms(
|
|
| 6 | + "tor-browser.ftl",
|
|
| 7 | + "tor-browser.ftl",
|
|
| 8 | + transforms_from(
|
|
| 9 | + """
|
|
| 10 | +tor-advanced-group =
|
|
| 11 | + .label = { COPY_PATTERN(path, "tor-advanced-settings-heading") }
|
|
| 12 | +""",
|
|
| 13 | + path="tor-browser.ftl",
|
|
| 14 | + ),
|
|
| 15 | + ) |