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
- 
f27bc1a7
by Pier Angelo Vendrame at 2023-12-13T12:50:57+01:00
2 changed files:
Changes:
| ... | ... | @@ -1463,7 +1463,9 @@ var gMainPane = { | 
| 1463 | 1463 |          name,
 | 
| 1464 | 1464 |        };
 | 
| 1465 | 1465 |      });
 | 
| 1466 | -    locales.sort((a, b) => a.code.localeCompare(b.code));
 | |
| 1466 | +    // tor-browser#42335: Sort language codes independently from the locale,
 | |
| 1467 | +    // so do not use localeCompare.
 | |
| 1468 | +    locales.sort((a, b) => a.code > b.code);
 | |
| 1467 | 1469 | |
| 1468 | 1470 |      let fragment = document.createDocumentFragment();
 | 
| 1469 | 1471 |      for (let { code, name } of locales) {
 | 
| ... | ... | @@ -3637,16 +3637,6 @@ void Preferences::SetupTelemetryPref() { | 
| 3637 | 3637 |    Preferences::Lock(kTelemetryPref);
 | 
| 3638 | 3638 |  }
 | 
| 3639 | 3639 | |
| 3640 | -static void CheckTelemetryPref() {
 | |
| 3641 | -  MOZ_ASSERT(!XRE_IsParentProcess());
 | |
| 3642 | - | |
| 3643 | -  // Make sure the children got passed the right telemetry pref details.
 | |
| 3644 | -  DebugOnly<bool> value;
 | |
| 3645 | -  MOZ_ASSERT(NS_SUCCEEDED(Preferences::GetBool(kTelemetryPref, &value)) &&
 | |
| 3646 | -             value == TelemetryPrefValue());
 | |
| 3647 | -  MOZ_ASSERT(Preferences::IsLocked(kTelemetryPref));
 | |
| 3648 | -}
 | |
| 3649 | - | |
| 3650 | 3640 |  #endif  // MOZ_WIDGET_ANDROID
 | 
| 3651 | 3641 | |
| 3652 | 3642 |  /* static */
 | 
| ... | ... | @@ -3687,11 +3677,6 @@ already_AddRefed<Preferences> Preferences::GetInstanceForService() { | 
| 3687 | 3677 |        Preferences::SetPreference(gChangedDomPrefs->ElementAt(i));
 | 
| 3688 | 3678 |      }
 | 
| 3689 | 3679 |      gChangedDomPrefs = nullptr;
 | 
| 3690 | - | |
| 3691 | -#ifndef MOZ_WIDGET_ANDROID
 | |
| 3692 | -    CheckTelemetryPref();
 | |
| 3693 | -#endif
 | |
| 3694 | - | |
| 3695 | 3680 |    } else {
 | 
| 3696 | 3681 |      // Check if there is a deployment configuration file. If so, set up the
 | 
| 3697 | 3682 |      // pref config machinery, which will actually read the file.
 |