- tbb-commits - lists.torproject.org

[Git][tpo/applications/torbrowser-launcher][main] Update git repository URL (#7)
by boklm (＠boklm) 24 Nov '23

24 Nov '23

boklm pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: e1e16dbb by Nicolas Vigier at 2023-11-23T16:36:58+01:00 Update git repository URL (#7) - - - - - 8 changed files: - .github/ISSUE_TEMPLATE/bug_report.md - README.md - setup.py - torbrowser-launcher - torbrowser_launcher/__init__.py - torbrowser_launcher/common.py - torbrowser_launcher/launcher.py - torbrowser_launcher/settings.py Changes: ===================================== .github/ISSUE_TEMPLATE/bug_report.md ===================================== @@ -7,5 +7,5 @@ assignees: '' --- -_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://github.com/micahflee/torbrowser-launcher/releases). Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._ +_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://gitlab.torproject.org/tpo/applications/torbrowser-launcher…. Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._ - [ ] I am using the latest version and the problem persists. ===================================== README.md ===================================== @@ -1,6 +1,6 @@ # Tor Browser Launcher -_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://github.com/micahflee/torbrowser-launcher/releases). Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._ +_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://gitlab.torproject.org/tpo/applications/torbrowser-launcher…. Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._ Tor Browser Launcher is intended to make Tor Browser easier to install and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else: ===================================== setup.py ===================================== @@ -1,6 +1,6 @@ """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2017 Micah Lee <micah(a)micahflee.com> @@ -100,7 +100,7 @@ setup( version=version, author="Micah Lee", author_email="micah(a)micahflee.com", - url="https://www.github.com/micahflee/torbrowser-launcher", + url="https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/", platforms=["GNU/Linux"], license="MIT", description="A program to help you securely download and run Tor Browser", ===================================== torbrowser-launcher ===================================== @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2017 Micah Lee <micah(a)micahflee.com> ===================================== torbrowser_launcher/__init__.py ===================================== @@ -1,6 +1,6 @@ """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2021 Micah Lee <micah(a)micahflee.com> @@ -71,7 +71,7 @@ def main(): print(_("Tor Browser Launcher")) print(_("By Micah Lee, licensed under MIT")) print(_("version {0}").format(tor_browser_launcher_version)) - print("https://github.com/micahflee/torbrowser-launcher") + print("https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/") common = Common(tor_browser_launcher_version) app = Application() ===================================== torbrowser_launcher/common.py ===================================== @@ -1,6 +1,6 @@ """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2021 Micah Lee <micah(a)micahflee.com> ===================================== torbrowser_launcher/launcher.py ===================================== @@ -1,6 +1,6 @@ """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2021 Micah Lee <micah(a)micahflee.com> @@ -407,7 +407,7 @@ class Launcher(QtWidgets.QMainWindow): "A copy of the Tor Browser files you downloaded have been saved here:\n" "{1}\n{2}\n\n" "Click Start to refresh the keyring and try again. If the message persists report the above " - "error code here:\nhttps://github.com/micahflee/torbrowser-launcher/issues" + "error code here:\nhttps://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-…" ) sigerror = sigerror.format( message, backup_tarball_filename, backup_sig_filename ===================================== torbrowser_launcher/settings.py ===================================== @@ -1,6 +1,6 @@ """ Tor Browser Launcher -https://github.com/micahflee/torbrowser-launcher/ +https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/ Copyright (c) 2013-2021 Micah Lee <micah(a)micahflee.com> View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Update rbm for rbm#40063 and rbm#40064
by boklm (＠boklm) 24 Nov '23

24 Nov '23

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: b2b814be by Nicolas Vigier at 2023-11-24T10:18:16+01:00 Update rbm for rbm#40063 and rbm#40064 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 0a47c75f7b9b3c6ccc4086b44336be0b85e5fbef +Subproject commit 40acf540fe75055df2eb78454f070f57d0804729 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40063 and rbm#40064
by boklm (＠boklm) 24 Nov '23

24 Nov '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: feaeac7c by Nicolas Vigier at 2023-11-24T10:17:23+01:00 Update rbm for rbm#40063 and rbm#40064 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 0a47c75f7b9b3c6ccc4086b44336be0b85e5fbef +Subproject commit 40acf540fe75055df2eb78454f070f57d0804729 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.0.5
by richard (＠richard) 23 Nov '23

23 Nov '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: fd3d77de by Richard Pospesel at 2023-11-23T11:27:02+00:00 release: new version, 13.0.5 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.5.6-13.0.4-linux-i686-ALL.xml - − update_3/release/12.5.6-13.0.4-linux-x86_64-ALL.xml - − update_3/release/12.5.6-13.0.4-macos-ALL.xml - − update_3/release/12.5.6-13.0.4-windows-i686-ALL.xml - − update_3/release/12.5.6-13.0.4-windows-x86_64-ALL.xml - − update_3/release/13.0-13.0.4-linux-i686-ALL.xml - − update_3/release/13.0-13.0.4-linux-x86_64-ALL.xml - − update_3/release/13.0-13.0.4-macos-ALL.xml - − update_3/release/13.0-13.0.4-windows-i686-ALL.xml - − update_3/release/13.0-13.0.4-windows-x86_64-ALL.xml - + update_3/release/13.0-13.0.5-linux-i686-ALL.xml - + update_3/release/13.0-13.0.5-linux-x86_64-ALL.xml - + update_3/release/13.0-13.0.5-macos-ALL.xml - + update_3/release/13.0-13.0.5-windows-i686-ALL.xml - + update_3/release/13.0-13.0.5-windows-x86_64-ALL.xml - − update_3/release/13.0.1-13.0.4-linux-i686-ALL.xml - − update_3/release/13.0.1-13.0.4-linux-x86_64-ALL.xml - − update_3/release/13.0.1-13.0.4-macos-ALL.xml - − update_3/release/13.0.1-13.0.4-windows-i686-ALL.xml - − update_3/release/13.0.1-13.0.4-windows-x86_64-ALL.xml - + update_3/release/13.0.1-13.0.5-linux-i686-ALL.xml - + update_3/release/13.0.1-13.0.5-linux-x86_64-ALL.xml - + update_3/release/13.0.1-13.0.5-macos-ALL.xml - + update_3/release/13.0.1-13.0.5-windows-i686-ALL.xml - + update_3/release/13.0.1-13.0.5-windows-x86_64-ALL.xml - + update_3/release/13.0.4-13.0.5-linux-i686-ALL.xml - + update_3/release/13.0.4-13.0.5-linux-x86_64-ALL.xml - + update_3/release/13.0.4-13.0.5-macos-ALL.xml - + update_3/release/13.0.4-13.0.5-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0.5-build1
by richard (＠richard) 23 Nov '23

23 Nov '23

richard pushed new tag tbb-13.0.5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41025: Prepare Tor Browser 13.0.5 (Desktop)
by richard (＠richard) 23 Nov '23

23 Nov '23

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 4c7ebe30 by Richard Pospesel at 2023-11-22T19:43:59+00:00 Bug 41025: Prepare Tor Browser 13.0.5 (Desktop) - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,12 @@ +Tor Browser 13.0.5 - November 22 2023 + * Windows + macOS + Linux + * Bug 42072: YEC 2023 Takeover for Desktop Stable [tor-browser] + * Build System + * All Platforms + * Bug 40970: Missing symlink create-blog-post.torbrowser -> create-blog-post symlink [tor-browser-build] + * Bug 41023: Update lead.png symlink and blog post template in tools/signing/create-blog-post [tor-browser-build] + * Bug 40063: RBM's chroot fails in Fedora [rbm] + Tor Browser 13.0.4 - November 16 2023 * All Platforms * Updated OpenSSL to 3.0.12 ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.0' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 2 + browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 6c729dc25d135186cb0a827eef328f3f52121117 + git_hash: ebcf66a4a8f8d0801234203d8e2b8d46744f6c2f targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 51bc53e707a51e9e68fc7e7febdc81560a088234 + git_hash: 94f2dbd69095270431df2d44f5573fc9c68ad240 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: a28f99595d0971b25912eb63152244cb9f2759d6 + git_hash: dfe9edb319cdaf311c11103f3a0efa44ebc95cb4 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -81,12 +81,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0.4' + torbrowser_version: '13.0.5' torbrowser_build: 'build1' torbrowser_incremental_from: + - '13.0.4' - '13.0.1' - '13.0' - - '12.5.6' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.5.0esr-13.5-1] Bug 42288: Allow language spoofing in status messages.
by ma1 (＠ma1) 22 Nov '23

22 Nov '23

ma1 pushed to branch mullvad-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 8dcf43a2 by hackademix at 2023-11-22T23:16:27+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 8 changed files: - browser/installer/package-manifest.in - dom/locales/moz.build - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - mobile/android/installer/package-manifest.in - uriloader/base/nsDocLoader.cpp Changes: ===================================== browser/installer/package-manifest.in ===================================== @@ -319,6 +319,7 @@ @RESPATH@/res/locale/layout/HtmlForm.properties @RESPATH@/res/locale/layout/MediaDocument.properties @RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/xslt/xslt.properties @RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ ===================================== dom/locales/moz.build ===================================== @@ -57,6 +57,10 @@ RESOURCE_FILES.locale.layout += [ "en-US/chrome/layout/xmlparser.properties", ] +RESOURCE_FILES.locale.xslt += [ + "en-US/chrome/xslt/xslt.properties", +] + RESOURCE_FILES.locale.dom += [ "en-US/chrome/dom/dom.properties", ] ===================================== dom/xslt/xslt/txMozillaXSLTProcessor.cpp ===================================== @@ -942,11 +942,17 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult, mozilla::components::StringBundle::Service(); if (sbs) { nsString errorText; - sbs->FormatStatusMessage(aResult, u"", errorText); + bool spoofLocale = nsContentUtils::SpoofLocaleEnglish(); + if (spoofLocale && mSource) { + Document* sourceDoc = mSource->OwnerDoc(); + spoofLocale = !(sourceDoc && sourceDoc->AllowsL10n()); + } + sbs->FormatStatusMessage(aResult, u"", spoofLocale, errorText); nsAutoString errorMessage; nsCOMPtr<nsIStringBundle> bundle; - sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + sbs->CreateBundle(spoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); if (bundle) { AutoTArray<nsString, 1> error = {errorText}; ===================================== dom/xslt/xslt/txXSLTMsgsURL.h ===================================== @@ -7,5 +7,6 @@ #define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ #define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties" +#define XSLT_MSGS_URL_en_US "resource://gre/res/locale/xslt/xslt.properties" #endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ ===================================== intl/strres/nsIStringBundle.idl ===================================== @@ -86,9 +86,13 @@ interface nsIStringBundleService : nsISupports * used in the string lookup process. * @param aStatusArg - The status message argument(s). Multiple arguments * can be separated by newline ('\n') characters. + * @param aSpoofLocale - If true (default is false), forces the en-US + locale on content-accessible messages (XSLT errors so far). * @return the formatted message */ - AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg); + AString formatStatusMessage(in nsresult aStatus, + in wstring aStatusArg, + [optional] in boolean aSpoofLocale); /** * flushes the string bundle cache - useful when the locale changes or ===================================== intl/strres/nsStringBundle.cpp ===================================== @@ -977,6 +977,7 @@ nsresult nsStringBundleService::FormatWithBundle( NS_IMETHODIMP nsStringBundleService::FormatStatusMessage(nsresult aStatus, const char16_t* aStatusArg, + bool aSpoofLocale, nsAString& result) { uint32_t i, argCount = 0; nsCOMPtr<nsIStringBundle> bundle; @@ -1012,7 +1013,8 @@ nsStringBundleService::FormatStatusMessage(nsresult aStatus, switch (NS_ERROR_GET_MODULE(aStatus)) { case NS_ERROR_MODULE_XSLT: - getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + getStringBundle(aSpoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); break; case NS_ERROR_MODULE_NETWORK: getStringBundle(NECKO_MSGS_URL, getter_AddRefs(bundle)); ===================================== mobile/android/installer/package-manifest.in ===================================== @@ -181,6 +181,7 @@ @BINPATH@/res/locale/layout/HtmlForm.properties @BINPATH@/res/locale/layout/MediaDocument.properties @BINPATH@/res/locale/layout/xmlparser.properties +@BINPATH@/res/locale/xslt/xslt.properties @BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS ===================================== uriloader/base/nsDocLoader.cpp ===================================== @@ -1230,7 +1230,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsresult aStatus, mozilla::components::StringBundle::Service(); if (!sbs) return NS_ERROR_FAILURE; nsAutoString msg; - nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, msg); + nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, false, msg); if (NS_FAILED(rv)) return rv; // Keep around the message. In case a request finishes, we need to make sure View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.5.0esr-13.5-1] Bug 42288: Allow language spoofing in status messages.
by ma1 (＠ma1) 22 Nov '23

22 Nov '23

ma1 pushed to branch base-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4098cfce by hackademix at 2023-11-22T23:14:15+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 8 changed files: - browser/installer/package-manifest.in - dom/locales/moz.build - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - mobile/android/installer/package-manifest.in - uriloader/base/nsDocLoader.cpp Changes: ===================================== browser/installer/package-manifest.in ===================================== @@ -318,6 +318,7 @@ @RESPATH@/res/locale/layout/HtmlForm.properties @RESPATH@/res/locale/layout/MediaDocument.properties @RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/xslt/xslt.properties @RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ ===================================== dom/locales/moz.build ===================================== @@ -57,6 +57,10 @@ RESOURCE_FILES.locale.layout += [ "en-US/chrome/layout/xmlparser.properties", ] +RESOURCE_FILES.locale.xslt += [ + "en-US/chrome/xslt/xslt.properties", +] + RESOURCE_FILES.locale.dom += [ "en-US/chrome/dom/dom.properties", ] ===================================== dom/xslt/xslt/txMozillaXSLTProcessor.cpp ===================================== @@ -942,11 +942,17 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult, mozilla::components::StringBundle::Service(); if (sbs) { nsString errorText; - sbs->FormatStatusMessage(aResult, u"", errorText); + bool spoofLocale = nsContentUtils::SpoofLocaleEnglish(); + if (spoofLocale && mSource) { + Document* sourceDoc = mSource->OwnerDoc(); + spoofLocale = !(sourceDoc && sourceDoc->AllowsL10n()); + } + sbs->FormatStatusMessage(aResult, u"", spoofLocale, errorText); nsAutoString errorMessage; nsCOMPtr<nsIStringBundle> bundle; - sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + sbs->CreateBundle(spoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); if (bundle) { AutoTArray<nsString, 1> error = {errorText}; ===================================== dom/xslt/xslt/txXSLTMsgsURL.h ===================================== @@ -7,5 +7,6 @@ #define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ #define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties" +#define XSLT_MSGS_URL_en_US "resource://gre/res/locale/xslt/xslt.properties" #endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ ===================================== intl/strres/nsIStringBundle.idl ===================================== @@ -86,9 +86,13 @@ interface nsIStringBundleService : nsISupports * used in the string lookup process. * @param aStatusArg - The status message argument(s). Multiple arguments * can be separated by newline ('\n') characters. + * @param aSpoofLocale - If true (default is false), forces the en-US + locale on content-accessible messages (XSLT errors so far). * @return the formatted message */ - AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg); + AString formatStatusMessage(in nsresult aStatus, + in wstring aStatusArg, + [optional] in boolean aSpoofLocale); /** * flushes the string bundle cache - useful when the locale changes or ===================================== intl/strres/nsStringBundle.cpp ===================================== @@ -977,6 +977,7 @@ nsresult nsStringBundleService::FormatWithBundle( NS_IMETHODIMP nsStringBundleService::FormatStatusMessage(nsresult aStatus, const char16_t* aStatusArg, + bool aSpoofLocale, nsAString& result) { uint32_t i, argCount = 0; nsCOMPtr<nsIStringBundle> bundle; @@ -1012,7 +1013,8 @@ nsStringBundleService::FormatStatusMessage(nsresult aStatus, switch (NS_ERROR_GET_MODULE(aStatus)) { case NS_ERROR_MODULE_XSLT: - getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + getStringBundle(aSpoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); break; case NS_ERROR_MODULE_NETWORK: getStringBundle(NECKO_MSGS_URL, getter_AddRefs(bundle)); ===================================== mobile/android/installer/package-manifest.in ===================================== @@ -181,6 +181,7 @@ @BINPATH@/res/locale/layout/HtmlForm.properties @BINPATH@/res/locale/layout/MediaDocument.properties @BINPATH@/res/locale/layout/xmlparser.properties +@BINPATH@/res/locale/xslt/xslt.properties @BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS ===================================== uriloader/base/nsDocLoader.cpp ===================================== @@ -1230,7 +1230,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsresult aStatus, mozilla::components::StringBundle::Service(); if (!sbs) return NS_ERROR_FAILURE; nsAutoString msg; - nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, msg); + nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, false, msg); if (NS_FAILED(rv)) return rv; // Keep around the message. In case a request finishes, we need to make sure View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4098cfc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4098cfc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.5.0esr-13.0-1-build3
by richard (＠richard) 22 Nov '23

22 Nov '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.5.0esr-13.0-1] fixup! Bug 42072: 2023 year end campaign for about:tor.
by richard (＠richard) 22 Nov '23

22 Nov '23

richard pushed to branch tor-browser-115.5.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: dd283048 by Dan Ballard at 2023-11-22T19:17:27+00:00 fixup! Bug 42072: 2023 year end campaign for about:tor. Set donation matching amount and date. - - - - - 2 changed files: - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js Changes: ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -36,11 +36,10 @@ alt="" src="chrome://browser/content/abouttor/yec-2023-image.svg" /> -  <p id="yec-2023-matching" data-l10n-id="yec-2023-matched-donation" - data-l10n-args='{ "amount": 0 }' + data-l10n-args='{ "amount": 75000 }' ></p> <h2 id="yec-2023-heading" data-l10n-id="yec-2023-introduction"></h2> <p id="yec-2023-body" data-l10n-id="yec-2023-please-donate"> ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -204,12 +204,11 @@ const YecWidget = { this.isOpen = false; }); - // TODO: Uncomment once we have a final donation matching amount. - //const donateMatchStart = Date.UTC(2023, 10, 13); // November 13th - //document.body.classList.toggle( - // "yec-2023-is-donation-matching", - // now >= donateMatchStart - //); + const donateMatchStart = Date.UTC(2023, 10, 22); // November 22nd + document.body.classList.toggle( + "yec-2023-is-donation-matching", + now >= donateMatchStart + ); this._updateDonateLocale(); }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dd28304… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dd28304… You're receiving this email because of your account on gitlab.torproject.org.

1 0