Backed out changeset 84f325dfaa00 (bug 1410733) for failing xpcshell's intl/l10n/test/test_localization.js on debug. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 24 Oct 2017 18:57:39 +0200
changeset 685771 1814b6aba6e3e8711ebbe974dfebe31e6cb27a40
parent 685770 6b17da389d8d573efa3c634f59e5861ede1e9039
child 685772 f4058e6c62b38bc59553503031de84290dcf3b79
push id86016
push userkgupta@mozilla.com
push dateWed, 25 Oct 2017 01:53:44 +0000
reviewersbackout
bugs1410733
milestone58.0a1
backs out84f325dfaa00d797b3df7504ffac6d0a552dd099
Backed out changeset 84f325dfaa00 (bug 1410733) for failing xpcshell's intl/l10n/test/test_localization.js on debug. r=backout
intl/locale/LocaleService.cpp
--- a/intl/locale/LocaleService.cpp
+++ b/intl/locale/LocaleService.cpp
@@ -287,26 +287,16 @@ LocaleService::AssignRequestedLocales(co
   }
 }
 
 bool
 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;
   return true;
 }
 
 bool
 LocaleService::GetAvailableLocales(nsTArray<nsCString>& aRetVal)