morgan pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits: 75267441 by Henry Wilkes at 2025-03-25T12:23:59+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 43531: Use "label" attribute rather than textContent for the bridge dialog XUL buttons.

- - - - - e447eb0c by Henry Wilkes at 2025-03-25T12:23:59+00:00 fixup! Tor Browser strings

TB 43531: Use "label" attribute rather than textContent for the bridge dialog XUL buttons.

- - - - - 586046d7 by Henry Wilkes at 2025-03-25T12:23:59+00:00 fixup! Tor Browser localization migration scripts.

TB 43531: Convert bridge dialog button strings to use "label" attribute.

- - - - -

5 changed files:

- browser/components/torpreferences/content/builtinBridgeDialog.js - browser/components/torpreferences/content/provideBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.js - toolkit/locales/en-US/toolkit/global/tor-browser.ftl - + tools/torbrowser/l10n/migrations/bug-43531-bridge-dialog-buttons.py

Changes:

===================================== browser/components/torpreferences/content/builtinBridgeDialog.js ===================================== @@ -99,7 +99,7 @@ const gBuiltinBridgeDialog = { this._result.connect = connect; this._acceptButton.setAttribute( "data-l10n-id", - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept" + connect ? "bridge-dialog-button-connect2" : "bridge-dialog-button-accept2" ); this._acceptButton.classList.toggle("tor-button", connect); },

===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -192,7 +192,9 @@ const gProvideBridgeDialog = { connect = TorConnect.stageName !== TorConnectStage.Bootstrapped; this._acceptButton.setAttribute( "data-l10n-id", - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept" + connect + ? "bridge-dialog-button-connect2" + : "bridge-dialog-button-accept2" ); } this._result.connect = connect;

===================================== browser/components/torpreferences/content/requestBridgeDialog.js ===================================== @@ -105,7 +105,7 @@ const gRequestBridgeDialog = { this._result.connect = connect; this._submitButton.setAttribute( "data-l10n-id", - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-submit" + connect ? "bridge-dialog-button-connect2" : "bridge-dialog-button-submit2" ); this._submitButton.classList.toggle("tor-button", connect); },

===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -307,9 +307,12 @@ bridge-qr-dialog-title =

## Common button used in bridge dialogs.

-bridge-dialog-button-connect = Connect -bridge-dialog-button-accept = OK -bridge-dialog-button-submit = Submit +bridge-dialog-button-connect2 = + .label = Connect +bridge-dialog-button-accept2 = + .label = OK +bridge-dialog-button-submit2 = + .label = Submit

## User provided bridge dialog.

===================================== tools/torbrowser/l10n/migrations/bug-43531-bridge-dialog-buttons.py ===================================== @@ -0,0 +1,27 @@ +from fluent.migrate.helpers import transforms_from + + +def migrate(ctx): + # Convert + # + # my-button = MY TEXT + # + # to + # + # my-button2 = + # .label = MY TEXT + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + transforms_from( + """ +bridge-dialog-button-connect2 = + .label = { COPY_PATTERN(path, "bridge-dialog-button-connect") } +bridge-dialog-button-accept2 = + .label = { COPY_PATTERN(path, "bridge-dialog-button-accept") } +bridge-dialog-button-submit2 = + .label = { COPY_PATTERN(path, "bridge-dialog-button-submit") } +""", + path="tor-browser.ftl", + ), + )

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/aed6314...