AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7605 Change locale ID canonicalization to not use double-underscore IDs

Browse Source 
X-SVN-Rev: 30954
This commit is contained in:
John Emmons 2011-11-11 20:29:33 +00:00
parent fa39f72cf5
commit 42bbabf646
5 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
icu4c/source/common/locid.cpp
View File

@ -590,14 +590,12 @@ Locale& Locale::init(const char* localeID, UBool canonicalize)
fieldLen[fieldIdx-1] = length - (int32_t)(field[fieldIdx-1] - fullName); fieldLen[fieldIdx-1] = length - (int32_t)(field[fieldIdx-1] - fullName);
} }
if (fieldLen[0] >= (int32_t)(sizeof(language)) if (fieldLen[0] >= (int32_t)(sizeof(language)))
|| (fieldLen[1] == 4 && fieldLen[2] >= (int32_t)(sizeof(country)))
|| (fieldLen[1] != 4 && fieldLen[1] >= (int32_t)(sizeof(country))))
{ {
break; // error: one of the fields is too long break; // error: the language field is too long
} }
variantField = 2; /* Usually the 2nd one, except when a script is used. */ variantField = 1; /* Usually the 2nd one, except when a script or country is also used. */
if (fieldLen[0] > 0) { if (fieldLen[0] > 0) {
/* We have a language */ /* We have a language */
uprv_memcpy(language, fullName, fieldLen[0]); uprv_memcpy(language, fullName, fieldLen[0]);
@ -607,19 +605,19 @@ Locale& Locale::init(const char* localeID, UBool canonicalize)
/* We have at least a script */ /* We have at least a script */
uprv_memcpy(script, field[1], fieldLen[1]); uprv_memcpy(script, field[1], fieldLen[1]);
script[fieldLen[1]] = 0; script[fieldLen[1]] = 0;
variantField = 3; variantField++;
if (fieldLen[2] > 0) { }
if (fieldLen[variantField] > 0 && fieldLen[variantField] <= (int32_t)(sizeof(country))) {
/* We have a country */ /* We have a country */
uprv_memcpy(country, field[2], fieldLen[2]); uprv_memcpy(country, field[variantField], fieldLen[variantField]);
country[fieldLen[2]] = 0; country[fieldLen[variantField]] = 0;
variantField++;
} else if (fieldLen[variantField] == 0) {
variantField++; /* script or country empty but variant in next field (i.e. en__POSIX) */
} }
}
else if (fieldLen[1] > 0) { if (fieldLen[variantField] > 0) {
/* We have a country and no script */
uprv_memcpy(country, field[1], fieldLen[1]);
country[fieldLen[1]] = 0;
}
if (variantField > 0 && fieldLen[variantField] > 0) {
/* We have a variant */ /* We have a variant */
variantBegin = (int32_t)(field[variantField] - fullName); variantBegin = (int32_t)(field[variantField] - fullName);
} }

55
icu4c/source/common/uloc.cpp
View File

