Pier Angelo Vendrame pushed to branch base-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits: 6b973513 by Pier Angelo Vendrame at 2023-12-13T12:50:56+01:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages

Bug 42335: Do not localize the order of languages

- - - - - f27bc1a7 by Pier Angelo Vendrame at 2023-12-13T12:50:57+01:00 Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten

Bug 1444275 introduced an assertion on the parent process to check that the value of toolkit.telemetry.enabled is the expected one. However, this expected value could be different from the one set and locked e.g. in some forks. Therefore, the assertion prevented debug builds from working in these cases.

Differential Revision: https://phabricator.services.mozilla.com/D195080 - - - - -

2 changed files:

- browser/components/preferences/main.js - modules/libpref/Preferences.cpp

Changes:

===================================== browser/components/preferences/main.js ===================================== @@ -1463,7 +1463,9 @@ var gMainPane = { name, }; }); - locales.sort((a, b) => a.code.localeCompare(b.code)); + // tor-browser#42335: Sort language codes independently from the locale, + // so do not use localeCompare. + locales.sort((a, b) => a.code > b.code);

let fragment = document.createDocumentFragment(); for (let { code, name } of locales) {

===================================== modules/libpref/Preferences.cpp ===================================== @@ -3637,16 +3637,6 @@ void Preferences::SetupTelemetryPref() { Preferences::Lock(kTelemetryPref); }

-static void CheckTelemetryPref() { - MOZ_ASSERT(!XRE_IsParentProcess()); - - // Make sure the children got passed the right telemetry pref details. - DebugOnly<bool> value; - MOZ_ASSERT(NS_SUCCEEDED(Preferences::GetBool(kTelemetryPref, &value)) && - value == TelemetryPrefValue()); - MOZ_ASSERT(Preferences::IsLocked(kTelemetryPref)); -} - #endif // MOZ_WIDGET_ANDROID

/* static */ @@ -3687,11 +3677,6 @@ already_AddRefed<Preferences> Preferences::GetInstanceForService() { Preferences::SetPreference(gChangedDomPrefs->ElementAt(i)); } gChangedDomPrefs = nullptr; - -#ifndef MOZ_WIDGET_ANDROID - CheckTelemetryPref(); -#endif - } else { // Check if there is a deployment configuration file. If so, set up the // pref config machinery, which will actually read the file.

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/02be06d...