Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1410733 - Add an en-US locale as a hard fallback for LocaleService::RequestedLocales. r=jfkthame

Browse Source 
MozReview-Commit-ID: LPS3PaeykEh

--HG--
extra : rebase_source : 5ab83371ccfad13f02bf276055fdf9cba7e80a9e
This commit is contained in:
Zibi Braniecki 2017-10-22 11:00:09 -07:00
parent 836ea838b4
commit f50ce10902
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intl/locale/LocaleService.cpp
View File

@ -292,6 +292,16 @@ LocaleService::GetRequestedLocales(nsTArray<nsCString>& aRetVal)
{
if (mRequestedLocales.IsEmpty()) {
ReadRequestedLocales(mRequestedLocales);
// en-US is a LastResort locale. LastResort locale is a fallback locale
// for the requested locale chain. In the future we'll want to make the
// fallback chain differ per-locale. For now, it'll always fallback on en-US.
//
// Notice: This is not the same as DefaultLocale,
// which follows the default locale the build is in.
if (!mRequestedLocales.Contains("en-US")) {
mRequestedLocales.AppendElement("en-US");
}
}
aRetVal = mRequestedLocales;
@ -971,7 +981,9 @@ NS_IMETHODIMP
LocaleService::SetRequestedLocales(const char** aRequested,
uint32_t aRequestedCount)
{
MOZ_ASSERT(aRequestedCount < 2, "We can only handle one requested locale");
MOZ_ASSERT(aRequestedCount < 2 ||
(aRequestedCount == 2 && strcmp(aRequested[1], "en-US") == 0),
"We can only handle one requested locale (optionally with en-US last fallback)");
if (aRequestedCount == 0) {
Preferences::ClearUser(SELECTED_LOCALE_PREF);