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
-
e447eb0c
by Henry Wilkes at 2025-03-25T12:23:59+00:00
-
586046d7
by Henry Wilkes at 2025-03-25T12:23:59+00:00
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:
| ... | ... | @@ -99,7 +99,7 @@ const gBuiltinBridgeDialog = { |
| 99 | 99 | this._result.connect = connect;
|
| 100 | 100 | this._acceptButton.setAttribute(
|
| 101 | 101 | "data-l10n-id",
|
| 102 | - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept"
|
|
| 102 | + connect ? "bridge-dialog-button-connect2" : "bridge-dialog-button-accept2"
|
|
| 103 | 103 | );
|
| 104 | 104 | this._acceptButton.classList.toggle("tor-button", connect);
|
| 105 | 105 | },
|
| ... | ... | @@ -192,7 +192,9 @@ const gProvideBridgeDialog = { |
| 192 | 192 | connect = TorConnect.stageName !== TorConnectStage.Bootstrapped;
|
| 193 | 193 | this._acceptButton.setAttribute(
|
| 194 | 194 | "data-l10n-id",
|
| 195 | - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept"
|
|
| 195 | + connect
|
|
| 196 | + ? "bridge-dialog-button-connect2"
|
|
| 197 | + : "bridge-dialog-button-accept2"
|
|
| 196 | 198 | );
|
| 197 | 199 | }
|
| 198 | 200 | this._result.connect = connect;
|
| ... | ... | @@ -105,7 +105,7 @@ const gRequestBridgeDialog = { |
| 105 | 105 | this._result.connect = connect;
|
| 106 | 106 | this._submitButton.setAttribute(
|
| 107 | 107 | "data-l10n-id",
|
| 108 | - connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-submit"
|
|
| 108 | + connect ? "bridge-dialog-button-connect2" : "bridge-dialog-button-submit2"
|
|
| 109 | 109 | );
|
| 110 | 110 | this._submitButton.classList.toggle("tor-button", connect);
|
| 111 | 111 | },
|
| ... | ... | @@ -307,9 +307,12 @@ bridge-qr-dialog-title = |
| 307 | 307 | |
| 308 | 308 | ## Common button used in bridge dialogs.
|
| 309 | 309 | |
| 310 | -bridge-dialog-button-connect = Connect
|
|
| 311 | -bridge-dialog-button-accept = OK
|
|
| 312 | -bridge-dialog-button-submit = Submit
|
|
| 310 | +bridge-dialog-button-connect2 =
|
|
| 311 | + .label = Connect
|
|
| 312 | +bridge-dialog-button-accept2 =
|
|
| 313 | + .label = OK
|
|
| 314 | +bridge-dialog-button-submit2 =
|
|
| 315 | + .label = Submit
|
|
| 313 | 316 | |
| 314 | 317 | ## User provided bridge dialog.
|
| 315 | 318 |
| 1 | +from fluent.migrate.helpers import transforms_from
|
|
| 2 | + |
|
| 3 | + |
|
| 4 | +def migrate(ctx):
|
|
| 5 | + # Convert
|
|
| 6 | + #
|
|
| 7 | + # my-button = MY TEXT
|
|
| 8 | + #
|
|
| 9 | + # to
|
|
| 10 | + #
|
|
| 11 | + # my-button2 =
|
|
| 12 | + # .label = MY TEXT
|
|
| 13 | + ctx.add_transforms(
|
|
| 14 | + "tor-browser.ftl",
|
|
| 15 | + "tor-browser.ftl",
|
|
| 16 | + transforms_from(
|
|
| 17 | + """
|
|
| 18 | +bridge-dialog-button-connect2 =
|
|
| 19 | + .label = { COPY_PATTERN(path, "bridge-dialog-button-connect") }
|
|
| 20 | +bridge-dialog-button-accept2 =
|
|
| 21 | + .label = { COPY_PATTERN(path, "bridge-dialog-button-accept") }
|
|
| 22 | +bridge-dialog-button-submit2 =
|
|
| 23 | + .label = { COPY_PATTERN(path, "bridge-dialog-button-submit") }
|
|
| 24 | +""",
|
|
| 25 | + path="tor-browser.ftl",
|
|
| 26 | + ),
|
|
| 27 | + ) |