Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1423463 - Update the LocaleService to handle ja-JP-mac better. r=jfkthame

Browse Source 
MozReview-Commit-ID: FdwMLcgdcvx

--HG--
extra : rebase_source : 07cb7739cd189ce49cbbc2520a7e8c2fc10a7b86
This commit is contained in:
Zibi Braniecki 2017-12-05 23:10:37 -08:00
parent 6df26ff4dc
commit 402ccab870
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
intl/locale/LocaleService.cpp
View File

@ -81,14 +81,12 @@ ReadRequestedLocales(nsTArray<nsCString>& aRetVal)
if (str.Length() > 0) {
for (const nsACString& part : str.Split(',')) {
nsAutoCString locale(part);
if (SanitizeForBCP47(locale, true)) {
// This is a hack required for us to handle the special Mozilla `ja-JP-mac`
// locales. We sanitize the input to normalize the case etc. but in result
// the `ja-JP-mac` will get turned into a BCP47 tag. Here we're turning it
// back into the form expected by Gecko resources.
if (locale.EqualsLiteral("ja-JP-x-lvariant-mac")) {
locale.Assign("ja-JP-mac");
if (locale.EqualsLiteral("ja-JP-mac")) {
// This is a hack required to handle the special Mozilla `ja-JP-mac` locale.
if (!aRetVal.Contains(locale)) {
aRetVal.AppendElement(locale);
}
} else if (SanitizeForBCP47(locale, true)) {
if (!aRetVal.Contains(locale)) {
aRetVal.AppendElement(locale);
}
@ -837,7 +835,7 @@ LocaleService::Locale::Locale(const nsCString& aLocale, bool aRange)
}
break;
case 3:
if (part.EqualsLiteral("*") || part.Length() == 3) {
if (part.EqualsLiteral("*") || part.Length() >= 3 && part.Length() <= 8) {
mVariant.Assign(part);
}
break;
@ -992,14 +990,11 @@ LocaleService::SetRequestedLocales(const char** aRequested,
for (uint32_t i = 0; i < aRequestedCount; i++) {
nsAutoCString locale(aRequested[i]);
if (!SanitizeForBCP47(locale, true)) {
if (!locale.EqualsLiteral("ja-JP-mac") &&
!SanitizeForBCP47(locale, true)) {
NS_ERROR("Invalid language tag provided to SetRequestedLocales!");
return NS_ERROR_INVALID_ARG;
}
if (locale.EqualsLiteral("ja-JP-x-lvariant-mac")) {
// This is a hack for our code to handle `ja-JP-mac` special case.
locale.Assign("ja-JP-mac");
}
if (i > 0) {
str.AppendLiteral(",");