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:
commit
2928578164
@ -319,7 +319,12 @@ class ChromeActions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getLocale() {
|
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) {
|
getStrings(data) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user