summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-04 16:20:00 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-04 16:20:00 +0200
commitfdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba (patch)
treea0b5864b8b590e66525dcd2b9c1c1940443526de
parent33c8d5d9714ecf3a2730b3c509bd05d4fcf85ce4 (diff)
downloadUXP-fdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba.tar
UXP-fdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba.tar.gz
UXP-fdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba.tar.lz
UXP-fdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba.tar.xz
UXP-fdd89d8e3a5f280bb153e650d5a4ea7bb5f272ba.zip
Issue #325 Part 8: Remove non-Intl legacy code paths from nsChromeRegistry.
-rw-r--r--chrome/nsChromeRegistry.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
index 0302b9997..485ca002c 100644
--- a/chrome/nsChromeRegistry.cpp
+++ b/chrome/nsChromeRegistry.cpp
@@ -32,9 +32,7 @@
#include "mozilla/StyleSheet.h"
#include "mozilla/StyleSheetInlines.h"
-#ifdef ENABLE_INTL_API
#include "unicode/uloc.h"
-#endif
nsChromeRegistry* nsChromeRegistry::gChromeRegistry;
@@ -720,7 +718,6 @@ nsChromeRegistry::GetSingleton()
void
nsChromeRegistry::SanitizeForBCP47(nsACString& aLocale)
{
-#ifdef ENABLE_INTL_API
// Currently, the only locale code we use that's not BCP47-conformant is
// "ja-JP-mac" on OS X, but let's try to be more general than just
// hard-coding that here.
@@ -735,13 +732,4 @@ nsChromeRegistry::SanitizeForBCP47(nsACString& aLocale)
if (U_SUCCESS(err) && len > 0) {
aLocale.Assign(langTag, len);
}
-#else
- // This is only really needed for Intl API purposes, AFAIK,
- // so probably won't be used in a non-ENABLE_INTL_API build.
- // But let's fix up the single anomalous code we actually ship,
- // just in case:
- if (aLocale.EqualsLiteral("ja-JP-mac")) {
- aLocale.AssignLiteral("ja-JP");
- }
-#endif
}