[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...

[richard (@richard)]

richard pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
9419bbc3 by Henry Wilkes at 2024-02-07T12:54:41+00:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 41814: Use "Tor bridge" instead of "vanilla bridge".

- - - - -
b90988c5 by Henry Wilkes at 2024-02-07T12:54:41+00:00
fixup! Tor Browser strings

Bug 41814: Use "Tor bridge" instead of "vanilla bridge".

- - - - -


3 changed files:

- browser/components/torpreferences/content/connectionPane.js
- browser/components/torpreferences/content/provideBridgeDialog.js
- browser/locales/en-US/browser/tor-browser.ftl


Changes:

=====================================
browser/components/torpreferences/content/connectionPane.js
=====================================
@@ -665,12 +665,15 @@ const gBridgeGrid = {
       row.cells.push({ element, focusEl, columnIndex, row });
     }
 
-    // TODO: properly handle "vanilla" bridges?
-    document.l10n.setAttributes(
-      row.element.querySelector(".tor-bridges-type-cell"),
-      "tor-bridges-type-prefix",
-      { type: details?.transport ?? "vanilla" }
-    );
+    const transport = details?.transport ?? "vanilla";
+    const typeCell = row.element.querySelector(".tor-bridges-type-cell");
+    if (transport === "vanilla") {
+      document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix-generic");
+    } else {
+      document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", {
+        type: transport,
+      });
+    }
 
     row.element.querySelector(".tor-bridges-address-cell").textContent =
       bridgeLine;


=====================================
browser/components/torpreferences/content/provideBridgeDialog.js
=====================================
@@ -474,12 +474,18 @@ const gProvideBridgeDialog = {
         emojiBlock.append(cell);
       }
 
-      // TODO: properly handle "vanilla" bridges?
-      document.l10n.setAttributes(
-        rowEl.querySelector(".tor-bridges-type-cell"),
-        "tor-bridges-type-prefix",
-        { type: details?.transport ?? "vanilla" }
-      );
+      const transport = details?.transport ?? "vanilla";
+      const typeCell = rowEl.querySelector(".tor-bridges-type-cell");
+      if (transport === "vanilla") {
+        document.l10n.setAttributes(
+          typeCell,
+          "tor-bridges-type-prefix-generic"
+        );
+      } else {
+        document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", {
+          type: transport,
+        });
+      }
 
       rowEl.querySelector(".tor-bridges-address-cell").textContent = bridgeLine;
 


=====================================
browser/locales/en-US/browser/tor-browser.ftl
=====================================
@@ -82,6 +82,8 @@ tor-bridges-built-in-status-connected = Connected
 # Shown at the start of a Tor bridge line.
 # $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek-azure").
 tor-bridges-type-prefix = { $type } bridge:
+# Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla").
+tor-bridges-type-prefix-generic = Tor bridge:
 # The name and accessible description for a bridge emoji cell. Each bridge address can be hashed into four emojis shown to the user (bridgemoji feature). This cell corresponds to a *single* such emoji. The "title" should just be emojiName. The "aria-description" should give screen reader users enough of a hint that the cell contains a single emoji.
 # $emojiName (String) - The name of the emoji, already localized.
 # E.g. with Orca screen reader in en-US this would read "unicorn. Row 2 Column 2. Emoji".



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8f90f9f394d8ffd5b92649ca2f6fac319098c2f...b90988c518229003bce01357784498a14822aee7
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240207/3b67c19a/attachment-0001.htm>