Merge pull request #8313 from Snuffleupagus/bug-1346616

[Firefox addon] Upstream changes from: Bug 1346616 - Migrate callsites that are retrieving requested locale from pref, to use LocaleService::GetRequestedLocales
This commit is contained in:
Tim van der Meij 2017-04-19 23:20:08 +02:00 committed by GitHub
commit 2928578164

View File

@ -319,7 +319,12 @@ class ChromeActions {
}
getLocale() {
return getStringPref("general.useragent.locale", "en-US");
//#if !MOZCENTRAL
if (!Services.locale.getRequestedLocale) {
return getStringPref("general.useragent.locale", "en-US");
}
//#endif
return Services.locale.getRequestedLocale() || "en-US";
}
getStrings(data) {