From 4b1124162c4476a95a8d662675f852596cf315d1 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 21 May 2002 21:06:07 +0000 Subject: [PATCH] ICU-1906 Update TP/TMP -> TL/TLS for East Timor X-SVN-Rev: 8651 --- icu4c/source/common/uloc.c | 12 ++++++------ icu4c/source/data/locales/fr.txt | 2 +- icu4c/source/data/locales/hi.txt | 2 +- icu4c/source/data/locales/ja.txt | 2 +- icu4c/source/data/locales/ko.txt | 2 +- icu4c/source/data/locales/mt.txt | 2 +- icu4c/source/data/locales/root.txt | 2 +- icu4c/source/data/locales/th.txt | 2 +- icu4c/source/data/locales/zh.txt | 2 +- icu4c/source/data/locales/zh_TW.txt | 2 +- icu4c/source/test/cintltst/cloctst.c | 4 ++++ 11 files changed, 19 insertions(+), 15 deletions(-) diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c index 6a5b2583629..02ad115007c 100644 --- a/icu4c/source/common/uloc.c +++ b/icu4c/source/common/uloc.c @@ -296,12 +296,12 @@ static const char * const _countries[] = { "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", - "TK", "TM", "TN", "TO", "TP", "TR", "TT", "TV", + "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "YU", "ZA", "ZM", "ZW", NULL, - "FX", "RO", "ZR", /* obsolete country codes */ + "FX", "RO", "TP", "ZR", /* obsolete country codes */ NULL }; @@ -360,8 +360,8 @@ static const char * const _countries3[] = { "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV", /* "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", */ "SYR", "SWZ", "TCA", "TCD", "ATF", "TGO", "THA", "TJK", -/* "TK", "TM", "TN", "TO", "TP", "TR", "TT", "TV", */ - "TKL", "TKM", "TUN", "TON", "TMP", "TUR", "TTO", "TUV", +/* "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", */ + "TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV", /* "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", */ "TWN", "TZA", "UKR", "UGA", "UMI", "USA", "URY", "UZB", /* "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", */ @@ -369,8 +369,8 @@ static const char * const _countries3[] = { /* "WS", "YE", "YT", "YU", "ZA", "ZM", "ZW", */ "WSM", "YEM", "MYT", "YUG", "ZAF", "ZMB", "ZWE", NULL, -/* "FX", "RO", "ZR", */ - "FXX", "ROM", "ZAR", +/* "FX", "RO", "TP", "ZR", */ + "FXX", "ROM", "TMP", "ZAR", NULL }; diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index f8d0d1bc144..b8dc9bf0005 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -46,7 +46,7 @@ fr { DK { "Danemark" } DM { "Dominique" } DO { "R\u00e9publique Dominicaine" } - TP { "Timor Oriental" } + TL { "Timor Oriental" } EC { "Equateur" } EG { "Egypte" } GQ { "Guin\u00e9e Equatoriale" } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index d53191f059c..3dea2bb7ee7 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -181,7 +181,7 @@ hi { VI { "\u0908\u0909, \u090f\u0938 " "\u0935\u0930\u094d\u091c\u0940\u0928 " "\u0906\u0908\u0932\u0948\u0902\u0921\u0938\u094d" } - TP { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" } + TL { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" } //HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" } VU { "\u0938\u093e\u0928\u0941\u0905\u0924\u0941" } // CHECK - #12 HN { "\u0939\u093e\u0945\u0928\u0921\u0941\u0930\u093e\u0938" } diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index 2a2a6a640d0..69e7ed15528 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -1364,7 +1364,7 @@ ja { DJ { "\u30b8\u30d6\u30c1" } DM { "\u30c9\u30df\u30cb\u30ab\u56fd" } DO { "\u30c9\u30df\u30cb\u30ab\u5171\u548c\u56fd" } - TP { "\u6771\u30c6\u30a3\u30e2\u30fc\u30eb" } + TL { "\u6771\u30c6\u30a3\u30e2\u30fc\u30eb" } EC { "\u30a8\u30af\u30a2\u30c9\u30eb" } EG { "\u30a8\u30b8\u30d7\u30c8" } SV { "\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb" } diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index 2885df73b66..ac287fafd84 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -1875,7 +1875,7 @@ ko { DJ { "\uc9c0\ubd80\ud2f0" } DM { "\ub3c4\ubbf8\ub2c8\uce74" } DO { "\ub3c4\ubbf8\ub2c8\uce74 \uacf5\ud654\uad6d" } - TP { "\ub3d9\ud2f0\ubaa8\ub974" } + TL { "\ub3d9\ud2f0\ubaa8\ub974" } EC { "\uc5d0\ucfe0\uc544\ub3c4\ub974" } EG { "\uc774\uc9d1\ud2b8" } SV { "\uc5d8\uc0b4\ubc14\ub3c4\ub974" } diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt index 8de3d79c583..6e926579e45 100644 --- a/icu4c/source/data/locales/mt.txt +++ b/icu4c/source/data/locales/mt.txt @@ -651,7 +651,7 @@ mt { //TM { "Turkmenistan" } // Turkmenistan TN { "Tuneż" } // Tunisia //TO { "Tonga" } // Tonga - TP { "Timor tal-Lvant" } // East Timor + TL { "Timor tal-Lvant" } // East Timor TR { "Turkija" } // Turkey TT { "Trinidad u Tobago" } // Trinidad and Tobago TW { "Tajwan" } // Taiwan diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index ae0baef4e06..4fac28a998e 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -603,7 +603,7 @@ root { TM { "Turkmenistan" } TN { "Tunisia" } TO { "Tonga" } - TP { "East Timor" } + TL { "East Timor" } TR { "Turkey" } TT { "Trinidad and Tobago" } TV { "Tuvalu" } diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 8963fde1703..ea83208f8c5 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -204,7 +204,7 @@ th { DJ { "\u0e14\u0e34\u0e42\u0e1a\u0e15\u0e34" } DM { "\u0e42\u0e14\u0e21\u0e34\u0e19\u0e34\u0e01\u0e49\u0e32" } DO { "\u0e2a\u0e32\u0e18\u0e32\u0e23\u0e13\u0e23\u0e31\u0e10\u0e42\u0e14\u0e21\u0e34\u0e19\u0e34\u0e01\u0e31\u0e19" } - TP { "\u0e15\u0e34\u0e21\u0e2d\u0e23\u0e4c\u0e15\u0e30\u0e27\u0e31\u0e19\u0e2d\u0e2d\u0e01" } + TL { "\u0e15\u0e34\u0e21\u0e2d\u0e23\u0e4c\u0e15\u0e30\u0e27\u0e31\u0e19\u0e2d\u0e2d\u0e01" } EC { "\u0e40\u0e2d\u0e01\u0e27\u0e32\u0e14\u0e2d\u0e23\u0e4c" } EG { "\u0e2d\u0e35\u0e22\u0e34\u0e1b\u0e15\u0e4c" } SV { "\u0e40\u0e2d\u0e25\u0e0b\u0e32\u0e27\u0e32\u0e14\u0e2d\u0e23\u0e4c" } diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 55d525a5582..5ae38959832 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -821,7 +821,7 @@ zh { DJ { "\u5409\u5e03\u63d0" } DM { "\u591a\u7c73\u5c3c\u52a0\u8054\u90a6" } DO { "\u591a\u7c73\u5c3c\u52a0\u5171\u548c\u56fd" } - TP { "\u4e1c\u5e1d\u6c76" } + TL { "\u4e1c\u5e1d\u6c76" } EC { "\u5384\u74dc\u591a\u5c14" } EG { "\u57c3\u53ca" } SV { "\u8428\u5c14\u74e6\u591a" } diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt index 34a4ea2c7be..3d5beb929e7 100644 --- a/icu4c/source/data/locales/zh_TW.txt +++ b/icu4c/source/data/locales/zh_TW.txt @@ -1152,7 +1152,7 @@ zh_TW { DJ { "吉布地" } DM { "多明尼加" } DO { "多明尼加共和國" } - TP { "東帝文" } + TL { "東帝文" } EC { "厄瓜多爾" } EG { "埃及" } SV { "薩爾瓦多" } diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index eed161a42f7..0a700b6ca32 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -1080,11 +1080,15 @@ static void TestObsoleteNames(void) { "sh", "srp", "sh", "", "" }, { "zz_FX", "", "zz", "FXX", "FX" }, { "zz_RO", "", "zz", "ROU", "RO" }, + { "zz_TP", "", "zz", "TMP", "TP" }, + { "zz_TL", "", "zz", "TLS", "TL" }, { "zz_ZR", "", "zz", "ZAR", "ZR" }, { "zz_FXX", "", "zz", "FXX", "FX" }, /* no aliasing. Doesn't go to PS(PSE). */ { "zz_ROM", "", "zz", "ROU", "RO" }, { "zz_ROU", "", "zz", "ROU", "RO" }, { "zz_ZAR", "", "zz", "ZAR", "ZR" }, + { "zz_TMP", "", "zz", "TMP", "TP" }, + { "zz_TLS", "", "zz", "TLS", "TL" }, { "mlt_PSE", "mlt", "mt", "PSE", "PS" }, { "iw", "heb", "iw", "", "" }, { "ji", "yid", "ji", "", "" },