Verified Commit 7be0dc60 authored by Alex Catarineu's avatar Alex Catarineu Committed by Pier Angelo Vendrame
Browse files

Bug 40309: Avoid using regional OS locales 

Only use regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is set to true.
parent cdc0de8f

intl/locale/LocaleService.cpp

+0 −25
Original line number Diff line number Diff line
@@ -481,31 +481,6 @@ LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { 
            OSPreferences::GetInstance()->GetRegionalPrefsLocales(aRetVal))) {

      return NS_OK;

    }



    // If we fail to retrieve them, return the app locales.

    GetAppLocalesAsBCP47(aRetVal);

    return NS_OK;

  }



  // Otherwise, fetch OS Regional Preferences locales and compare the first one

  // to the app locale. If the language subtag matches, we can safely use

  // the OS Regional Preferences locale.

  //

  // This facilitates scenarios such as Firefox in "en-US" and User sets

  // regional prefs to "en-GB".

  nsAutoCString appLocale;

  AutoTArray<nsCString, 10> regionalPrefsLocales;

  LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocale);



  if (NS_FAILED(OSPreferences::GetInstance()->GetRegionalPrefsLocales(

          regionalPrefsLocales))) {

    GetAppLocalesAsBCP47(aRetVal);

    return NS_OK;

  }



  if (LocaleService::LanguagesMatch(appLocale, regionalPrefsLocales[0])) {

    aRetVal = regionalPrefsLocales.Clone();

    return NS_OK;

  }



  // Otherwise use the app locales.