[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-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...

Title: GitLab

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:

Changes:

  • browser/components/torpreferences/content/connectionPane.js
    ... ... @@ -665,12 +665,15 @@ const gBridgeGrid = {
    665 665 
           row.cells.push({ element, focusEl, columnIndex, row });
    666 666 
         }
    667 667
    668 
    -    // TODO: properly handle "vanilla" bridges?
    669 
    -    document.l10n.setAttributes(
    670 
    -      row.element.querySelector(".tor-bridges-type-cell"),
    671 
    -      "tor-bridges-type-prefix",
    672 
    -      { type: details?.transport ?? "vanilla" }
    673 
    -    );
    668 
    +    const transport = details?.transport ?? "vanilla";
    669 
    +    const typeCell = row.element.querySelector(".tor-bridges-type-cell");
    670 
    +    if (transport === "vanilla") {
    671 
    +      document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix-generic");
    672 
    +    } else {
    673 
    +      document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", {
    674 
    +        type: transport,
    675 
    +      });
    676 
    +    }
    674 677
    675 678 
         row.element.querySelector(".tor-bridges-address-cell").textContent =
    676 679 
           bridgeLine;

  • browser/components/torpreferences/content/provideBridgeDialog.js
    ... ... @@ -474,12 +474,18 @@ const gProvideBridgeDialog = {
    474 474 
             emojiBlock.append(cell);
    475 475 
           }
    476 476
    477 
    -      // TODO: properly handle "vanilla" bridges?
    478 
    -      document.l10n.setAttributes(
    479 
    -        rowEl.querySelector(".tor-bridges-type-cell"),
    480 
    -        "tor-bridges-type-prefix",
    481 
    -        { type: details?.transport ?? "vanilla" }
    482 
    -      );
    477 
    +      const transport = details?.transport ?? "vanilla";
    478 
    +      const typeCell = rowEl.querySelector(".tor-bridges-type-cell");
    479 
    +      if (transport === "vanilla") {
    480 
    +        document.l10n.setAttributes(
    481 
    +          typeCell,
    482 
    +          "tor-bridges-type-prefix-generic"
    483 
    +        );
    484 
    +      } else {
    485 
    +        document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", {
    486 
    +          type: transport,
    487 
    +        });
    488 
    +      }
    483 489
    484 490 
           rowEl.querySelector(".tor-bridges-address-cell").textContent = bridgeLine;
    485 491

  • browser/locales/en-US/browser/tor-browser.ftl
    ... ... @@ -82,6 +82,8 @@ tor-bridges-built-in-status-connected = Connected
    82 82 
     # Shown at the start of a Tor bridge line.
    83 83 
     # $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek-azure").
    84 84 
     tor-bridges-type-prefix = { $type } bridge:
    85 
    +# Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla").
    86 
    +tor-bridges-type-prefix-generic = Tor bridge:
    85 87 
     # 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.
    86 88 
     # $emojiName (String) - The name of the emoji, already localized.
    87 89 
     # E.g. with Orca screen reader in en-US this would read "unicorn. Row 2 Column 2. Emoji".

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits