February 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Pier Angelo Vendrame (＠pierov) 07 Feb '24

07 Feb '24

Pier Angelo Vendrame pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c78c48e7 by Pier Angelo Vendrame at 2024-02-07T16:34:15+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Add a method to query whether the browser is in portable mode. - - - - - 2 changed files: - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== toolkit/xre/nsIXREDirProvider.idl ===================================== @@ -20,4 +20,9 @@ interface nsIXREDirProvider : nsISupports * Gets the hash for the current installation directory. */ AString getInstallHash(); + + /** + * Tells whether the browser has been started in portable mode. + */ + readonly attribute bool isPortableMode; }; ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1334,6 +1334,20 @@ nsresult nsXREDirProvider::GetPortableDataDir(nsIFile** aFile, } #endif +NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) { +#ifdef RELATIVE_DATA_DIR + if (gDataDirPortable) { + *aIsPortableMode = *gDataDirPortable; + } else { + nsCOMPtr<nsIFile> dir; + GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode); + } +#else + *aIsPortableMode = false; +#endif + return NS_OK; +} + nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78c48e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78c48e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] 3 commits: fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Pier Angelo Vendrame (＠pierov) 07 Feb '24

07 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 3ea5b1dc by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Add a method to query whether the browser is in portable mode. - - - - - 7c5facb8 by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow running the postupdate process and change the update directory for when not running in portable mode. - - - - - 438c7fe9 by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! MB 112: Updater customization for Mullvad Browser MB 200: Enable system installs for Mullvad Browser Customize the post update executable name, to avoid any confusion with Mozilla's helper.exe, since we intend using a much simpler post update binary. - - - - - 4 changed files: - browser/installer/windows/nsis/updater_append.ini - toolkit/mozapps/update/updater/updater.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== browser/installer/windows/nsis/updater_append.ini ===================================== @@ -7,6 +7,8 @@ [PostUpdateWin] ; ExeRelPath is the path to the PostUpdateWin executable relative to the ; application executable. -ExeRelPath=uninstall\helper.exe +ExeRelPath=postupdate.exe ; ExeArg is the argument to pass to the PostUpdateWin exe +; We do not need any argument, but an empty string here will make updater.exe +; not run this step. ExeArg=/PostUpdate ===================================== toolkit/mozapps/update/updater/updater.cpp ===================================== @@ -2807,7 +2807,7 @@ int LaunchCallbackAndPostProcessApps(int argc, NS_tchar** argv, #endif if (argc > callbackIndex) { -#if defined(XP_WIN) && !defined(BASE_BROWSER_UPDATE) +#if defined(XP_WIN) if (gSucceeded) { if (!LaunchWinPostProcess(gInstallDirPath, gPatchDirPath)) { fprintf(stderr, "The post update process was not launched"); ===================================== toolkit/xre/nsIXREDirProvider.idl ===================================== @@ -20,4 +20,9 @@ interface nsIXREDirProvider : nsISupports * Gets the hash for the current installation directory. */ AString getInstallHash(); + + /** + * Tells whether the browser has been started in portable mode. + */ + readonly attribute bool isPortableMode; }; ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1109,7 +1109,14 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, rv = GetUserDataDirectory(getter_AddRefs(updRoot), false); NS_ENSURE_SUCCESS(rv, rv); # else - rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + bool isPortable = true; + rv = GetIsPortableMode(&isPortable); + NS_ENSURE_SUCCESS(rv, rv); + if (isPortable) { + rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + } else { + rv = GetUserDataDirectory(getter_AddRefs(updRoot), true); + } NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); @@ -1324,6 +1331,20 @@ nsresult nsXREDirProvider::GetPortableDataDir(nsIFile** aFile, } #endif +NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) { +#ifdef RELATIVE_DATA_DIR + if (gDataDirPortable) { + *aIsPortableMode = *gDataDirPortable; + } else { + nsCOMPtr<nsIFile> dir; + GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode); + } +#else + *aIsPortableMode = false; +#endif + return NS_OK; +} + nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[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...
by richard (＠richard) 07 Feb '24