@ -111,11 +111,11 @@ static const char * const LANGUAGES[] = {
"enm", "eo", "es", "et", "eu", "ewo", "fa", "enm", "eo", "es", "et", "eu", "ewo", "fa",
"fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon", "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon",
"fr", "frm", "fro", "frr", "frs", "fur", "fy", "fr", "frm", "fro", "frr", "frs", "fur", "fy",
"ga", "gaa", "gay", "gba", "gd", "gem", "gez", "gil", "ga", "gaa", "gan", "gay", "gba", "gd", "gem", "gez", "gil",
"gl", "gmh", "gn", "goh", "gon", "gor", "got", "grb", "gl", "gmh", "gn", "goh", "gon", "gor", "got", "grb",
"grc", "gsw", "gu", "guz", "gv", "gwi", "grc", "gsw", "gu", "guz", "gv", "gwi",
"ha", "hai", "haw", "he", "hi", "hil", "him", "ha", "hai", "hak", "haw", "he", "hi", "hil", "him",
"hit", "hmn", "ho", "hr", "hsb", "ht", "hu", "hup", "hy", "hz", "hit", "hmn", "ho", "hr", "hsb", "hsn", "ht", "hu", "hup", "hy", "hz",
"ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik", "ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik",
"ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it", "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it",
"iu", "ja", "jbo", "jmc", "jpr", "jrb", "jv", "ka", "kaa", "kab", "iu", "ja", "jbo", "jmc", "jpr", "jrb", "jv", "ka", "kaa", "kab",
@ -129,7 +129,7 @@ static const char * const LANGUAGES[] = {
"mdf", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mh", "mi", "mic", "min", "mdf", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mh", "mi", "mic", "min",
"mis", "mk", "mkh", "ml", "mn", "mnc", "mni", "mno", "mis", "mk", "mkh", "ml", "mn", "mnc", "mni", "mno",
"mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun", "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun",
"mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nap", "naq", "mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nan", "nap", "naq",
"nb", "nd", "nds", "ne", "new", "ng", "nia", "nic", "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic",
"niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus", "niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus",
"nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oc", "oj", "nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oc", "oj",
@ -149,8 +149,8 @@ static const char * const LANGUAGES[] = {
"ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw", "twq", "ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw", "twq",
"ty", "tyv", "tzm", "udm", "ug", "uga", "uk", "umb", "und", "ur", "ty", "tyv", "tzm", "udm", "ug", "uga", "uk", "umb", "und", "ur",
"uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak", "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak",
"wal", "war", "was", "wen", "wo", "xal", "xh", "xog", "yao", "yap", "yav", "wal", "war", "was", "wen", "wo", "wuu", "xal", "xh", "xog", "yao", "yap", "yav",
"yi", "yo", "ypk", "za", "zap", "zbl", "zen", "zh", "znd", "yi", "yo", "ypk", "yue", "za", "zap", "zbl", "zen", "zh", "znd",
"zu", "zun", "zxx", "zza", "zu", "zun", "zxx", "zza",
NULL, NULL,
"in", "iw", "ji", "jw", "sh", /* obsolete language codes */ "in", "iw", "ji", "jw", "sh", /* obsolete language codes */
@ -212,16 +212,16 @@ static const char * const LANGUAGES_3[] = {
"enm", "epo", "spa", "est", "eus", "ewo", "fas", "enm", "epo", "spa", "est", "eus", "ewo", "fas",
/* "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon", */ /* "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon", */
"fan", "fat", "ful", "fin", "fil", "fiu", "fij", "fao", "fon", "fan", "fat", "ful", "fin", "fil", "fiu", "fij", "fao", "fon",
/* "fr", "frm", "fro", "frr", "frs", "fur", "fy", "ga", "gaa", "gay", */ /* "fr", "frm", "fro", "frr", "frs", "fur", "fy", "ga", "gaa", "gan", "gay", */
"fra", "frm", "fro", "frr", "frs", "fur", "fry", "gle", "gaa", "gay", "fra", "frm", "fro", "frr", "frs", "fur", "fry", "gle", "gaa", "gan", "gay",
/* "gba", "gd", "gem", "gez", "gil", "gl", "gmh", "gn", */ /* "gba", "gd", "gem", "gez", "gil", "gl", "gmh", "gn", */
"gba", "gla", "gem", "gez", "gil", "glg", "gmh", "grn", "gba", "gla", "gem", "gez", "gil", "glg", "gmh", "grn",
/* "goh", "gon", "gor", "got", "grb", "grc", "gsw", "gu", "guz", "gv", */ /* "goh", "gon", "gor", "got", "grb", "grc", "gsw", "gu", "guz", "gv", */
"goh", "gon", "gor", "got", "grb", "grc", "gsw", "guj", "guz", "glv", "goh", "gon", "gor", "got", "grb", "grc", "gsw", "guj", "guz", "glv",
/* "gwi", "ha", "hai", "haw", "he", "hi", "hil", "him", */ /* "gwi", "ha", "hai", "hak", "haw", "he", "hi", "hil", "him", */
"gwi", "hau", "hai", "haw", "heb", "hin", "hil", "him", "gwi", "hau", "hai", "hak", "haw", "heb", "hin", "hil", "him",
/* "hit", "hmn", "ho", "hr", "hsb", "ht", "hu", "hup", "hy", "hz", */ /* "hit", "hmn", "ho", "hr", "hsb", "hsn", "ht", "hu", "hup", "hy", "hz", */
"hit", "hmn", "hmo", "hrv", "hsb", "hat", "hun", "hup", "hye", "her", "hit", "hmn", "hmo", "hrv", "hsb", "hsn", "hat", "hun", "hup", "hye", "her",
/* "ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik", */ /* "ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik", */
"ina", "iba", "ind", "ile", "ibo", "iii", "ijo", "ipk", "ina", "iba", "ind", "ile", "ibo", "iii", "ijo", "ipk",
/* "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it", */ /* "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it", */
@ -248,8 +248,8 @@ static const char * const LANGUAGES_3[] = {
"mis", "mkd", "mkh", "mal", "mon", "mnc", "mni", "mno", "mis", "mkd", "mkh", "mal", "mon", "mnc", "mni", "mno",
/* "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun", */ /* "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun", */
"mol", "moh", "mos", "mar", "msa", "mlt", "mua", "mul", "mun", "mol", "moh", "mos", "mar", "msa", "mlt", "mua", "mul", "mun",
/* "mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nap", "naq", */ /* "mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nan", "nap", "naq", */
"mus", "mwl", "mwr", "mya", "myn", "myv", "nau", "nah", "nai", "nap", "naq", "mus", "mwl", "mwr", "mya", "myn", "myv", "nau", "nah", "nai", "nan", "nap", "naq",
/* "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic", */ /* "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic", */
"nob", "nde", "nds", "nep", "new", "ndo", "nia", "nic", "nob", "nde", "nds", "nep", "new", "ndo", "nia", "nic",
/* "niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus", */ /* "niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus", */
@ -288,10 +288,10 @@ static const char * const LANGUAGES_3[] = {
"tah", "tyv", "tzm", "udm", "uig", "uga", "ukr", "umb", "und", "urd", "tah", "tyv", "tzm", "udm", "uig", "uga", "ukr", "umb", "und", "urd",
/* "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak", */ /* "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak", */
"uzb", "vai", "ven", "vie", "vol", "vot", "vun", "wln", "wak", "uzb", "vai", "ven", "vie", "vol", "vot", "vun", "wln", "wak",
/* "wal", "war", "was", "wen", "wo", "xal", "xh", "xog", "yao", "yap", "yav", */ /* "wal", "war", "was", "wen", "wo", "wuu", "xal", "xh", "xog", "yao", "yap", "yav", */
"wal", "war", "was", "wen", "wol", "xal", "xho", "xog", "yao", "yap", "yav", "wal", "war", "was", "wen", "wol", "wuu", "xal", "xho", "xog", "yao", "yap", "yav",
/* "yi", "yo", "ypk", "za", "zap", "zbl", "zen", "zh", "znd", */ /* "yi", "yo", "ypk", "yue", "za", "zap", "zbl", "zen", "zh", "znd", */
"yid", "yor", "ypk", "zha", "zap", "zbl", "zen", "zho", "znd", "yid", "yor", "ypk", "yue", "zha", "zap", "zbl", "zen", "zho", "znd",
/* "zu", "zun", "zxx", "zza", */ /* "zu", "zun", "zxx", "zza", */
"zul", "zun", "zxx", "zza", "zul", "zun", "zxx", "zza",
NULL, NULL,
@ -467,16 +467,11 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = {
{ "az_AZ_CYRL", "az_Cyrl_AZ", NULL, NULL }, /* .NET name */ { "az_AZ_CYRL", "az_Cyrl_AZ", NULL, NULL }, /* .NET name */
{ "az_AZ_LATN", "az_Latn_AZ", NULL, NULL }, /* .NET name */ { "az_AZ_LATN", "az_Latn_AZ", NULL, NULL }, /* .NET name */
{ "ca_ES_PREEURO", "ca_ES", "currency", "ESP" }, { "ca_ES_PREEURO", "ca_ES", "currency", "ESP" },
{ "cel_GAULISH", "cel__GAULISH", NULL, NULL }, /* registered name */
{ "de_1901", "de__1901", NULL, NULL }, /* registered name */
{ "de_1906", "de__1906", NULL, NULL }, /* registered name */
{ "de__PHONEBOOK", "de", "collation", "phonebook" }, /* Old ICU name */ { "de__PHONEBOOK", "de", "collation", "phonebook" }, /* Old ICU name */
{ "de_AT_PREEURO", "de_AT", "currency", "ATS" }, { "de_AT_PREEURO", "de_AT", "currency", "ATS" },
{ "de_DE_PREEURO", "de_DE", "currency", "DEM" }, { "de_DE_PREEURO", "de_DE", "currency", "DEM" },
{ "de_LU_PREEURO", "de_LU", "currency", "LUF" }, { "de_LU_PREEURO", "de_LU", "currency", "LUF" },
{ "el_GR_PREEURO", "el_GR", "currency", "GRD" }, { "el_GR_PREEURO", "el_GR", "currency", "GRD" },
{ "en_BOONT", "en__BOONT", NULL, NULL }, /* registered name */
{ "en_SCOUSE", "en__SCOUSE", NULL, NULL }, /* registered name */
{ "en_BE_PREEURO", "en_BE", "currency", "BEF" }, { "en_BE_PREEURO", "en_BE", "currency", "BEF" },
{ "en_IE_PREEURO", "en_IE", "currency", "IEP" }, { "en_IE_PREEURO", "en_IE", "currency", "IEP" },
{ "es__TRADITIONAL", "es", "collation", "traditional" }, /* Old ICU name */ { "es__TRADITIONAL", "es", "collation", "traditional" }, /* Old ICU name */
@ -495,7 +490,6 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = {
{ "nl_BE_PREEURO", "nl_BE", "currency", "BEF" }, { "nl_BE_PREEURO", "nl_BE", "currency", "BEF" },
{ "nl_NL_PREEURO", "nl_NL", "currency", "NLG" }, { "nl_NL_PREEURO", "nl_NL", "currency", "NLG" },
{ "pt_PT_PREEURO", "pt_PT", "currency", "PTE" }, { "pt_PT_PREEURO", "pt_PT", "currency", "PTE" },
{ "sl_ROZAJ", "sl__ROZAJ", NULL, NULL }, /* registered name */
{ "sr_SP_CYRL", "sr_Cyrl_RS", NULL, NULL }, /* .NET name */ { "sr_SP_CYRL", "sr_Cyrl_RS", NULL, NULL }, /* .NET name */
{ "sr_SP_LATN", "sr_Latn_RS", NULL, NULL }, /* .NET name */ { "sr_SP_LATN", "sr_Latn_RS", NULL, NULL }, /* .NET name */
{ "sr_YU_CYRILLIC", "sr_Cyrl_RS", NULL, NULL }, /* Linux name */ { "sr_YU_CYRILLIC", "sr_Cyrl_RS", NULL, NULL }, /* Linux name */
@ -505,14 +499,13 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = {
{ "uz_UZ_LATN", "uz_Latn_UZ", NULL, NULL }, /* .NET name */ { "uz_UZ_LATN", "uz_Latn_UZ", NULL, NULL }, /* .NET name */
{ "zh_CHS", "zh_Hans", NULL, NULL }, /* .NET name */ { "zh_CHS", "zh_Hans", NULL, NULL }, /* .NET name */
{ "zh_CHT", "zh_Hant", NULL, NULL }, /* .NET name */ { "zh_CHT", "zh_Hant", NULL, NULL }, /* .NET name */
{ "zh_GAN", "zh__GAN", NULL, NULL }, /* registered name */ { "zh_GAN", "gan", NULL, NULL }, /* registered name */
{ "zh_GUOYU", "zh", NULL, NULL }, /* registered name */ { "zh_GUOYU", "zh", NULL, NULL }, /* registered name */
{ "zh_HAKKA", "zh__HAKKA", NULL, NULL }, /* registered name */ { "zh_HAKKA", "hak", NULL, NULL }, /* registered name */
{ "zh_MIN", "zh__MIN", NULL, NULL }, /* registered name */ { "zh_MIN_NAN", "nan", NULL, NULL }, /* registered name */
{ "zh_MIN_NAN", "zh__MINNAN", NULL, NULL }, /* registered name */ { "zh_WUU", "wuu", NULL, NULL }, /* registered name */
{ "zh_WUU", "zh__WUU", NULL, NULL }, /* registered name */ { "zh_XIANG", "hsn", NULL, NULL }, /* registered name */
{ "zh_XIANG", "zh__XIANG", NULL, NULL }, /* registered name */ { "zh_YUE", "yue", NULL, NULL }, /* registered name */
{ "zh_YUE", "zh__YUE", NULL, NULL }, /* registered name */
}; };
typedef struct VariantMap { typedef struct VariantMap {

6
icu4c/source/test/cintltst/cloctst.c
View File

@ -1938,9 +1938,9 @@ static void TestCanonicalization(void)
{ "no@ny", "no@ny", "no__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */ { "no@ny", "no@ny", "no__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */
{ "no-no.utf32@B", "no_NO.utf32@B", "no_NO_B" /* not: "nb_NO_B" [alan ICU3.0] */ }, /* POSIX ID */ { "no-no.utf32@B", "no_NO.utf32@B", "no_NO_B" /* not: "nb_NO_B" [alan ICU3.0] */ }, /* POSIX ID */
{ "qz-qz@Euro", "qz_QZ@Euro", "qz_QZ@currency=EUR" }, /* qz-qz uses private use iso codes */ { "qz-qz@Euro", "qz_QZ@Euro", "qz_QZ@currency=EUR" }, /* qz-qz uses private use iso codes */
{ "en-BOONT", "en_BOONT", "en__BOONT" }, /* registered name */ { "en-BOONT", "en_BOONT", "en_BOONT" }, /* registered name */
{ "de-1901", "de_1901", "de__1901" }, /* registered name */ { "de-1901", "de_1901", "de_1901" }, /* registered name */
{ "de-1906", "de_1906", "de__1906" }, /* registered name */ { "de-1906", "de_1906", "de_1906" }, /* registered name */
{ "sr-SP-Cyrl", "sr_SP_CYRL", "sr_Cyrl_RS" }, /* .NET name */ { "sr-SP-Cyrl", "sr_SP_CYRL", "sr_Cyrl_RS" }, /* .NET name */
{ "sr-SP-Latn", "sr_SP_LATN", "sr_Latn_RS" }, /* .NET name */ { "sr-SP-Latn", "sr_SP_LATN", "sr_Latn_RS" }, /* .NET name */
{ "sr_YU_CYRILLIC", "sr_YU_CYRILLIC", "sr_Cyrl_RS" }, /* Linux name */ { "sr_YU_CYRILLIC", "sr_YU_CYRILLIC", "sr_Cyrl_RS" }, /* Linux name */

20
icu4c/source/test/intltest/loctest.cpp
View File

@ -868,8 +868,8 @@ LocaleTest::TestGetLangsAndCountries()
; ;
/* TODO: Change this test to be more like the cloctst version? */ /* TODO: Change this test to be more like the cloctst version? */
if (testCount != 530) if (testCount != 536)
errln("Expected getISOLanguages() to return 530 languages; it returned %d", testCount); errln("Expected getISOLanguages() to return 536 languages; it returned %d", testCount);
else { else {
for (i = 0; i < 15; i++) { for (i = 0; i < 15; i++) {
int32_t j; int32_t j;
@ -2064,23 +2064,23 @@ void LocaleTest::TestGetLocale(void) {
void LocaleTest::TestVariantWithOutCountry(void) { void LocaleTest::TestVariantWithOutCountry(void) {
Locale loc("en","","POSIX"); Locale loc("en","","POSIX");
if (0 != strcmp(loc.getVariant(), "POSIX")) { if (0 != strcmp(loc.getVariant(), "POSIX")) {
errln("FAIL: en__POSIX didn't get parsed correctly"); errln("FAIL: en__POSIX didn't get parsed correctly - name is %s - expected %s got %s", loc.getName(), "POSIX", loc.getVariant());
} }
Locale loc2("en","","FOUR"); Locale loc2("en","","FOUR");
if (0 != strcmp(loc2.getVariant(), "FOUR")) { if (0 != strcmp(loc2.getVariant(), "FOUR")) {
errln("FAIL: en__FOUR didn't get parsed correctly"); errln("FAIL: en__FOUR didn't get parsed correctly - name is %s - expected %s got %s", loc2.getName(), "FOUR", loc2.getVariant());
} }
Locale loc3("en","Latn","","FOUR"); Locale loc3("en","Latn","","FOUR");
if (0 != strcmp(loc3.getVariant(), "FOUR")) { if (0 != strcmp(loc3.getVariant(), "FOUR")) {
errln("FAIL: en_Latn__FOUR didn't get parsed correctly"); errln("FAIL: en_Latn__FOUR didn't get parsed correctly - name is %s - expected %s got %s", loc3.getName(), "FOUR", loc3.getVariant());
} }
Locale loc4("","Latn","","FOUR"); Locale loc4("","Latn","","FOUR");
if (0 != strcmp(loc4.getVariant(), "FOUR")) { if (0 != strcmp(loc4.getVariant(), "FOUR")) {
errln("FAIL: _Latn__FOUR didn't get parsed correctly"); errln("FAIL: _Latn__FOUR didn't get parsed correctly - name is %s - expected %s got %s", loc4.getName(), "FOUR", loc4.getVariant());
} }
Locale loc5("","Latn","US","FOUR"); Locale loc5("","Latn","US","FOUR");
if (0 != strcmp(loc5.getVariant(), "FOUR")) { if (0 != strcmp(loc5.getVariant(), "FOUR")) {
errln("FAIL: _Latn_US_FOUR didn't get parsed correctly"); errln("FAIL: _Latn_US_FOUR didn't get parsed correctly - name is %s - expected %s got %s", loc5.getName(), "FOUR", loc5.getVariant());
} }
} }
@ -2150,9 +2150,9 @@ void LocaleTest::TestCanonicalization(void)
{ "qz-qz@Euro", "qz_QZ@Euro", "qz_QZ@currency=EUR" }, /* qz-qz uses private use iso codes */ { "qz-qz@Euro", "qz_QZ@Euro", "qz_QZ@currency=EUR" }, /* qz-qz uses private use iso codes */
// NOTE: uloc_getName() works on en-BOONT, but Locale() parser considers it BOGUS // NOTE: uloc_getName() works on en-BOONT, but Locale() parser considers it BOGUS
// TODO: unify this behavior // TODO: unify this behavior
{ "en-BOONT", "BOGUS", "en__BOONT" }, /* registered name */ { "en-BOONT", "en_BOONT", "en_BOONT" }, /* registered name */
{ "de-1901", "de_1901", "de__1901" }, /* registered name */ { "de-1901", "de_1901", "de_1901" }, /* registered name */
{ "de-1906", "de_1906", "de__1906" }, /* registered name */ { "de-1906", "de_1906", "de_1906" }, /* registered name */
{ "sr-SP-Cyrl", "sr_SP_CYRL", "sr_Cyrl_RS" }, /* .NET name */ { "sr-SP-Cyrl", "sr_SP_CYRL", "sr_Cyrl_RS" }, /* .NET name */
{ "sr-SP-Latn", "sr_SP_LATN", "sr_Latn_RS" }, /* .NET name */ { "sr-SP-Latn", "sr_SP_LATN", "sr_Latn_RS" }, /* .NET name */
{ "sr_YU_CYRILLIC", "sr_YU_CYRILLIC", "sr_Cyrl_RS" }, /* Linux name */ { "sr_YU_CYRILLIC", "sr_YU_CYRILLIC", "sr_Cyrl_RS" }, /* Linux name */

6
icu4c/source/test/testdata/structLocale.txt vendored
View File

@ -4040,6 +4040,7 @@ structLocale:table(nofallback){
fy{""} fy{""}
ga{""} ga{""}
gaa{""} gaa{""}
gan{""}
gay{""} gay{""}
gba{""} gba{""}
gd{""} gd{""}
@ -4062,6 +4063,7 @@ structLocale:table(nofallback){
gwi{""} gwi{""}
ha{""} ha{""}
hai{""} hai{""}
hak{""}
haw{""} haw{""}
he{""} he{""}
hi{""} hi{""}
@ -4072,6 +4074,7 @@ structLocale:table(nofallback){
ho{""} ho{""}
hr{""} hr{""}
hsb{""} hsb{""}
hsn{""}
ht{""} ht{""}
hu{""} hu{""}
hup{""} hup{""}
@ -4212,6 +4215,7 @@ structLocale:table(nofallback){
na{""} na{""}
nah{""} nah{""}
nai{""} nai{""}
nan{""}
nap{""} nap{""}
naq{""} naq{""}
nb{""} nb{""}
@ -4400,6 +4404,7 @@ structLocale:table(nofallback){
was{""} was{""}
wen{""} wen{""}
wo{""} wo{""}
wuu{""}
xal{""} xal{""}
xh{""} xh{""}
xog{""} xog{""}
@ -4409,6 +4414,7 @@ structLocale:table(nofallback){
yi{""} yi{""}
yo{""} yo{""}
ypk{""} ypk{""}
yue{""}
za{""} za{""}
zap{""} zap{""}
zbl{""} zbl{""}