richard pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
0697c148
by Henry Wilkes at 2024-02-22T15:13:53+00:00
-
f2e7749d
by Henry Wilkes at 2024-02-22T15:13:54+00:00
5 changed files:
- browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js
- browser/components/torpreferences/content/connectionPane.js
- browser/components/torpreferences/content/provideBridgeDialog.js
- browser/components/torpreferences/content/provideBridgeDialog.xhtml
- browser/locales/en-US/browser/tor-browser.ftl
Changes:
| ... | ... | @@ -119,7 +119,7 @@ |
| 119 | 119 | doc.defaultView.console.error(`No emoji for index ${this.#index}`);
|
| 120 | 120 | emojiName = unknownString;
|
| 121 | 121 | }
|
| 122 | - doc.l10n.setAttributes(this, "tor-bridges-emoji-cell", {
|
|
| 122 | + doc.l10n.setAttributes(this.#img, "tor-bridges-emoji-image", {
|
|
| 123 | 123 | emojiName,
|
| 124 | 124 | });
|
| 125 | 125 | }
|
| ... | ... | @@ -253,19 +253,11 @@ const gBridgeGrid = { |
| 253 | 253 | */
|
| 254 | 254 | _rowTemplate: null,
|
| 255 | 255 | |
| 256 | - /**
|
|
| 257 | - * @typedef {object} EmojiCell
|
|
| 258 | - *
|
|
| 259 | - * @property {Element} cell - The grid cell element.
|
|
| 260 | - * @property {Element} img - The grid cell icon.
|
|
| 261 | - * @property {Element} index - The emoji index.
|
|
| 262 | - */
|
|
| 263 | 256 | /**
|
| 264 | 257 | * @typedef {object} BridgeGridRow
|
| 265 | 258 | *
|
| 266 | 259 | * @property {Element} element - The row element.
|
| 267 | 260 | * @property {Element} optionsButton - The options button.
|
| 268 | - * @property {EmojiCell[]} emojis - The emoji cells.
|
|
| 269 | 261 | * @property {Element} menu - The options menupopup.
|
| 270 | 262 | * @property {Element} statusEl - The bridge status element.
|
| 271 | 263 | * @property {Element} statusText - The status text.
|
| ... | ... | @@ -469,7 +469,7 @@ const gProvideBridgeDialog = { |
| 469 | 469 | for (const cell of BridgeEmoji.createForAddress(bridgeLine)) {
|
| 470 | 470 | // Each emoji is its own cell, we rely on the fact that createForAddress
|
| 471 | 471 | // always returns four elements.
|
| 472 | - cell.setAttribute("role", "gridcell");
|
|
| 472 | + cell.setAttribute("role", "cell");
|
|
| 473 | 473 | cell.classList.add("tor-bridges-grid-cell", "tor-bridges-emoji-cell");
|
| 474 | 474 | emojiBlock.append(cell);
|
| 475 | 475 | }
|
| ... | ... | @@ -75,13 +75,13 @@ |
| 75 | 75 | <html:div class="tor-bridges-grid-row" role="row">
|
| 76 | 76 | <html:span
|
| 77 | 77 | class="tor-bridges-type-cell tor-bridges-grid-cell"
|
| 78 | - role="gridcell"
|
|
| 78 | + role="cell"
|
|
| 79 | 79 | ></html:span>
|
| 80 | 80 | <html:span class="tor-bridges-emojis-block" role="none"></html:span>
|
| 81 | 81 | <html:span class="tor-bridges-grid-end-block" role="none">
|
| 82 | 82 | <html:span
|
| 83 | 83 | class="tor-bridges-address-cell tor-bridges-grid-cell"
|
| 84 | - role="gridcell"
|
|
| 84 | + role="cell"
|
|
| 85 | 85 | >
|
| 86 | 86 | <html:span class="tor-bridges-address-cell-text"></html:span>
|
| 87 | 87 | </html:span>
|
| ... | ... | @@ -84,12 +84,11 @@ tor-bridges-built-in-status-connected = Connected |
| 84 | 84 | tor-bridges-type-prefix = { $type } bridge:
|
| 85 | 85 | # Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla").
|
| 86 | 86 | tor-bridges-type-prefix-generic = Tor bridge:
|
| 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.
|
|
| 87 | +# Used for an image of a bridge emoji. Each bridge address can be hashed into four emojis shown to the user (bridgemoji feature). This string corresponds to a *single* such emoji. The "title" should just be emojiName. The "alt" should let screen readers know that the image is of a *single* emoji, as well as its name.
|
|
| 88 | 88 | # $emojiName (String) - The name of the emoji, already localized.
|
| 89 | -# E.g. with Orca screen reader in en-US this would read "unicorn. Row 2 Column 2. Emoji".
|
|
| 90 | -tor-bridges-emoji-cell =
|
|
| 89 | +tor-bridges-emoji-image =
|
|
| 90 | + .alt = Emoji: { $emojiName }
|
|
| 91 | 91 | .title = { $emojiName }
|
| 92 | - .aria-description = Emoji
|
|
| 93 | 92 | # The emoji name to show on hover when a bridge emoji's name is unknown.
|
| 94 | 93 | tor-bridges-emoji-unknown = Unknown
|
| 95 | 94 | # Shown when the bridge has been used for the most recent Tor circuit, i.e. the most recent bridge we have connected to.
|