07 Feb '24

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/f8f90f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8f90f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.0-1] 2 commits: Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch mullvad-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 6226fff7 by Pier Angelo Vendrame at 2024-02-07T12:28:05+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 9e0fad12 by Pier Angelo Vendrame at 2024-02-07T12:28:05+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,8 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] 3 commits: Revert "Bug 42374: Check for spoof English in number conversions"
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 0daaf26b by Pier Angelo Vendrame at 2024-02-07T12:25:35+00:00 Revert "Bug 42374: Check for spoof English in number conversions" This reverts commit a7932fac62c8a955bdc3f08a9b81b7f2562a4eff. We are instead backporting the uplifted commits. - - - - - c2feed1c by Pier Angelo Vendrame at 2024-02-07T12:25:35+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 7f263eaf by Pier Angelo Vendrame at 2024-02-07T12:25:35+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 1 changed file: - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,15 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && !mContent->OwnerDoc()->AllowsL10n(); if (spoofLocale) { aBCP47LangTag.AssignLiteral("en-US"); return; } - nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.7.0esr-13.0-1] 2 commits: Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch base-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: d363fccf by Pier Angelo Vendrame at 2024-02-07T12:23:06+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 066750e9 by Pier Angelo Vendrame at 2024-02-07T12:23:06+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,8 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6c906d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6c906d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.0-1] 2 commits: Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch tor-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e42f5004 by Pier Angelo Vendrame at 2024-02-07T12:18:39+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 9af28502 by Pier Angelo Vendrame at 2024-02-07T12:18:39+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,8 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6292bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6292bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] 3 commits: Revert "Bug 42374: Check for spoof English in number conversions"
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: fd8ea798 by Pier Angelo Vendrame at 2024-02-07T12:13:26+00:00 Revert "Bug 42374: Check for spoof English in number conversions" This reverts commit a7932fac62c8a955bdc3f08a9b81b7f2562a4eff. We are instead backporting the uplifted commits. - - - - - e750db60 by Pier Angelo Vendrame at 2024-02-07T12:13:26+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - f8f90f9f by Pier Angelo Vendrame at 2024-02-07T12:13:26+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 1 changed file: - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,15 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && !mContent->OwnerDoc()->AllowsL10n(); if (spoofLocale) { aBCP47LangTag.AssignLiteral("en-US"); return; } - nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cc050d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cc050d… 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#40068 and rbm#40069
by boklm (＠boklm) 07 Feb '24

07 Feb '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cc41e2d7 by Nicolas Vigier at 2024-02-07T10:51:09+01:00 Update rbm for rbm#40068 and rbm#40069 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit b5e5b04aaf677c4bacfb5ace45598313286bfdf6 +Subproject commit 067c30ee4cf3baa1c0b7e3674d785cf9e5bec8fe View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] Bug 42195: Fix "Whats new URL"
by Dan Ballard (＠dan) 07 Feb '24

07 Feb '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 1e87b6c6 by clairehurst at 2024-02-01T16:51:58+00:00 Bug 42195: Fix "Whats new URL" - - - - - 5 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt - fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt - fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt - fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt ===================================== @@ -170,7 +170,7 @@ class HomeMenuView( Events.whatsNewTapped.record(NoExtras()) homeActivity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.WHATS_NEW_URL, + searchTermOrURL = SupportUtils.getTorWhatsNewUrl(), newTab = true, from = BrowserDirection.FromHome, ) ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -38,7 +38,7 @@ object SupportUtils { const val MEITUAN_URL = "https://tb.j5k6.com/6ZSOp" const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts" const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts" - const val WHATS_NEW_URL = "https://www.torproject.org/releases/" +// const val WHATS_NEW_URL = "https://www.torproject.org/releases/" const val DONATE_URL = "https://donate.torproject.org/" const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor" @@ -100,6 +100,12 @@ object SupportUtils { return TB_MANUAL_URL } + fun getTorWhatsNewUrl(): String { + val alpha = if (BuildConfig.VERSION_NAME.contains('a')) "alpha-" else "" + val versionNumberNoDecimals = BuildConfig.VERSION_NAME.split('.').joinToString("") + return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumber…" + } + fun getMozillaPageUrl(page: MozillaPage, locale: Locale = Locale.getDefault()): String { val path = page.path val langTag = getLanguageTag(locale) ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt ===================================== @@ -135,7 +135,7 @@ class AboutFragment : Fragment(), AboutPageListener { AboutPageItem( AboutItem.ExternalLink( WHATS_NEW, - SupportUtils.WHATS_NEW_URL, + SupportUtils.getTorWhatsNewUrl(), ), getString(R.string.about_whats_new, getString(R.string.app_name)), ), ===================================== fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt ===================================== @@ -207,7 +207,7 @@ class HomeMenuViewTest { WhatsNew.userViewedWhatsNew(testContext) homeActivity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.WHATS_NEW_URL, + searchTermOrURL = SupportUtils.getTorWhatsNewUrl(), newTab = true, from = BrowserDirection.FromHome, ) ===================================== fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt ===================================== @@ -25,10 +25,10 @@ class SupportUtilsTest { "https://support.mozilla.org/1/mobile/20/Android/fr/tracking-protection-fire…", SupportUtils.getSumoURLForTopic(mockContext("2 0"), SupportUtils.SumoTopic.TRACKING_PROTECTION, Locale("fr")), ) - assertEquals( - "https://www.mozilla.org/firefox/android/notes", - SupportUtils.WHATS_NEW_URL, - ) +// assertEquals( +// "https://www.mozilla.org/firefox/android/notes", +// SupportUtils.WHATS_NEW_URL, +// ) } @Test @@ -63,7 +63,7 @@ class SupportUtilsTest { ) assertEquals( "https://www.torproject.org/releases/", - SupportUtils.WHATS_NEW_URL + SupportUtils.getTorWhatsNewUrl() ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0