Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1491654 - Add lastFallbackLocale at the end of AppLocales. r=jfkthame

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D5985

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Zibi Braniecki 2018-09-18 08:44:47 +00:00
parent 0a9605a5c2
commit 7775d0c9c9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
intl/locale/LocaleService.cpp
View File

@ -149,21 +149,21 @@ LocaleService::NegotiateAppLocales(nsTArray<nsCString>& aRetVal)
NegotiateLanguages(requestedLocales, availableLocales, defaultLocale,
LangNegStrategy::Filtering, aRetVal);
} else {
// In content process, we will not do any language negotiation.
// Instead, the language is set manually by SetAppLocales.
}
nsAutoCString lastFallbackLocale;
GetLastFallbackLocale(lastFallbackLocale);
if (!aRetVal.Contains(lastFallbackLocale)) {
// This part is used in one of the two scenarios:
//
// If this method has been called, it means that we did not fire
// SetAppLocales yet (happens during initialization).
// In that case, all we can do is return the default or last fallback locale.
//
// We will return last fallback here, to avoid having to trigger reading
// `update.locale` for default locale.
//
// Once SetAppLocales will be called later, it'll fire an event
// allowing callers to update the locale.
nsAutoCString lastFallbackLocale;
GetLastFallbackLocale(lastFallbackLocale);
// a) We're in a client mode, and no locale has been set yet,
// so we need to return last fallback locale temporarily.
// b) We're in a server mode, and the last fallback locale was excluded
// when negotiating against the requested locales.
// Since we currently package it as a last fallback at build
// time, we should also add it at the end of the list at
// runtime.
aRetVal.AppendElement(lastFallbackLocale);
}
}