This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser.
commit 915fb9fae7733e37820c0c5eec8cd86bf02604b3 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed May 18 19:22:37 2022 +0200
Bug 40309: Avoid using regional OS locales
Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. --- intl/locale/LocaleService.cpp | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp index 4ff18a1a90c4a..542eed3e37fdb 100644 --- a/intl/locale/LocaleService.cpp +++ b/intl/locale/LocaleService.cpp @@ -14,6 +14,7 @@ #include "mozilla/intl/AppDateTimeFormat.h" #include "mozilla/intl/Locale.h" #include "mozilla/intl/OSPreferences.h" +#include "nsContentUtils.h" #include "nsDirectoryService.h" #include "nsDirectoryServiceDefs.h" #include "nsIObserverService.h" @@ -479,6 +480,11 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) {
NS_IMETHODIMP LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { + if (nsContentUtils::ShouldResistFingerprinting()) { + GetAppLocalesAsBCP47(aRetVal); + return NS_OK; + } + bool useOSLocales = Preferences::GetBool("intl.regional_prefs.use_os_locales", false);