From 605d7dd578830173bfccc1c43e3a38b102b2bacd Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 21 Nov 2014 23:53:20 +0000 Subject: [PATCH] ICU-11216 Removed language code 'wen' from the LCID mapping table. MS uses 'hsb' (and 'dsb') in the latest LCID reference document, but 'wen' is not used. X-SVN-Rev: 36770 --- icu4c/source/common/locmap.c | 21 +++++++++------------ icu4c/source/test/cintltst/cldrtest.c | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/icu4c/source/common/locmap.c b/icu4c/source/common/locmap.c index 59809c6c688..c746ce3d2a1 100644 --- a/icu4c/source/common/locmap.c +++ b/icu4c/source/common/locmap.c @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 1996-2013, International Business Machines + * Copyright (C) 1996-2014, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * @@ -400,6 +400,13 @@ ILCID_POSIX_SUBTABLE(hr) { {0x7c1a, "sr"} /* In CLDR sr is sr_Cyrl. */ }; +ILCID_POSIX_SUBTABLE(hsb) { + {0x2E, "hsb"}, + {0x042E, "hsb_DE"}, + {0x082E, "dsb_DE"}, + {0x7C2E, "dsb"}, +}; + ILCID_POSIX_ELEMENT_ARRAY(0x040e, hu, hu_HU) ILCID_POSIX_ELEMENT_ARRAY(0x042b, hy, hy_AM) ILCID_POSIX_ELEMENT_ARRAY(0x0469, ibb, ibb_NG) @@ -686,16 +693,6 @@ ILCID_POSIX_SUBTABLE(ve) { /* TODO: Verify the country */ }; ILCID_POSIX_ELEMENT_ARRAY(0x042a, vi, vi_VN) - -ILCID_POSIX_SUBTABLE(wen) { - {0x2E, "wen"}, - {0x042E, "wen_DE"}, - {0x042E, "hsb_DE"}, - {0x082E, "dsb_DE"}, - {0x7C2E, "dsb"}, - {0x2E, "hsb"} -}; - ILCID_POSIX_ELEMENT_ARRAY(0x0488, wo, wo_SN) ILCID_POSIX_ELEMENT_ARRAY(0x0434, xh, xh_ZA) ILCID_POSIX_ELEMENT_ARRAY(0x043d, yi, yi) @@ -779,6 +776,7 @@ static const ILcidPosixMap gPosixIDmap[] = { ILCID_POSIX_MAP(he), /* he Hebrew (formerly iw) 0x0d */ ILCID_POSIX_MAP(hi), /* hi Hindi 0x39 */ ILCID_POSIX_MAP(hr), /* * Croatian and others 0x1a */ + ILCID_POSIX_MAP(hsb), /* hsb Upper Sorbian 0x2e */ ILCID_POSIX_MAP(hu), /* hu Hungarian 0x0e */ ILCID_POSIX_MAP(hy), /* hy Armenian 0x2b */ ILCID_POSIX_MAP(ibb), /* ibb Ibibio - Nigeria 0x69 */ @@ -868,7 +866,6 @@ static const ILcidPosixMap gPosixIDmap[] = { ILCID_POSIX_MAP(uz), /* uz Uzbek 0x43 */ ILCID_POSIX_MAP(ve), /* ve Venda 0x33 */ ILCID_POSIX_MAP(vi), /* vi Vietnamese 0x2a */ - ILCID_POSIX_MAP(wen), /* wen Sorbian 0x2e */ ILCID_POSIX_MAP(wo), /* wo Wolof 0x88 */ ILCID_POSIX_MAP(xh), /* xh Xhosa 0x34 */ ILCID_POSIX_MAP(yi), /* yi Yiddish 0x3d */ diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 135a2a5c506..1d9219ee375 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -480,7 +480,7 @@ testLCID(UResourceBundle *currentBundle, log_verbose("WARNING: %-5s resolves to %s (0x%.4x)\n", localeName, lcidStringC, expectedLCID); } - else if (strncmp(localeName, "hsb", 3) != 0 || !log_knownIssue("11216", "Duplicate LCID mapping for language hsb")) { + else { log_err("ERROR: %-5s has 0x%.4x and the number resolves wrongfully to %s\n", localeName, expectedLCID, lcidStringC); }