- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 41698: Reword the recommendation badges in about:addons
by ma1 (＠ma1) 11 Jul '23

11 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: a884f352 by hackademix at 2023-07-11T15:48:11+02:00 fixup! Bug 41698: Reword the recommendation badges in about:addons - - - - - 3 changed files: - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -52,6 +52,23 @@ export default class MozSupportLink extends HTMLAnchorElement { this.setAttribute("target", "_blank"); this.addEventListener("click", this); if (!this.getAttribute("data-l10n-id")) { + const fixupL10nId = this.getAttribute("data-basebrowser-l10n-fixup"); + if (fixupL10nId) { + document.l10n.formatValue(fixupL10nId).then(title => { + this.setAttribute("title", title); + // NOTE: Mozilla adds identical aria-label and title attributes. This is + // generally bad practice because this link has no text content, so the + // title alone will already act as the accessible name. + // Normally setting both aria-label and title will lead to the title being + // used as the accessible description, but since they are identical + // the LocalAccessible::Description method will make an exception and keep + // the description empty. + // Since this component is outside of our fork's control, we follow the + // same practice just in case Mozilla ever adds some text content. + this.setAttribute("aria-label", title); + }); + return; + } document.l10n.setAttributes(this, "moz-support-link-text"); } document.l10n.translateFragment(this); ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -359,6 +359,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-recommended" hidden > </a> @@ -376,6 +377,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-verified" hidden > </a> ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4220,29 +4220,6 @@ async function initialize() { ); } } - - // At the moment we need to do this, because Weblate still does not support - // attributes in Fluent. - const [recommended, verified] = await document.l10n.formatValues([ - { id: "basebrowser-addon-badge-recommended" }, - { id: "basebrowser-addon-badge-verified" }, - ]); - - importTemplate("card"); - _templates.card.content - .querySelector(".addon-badge-recommended") - .setAttribute("title", recommended); - _templates.card.content - .querySelector(".addon-badge-verified") - .setAttribute("title", verified); - - // We also update any template copy that has already been created. - for (const badge of document.querySelectorAll(".addon-badge-recommended")) { - badge.setAttribute("title", recommended); - } - for (const badge of document.querySelectorAll(".addon-badge-verified")) { - badge.setAttribute("title", verified); - } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a884f35… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a884f35… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 40069: Add helpers for message passing with extensions
by Pier Angelo Vendrame (＠pierov) 11 Jul '23

11 Jul '23

Pier Angelo Vendrame pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e431eb45 by Pier Angelo Vendrame at 2023-07-11T12:17:35+02:00 fixup! Bug 40069: Add helpers for message passing with extensions Bug 41877: Fix the NoScript message passing function - - - - - 1 changed file: - toolkit/components/extensions/ExtensionParent.sys.mjs Changes: ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2274,7 +2274,7 @@ async function torSendExtensionMessage(extensionId, message) { // pages listening to browser.runtime.onMessage. const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, - holder: new StructuredCloneHolder(message), + holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), firstResponse: true, sender: { id: extensionId, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e431eb4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e431eb4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40895: Update go_vendor_sha256sum for lyrebird in nightly
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: af4a370f by Nicolas Vigier at 2023-07-06T20:03:30+00:00 Bug 40895: Update go_vendor_sha256sum for lyrebird in nightly - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -17,7 +17,7 @@ targets: version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d + go_vendor_sha256sum: 8e9a5fd52f5a3a2b2b891389a224fcfc83b6c081658161bf40882b23fb58834c steps: build: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40894: Fix format of keyring/boklm.gpg
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: 16785a1b by Nicolas Vigier at 2023-07-06T19:52:01+00:00 Bug 40894: Fix format of keyring/boklm.gpg In #40871 I incorrectly set `keyring/boklm.gpg` in format `GPG keybox database version 1`, instead of `PGP/GPG key public ring (v4)`. This was fixed with: gpg --no-default-keyring --keyring ./keyring/boklm.gpg --export > ./keyring/boklm-2.gpg mv ./keyring/boklm-2.gpg ./keyring/boklm.gpg - - - - - 1 changed file: - keyring/boklm.gpg Changes: ===================================== keyring/boklm.gpg ===================================== Binary files a/keyring/boklm.gpg and b/keyring/boklm.gpg differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40894: Fix format of keyring/boklm.gpg
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6e2c33ed by Nicolas Vigier at 2023-07-04T12:11:47+02:00 Bug 40894: Fix format of keyring/boklm.gpg In #40871 I incorrectly set `keyring/boklm.gpg` in format `GPG keybox database version 1`, instead of `PGP/GPG key public ring (v4)`. This was fixed with: gpg --no-default-keyring --keyring ./keyring/boklm.gpg --export > ./keyring/boklm-2.gpg mv ./keyring/boklm-2.gpg ./keyring/boklm.gpg - - - - - 1 changed file: - keyring/boklm.gpg Changes: ===================================== keyring/boklm.gpg ===================================== Binary files a/keyring/boklm.gpg and b/keyring/boklm.gpg differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
by ma1 (＠ma1) 06 Jul '23

06 Jul '23

ma1 pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e4fae18a by hackademix at 2023-07-06T15:46:27+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 1 changed file: - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -1492,8 +1492,9 @@ class AddonOptions extends HTMLElement { el.disabled = false; el.hidden = false; document.l10n.setAttributes(el, "remove-addon-button"); - } else if (addon.isBuiltin) { - // Likely the built-in themes, can't be removed, that's fine. + } else if (true || addon.isBuiltin) { + // Just hide the uninstall button for any "special" add-on + // which can't be removed (tor-browser#41834) el.hidden = true; } else { // Likely sideloaded, mention that it can't be removed with a link. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4fae18… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4fae18… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
by ma1 (＠ma1) 06 Jul '23

06 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: b06f6190 by hackademix at 2023-07-06T00:10:24+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 1 changed file: - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -1492,8 +1492,9 @@ class AddonOptions extends HTMLElement { el.disabled = false; el.hidden = false; document.l10n.setAttributes(el, "remove-addon-button"); - } else if (addon.isBuiltin) { - // Likely the built-in themes, can't be removed, that's fine. + } else if (true || addon.isBuiltin) { + // Just hide the uninstall button for any "special" add-on + // which can't be removed (tor-browser#41834) el.hidden = true; } else { // Likely sideloaded, mention that it can't be removed with a link. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b06f619… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b06f619… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.0esrbase-13.0-1-build1
by richard (＠richard) 05 Jul '23

05 Jul '23

richard pushed new tag base-browser-115.0esrbase-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.0esrbase-13.0-1
by richard (＠richard) 05 Jul '23

05 Jul '23

richard pushed new branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Adding issue and merge request templates
by richard (＠richard) 05 Jul '23

05 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 33fdfcfc by Richard Pospesel at 2023-07-05T16:04:41+00:00 fixup! Adding issue and merge request templates - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -25,12 +25,34 @@ ### Merging - [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports -- [ ] Merge to `base-browser` -`!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports +- [ ] Merge to `base-browser` - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging ### Issue Tracking - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation -## Change Description - - \ No newline at end of file +### Review + +#### Request Reviewer + +- [ ] Request review from an applications developer depending on modified system: + - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer) + - **accessibility** : henry + - **android** : dan + - **build system** : boklm + - **extensions** : ma1 + - **firefox internals (XUL/JS/XPCOM)** : ma1 + - **fonts** : pierov + - **frontend (implementation)** : henry + - **frontend (review)** : donuts, richard + - **localization** : henry, pierov + - **nightly builds** : boklm + - **rebases/release-prep** : dan_b, ma1, pierov, richard + - **security** : ma1 + - **signing** : boklm, richard + - **updater** : pierov + - **misc/other** : pierov, richard + +#### Change Description + + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/33fdfcf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/33fdfcf… You're receiving this email because of your account on gitlab.torproject.org.

1 0