diff --git a/nls/locale.nls b/nls/locale.nls index 22f96a93b24..0a397e9ea61 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 29c721a25d8..4dde6c010ee 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,8 +26,8 @@ use Encode; use Time::Local qw(timegm_modern); my $UNIVERSION = "15.0.0"; -my $CLDRVERSION = "42"; -my $ISO639VERSION = "20220120"; +my $CLDRVERSION = "43"; +my $ISO639VERSION = "20230123"; my $TZVERSION = "2023c"; my %data_files = @@ -39,7 +39,7 @@ my %data_files = idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", sha => "cc8522199541d60326a42a8f91f8748fd15630a42502dd2cf4878e81e2066ead" }, cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.zip", - sha => "275c37b1373a1c8461c14d2fe9e3b7b47ba24ea89e3fdd2dedfe0547ab2f07dc" }, + sha => "132cdd24e479abb6e86db1429931cec3dada485fd41da39ece3c08e531c477df" }, cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows 10 Sorting Weight Table.txt", @@ -47,7 +47,7 @@ my %data_files = codepages => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip", sha => "5074e6dd253056ba61fc6c870c9a955467855129c6ad3a51761c386b301b125a" }, iso639 => { url => "https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3_Code_Tables_$ISO639VERSION.zip", - sha => "d912749d10c344835f052a9f31d13f13d5ffc99bc589e1eb88f2b4663e990881" }, + sha => "884faa6cc5ac5181ed7969eed75355c1bc665447614cf4c06c62e87b38fe6a97" }, ksx1001 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/KSX1001.TXT", sha => "d8d2a35206ac0ea2865f5d801c9d6717f735bf46f263a658a64a960abe59e371" }, jis0208 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT", @@ -461,10 +461,10 @@ my %joining_types = my @locales = ( { name => "", lcid => 0x0000007f, file => "root", territory => "IV", sabbrevlangname => "IVL", sopentypelang =>"dflt" }, - { name => "aa", dir => "seed", sopentypelang => "AFR" }, - { name => "aa-DJ", dir => "seed" }, - { name => "aa-ER", dir => "seed" }, - { name => "aa-ET", dir => "seed" }, + { name => "aa", sopentypelang => "AFR" }, + { name => "aa-DJ" }, + { name => "aa-ER" }, + { name => "aa-ET" }, { name => "af", lcid => 0x00000036, oemcp => 850, sabbrevlangname => "AFK", sopentypelang => "AFK" }, { name => "af-NA" }, { name => "af-ZA", lcid => 0x00000436 }, @@ -503,8 +503,8 @@ my @locales = { name => "ar-TD" }, { name => "ar-TN", lcid => 0x00001c01, sabbrevlangname => "ART", nativedigits => "0123456789" }, { name => "ar-YE", lcid => 0x00002401, sabbrevlangname => "ARY" }, - { name => "arn", lcid => 0x0000007a, oemcp => 850, ebcdiccp => 20284, slist => ",", dir => "seed", sabbrevlangname => "MPD", sopentypelang => "MAP" }, - { name => "arn-CL", lcid => 0x0000047a, dir => "seed" }, + { name => "arn", lcid => 0x0000007a, oemcp => 850, ebcdiccp => 20284, slist => ",", sabbrevlangname => "MPD", sopentypelang => "MAP" }, + { name => "arn-CL", lcid => 0x0000047a }, { name => "arn-Latn", alias => "arn" }, { name => "arn-Latn-CL", alias => "arn-CL" }, { name => "as", lcid => 0x0000004d, slist => ",", group => 15 }, @@ -518,10 +518,10 @@ my @locales = { name => "az-Cyrl-AZ", lcid => 0x0000082c }, { name => "az-Latn", lcid => 0x0000782c }, { name => "az-Latn-AZ", lcid => 0x0000042c }, - { name => "ba", lcid => 0x0000006d, oemcp => 866, group => 5, dir => "seed", sabbrevlangname => "BAS", sopentypelang => "BSH" }, + { name => "ba", lcid => 0x0000006d, oemcp => 866, group => 5, sabbrevlangname => "BAS", sopentypelang => "BSH" }, { name => "ba-Cyrl", alias => "ba" }, { name => "ba-Cyrl-RU", alias => "ba-RU" }, - { name => "ba-RU", lcid => 0x0000046d, dir => "seed" }, + { name => "ba-RU", lcid => 0x0000046d }, { name => "bas" }, { name => "bas-CM" }, { name => "be", lcid => 0x00000023, oemcp => 866, ebcdiccp => 500, group => 5 }, @@ -558,8 +558,8 @@ my @locales = { name => "bs-Cyrl-BA", lcid => 0x0000201a }, { name => "bs-Latn", lcid => 0x0000681a }, { name => "bs-Latn-BA", lcid => 0x0000141a }, - { name => "byn", dir => "seed", sopentypelang => "BIL" }, - { name => "byn-ER", dir => "seed" }, + { name => "byn", sopentypelang => "BIL" }, + { name => "byn-ER" }, { name => "ca", lcid => 0x00000003, oemcp => 850 }, { name => "ca-AD", maccp => 65001 }, { name => "ca-ES", lcid => 0x00000403 }, @@ -587,14 +587,14 @@ my @locales = { name => "ckb", alias => "ku" }, { name => "ckb-IQ", alias => "ku-Arab-IQ" }, { name => "ckb-IR", alias => "ku-Arab-IR" }, - { name => "co", lcid => 0x00000083, oemcp => 850, ebcdiccp => 20297, dir => "seed" }, - { name => "co-FR", lcid => 0x00000483, dir => "seed" }, + { name => "co", lcid => 0x00000083, oemcp => 850, ebcdiccp => 20297 }, + { name => "co-FR", lcid => 0x00000483 }, { name => "co-Latn", alias => "co" }, { name => "co-Latn-FR", alias => "co-FR" }, { name => "cs", lcid => 0x00000005, oemcp => 852, group => 2, sabbrevlangname => "CSY", sopentypelang => "CSY" }, { name => "cs-CZ", lcid => 0x00000405 }, - { name => "cu", dir => "seed", sopentypelang => "CSL" }, - { name => "cu-RU", dir => "seed" }, + { name => "cu", sopentypelang => "CSL" }, + { name => "cu-RU" }, { name => "cy", lcid => 0x00000052, oemcp => 850, ebcdiccp => 20285, sabbrevlangname => "CYM", sopentypelang => "WEL" }, { name => "cy-GB", lcid => 0x00000452 }, { name => "da", lcid => 0x00000006, oemcp => 850, ebcdiccp => 20277 }, @@ -622,8 +622,8 @@ my @locales = { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, { name => "dua-CM" }, - { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, dir => "seed", nativedigits => "0123456789" }, - { name => "dv-MV", lcid => 0x00000465, dir => "seed" }, + { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, nativedigits => "0123456789" }, + { name => "dv-MV", lcid => 0x00000465 }, { name => "dyo" }, { name => "dyo-SN" }, { name => "dz", sopentypelang => "DZN" }, @@ -888,8 +888,8 @@ my @locales = { name => "gd-Latn", alias => "gd" }, { name => "gl", lcid => 0x00000056, oemcp => 850, sabbrevlangname => "GLC", sopentypelang => "GAL" }, { name => "gl-ES", lcid => 0x00000456 }, - { name => "gn", lcid => 0x00000074, oemcp => 850, ebcdiccp => 20284, slist => ",", dir => "seed", sopentypelang => "GUA" }, - { name => "gn-PY", lcid => 0x00000474, dir => "seed" }, + { name => "gn", lcid => 0x00000074, oemcp => 850, ebcdiccp => 20284, slist => ",", sopentypelang => "GUA" }, + { name => "gn-PY", lcid => 0x00000474 }, { name => "gsw", lcid => 0x00000084, oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "ZZZ", sopentypelang => "ALS" }, { name => "gsw-CH" }, { name => "gsw-FR", lcid => 0x00000484, sabbrevlangname => "GSW" }, @@ -948,11 +948,11 @@ my @locales = { name => "it-IT", lcid => 0x00000410 }, { name => "it-SM" }, { name => "it-VA", oemcp => 65001 }, - { name => "iu", lcid => 0x0000005d, oemcp => 437, slist => ",", sortlocale => "iu-Latn-CA", dir => "seed", sabbrevlangname => "IUK", sopentypelang => "INU" }, - { name => "iu-Cans", lcid => 0x0000785d, file => "iu", oemcp => 65001, dir => "seed", sabbrevlangname => "IUS" }, - { name => "iu-Cans-CA", lcid => 0x0000045d, file => "iu_CA", dir => "seed" }, - { name => "iu-Latn", lcid => 0x00007c5d, dir => "seed" }, - { name => "iu-Latn-CA", lcid => 0x0000085d, dir => "seed" }, + { name => "iu", lcid => 0x0000005d, oemcp => 437, slist => ",", sortlocale => "iu-Latn-CA", sabbrevlangname => "IUK", sopentypelang => "INU" }, + { name => "iu-Cans", lcid => 0x0000785d, file => "iu", oemcp => 65001, sabbrevlangname => "IUS" }, + { name => "iu-Cans-CA", lcid => 0x0000045d, file => "iu_CA" }, + { name => "iu-Latn", lcid => 0x00007c5d }, + { name => "iu-Latn-CA", lcid => 0x0000085d }, { name => "ja", lcid => 0x00000011, ireadinglayout => 2, oemcp => 932, slist => ",", sscripts => "Hani Hira Jpan Kana", group => 7, sopentypelang => "JAN" }, { name => "ja-JP", lcid => 0x00000411 }, { name => "ja-JP_radstr", lcid => 0x00040411, alias => "ja-JP" }, @@ -1029,8 +1029,8 @@ my @locales = { name => "ky-Cyrl", alias => "ky" }, { name => "ky-Cyrl-KG", alias => "ky-KG" }, { name => "ky-KG", lcid => 0x00000440 }, - { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "la-VA", lcid => 0x00000476, dir => "seed" }, + { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", sabbrevlangname => "ZZZ" }, + { name => "la-VA", lcid => 0x00000476 }, { name => "la-001", alias => "la-VA" }, { name => "lag" }, { name => "lag-TZ" }, @@ -1087,15 +1087,15 @@ my @locales = { name => "mn-Cyrl", lcid => 0x00007850, file => "mn", sabbrevlangname => "MNN" }, { name => "mn-Cyrl-MN", alias => "mn-MN" }, { name => "mn-MN", lcid => 0x00000450, sparent => "mn-Cyrl", group => 5 }, - { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, dir => "seed", sabbrevlangname => "MNG", nativedigits => "0123456789" }, - { name => "mn-Mong-CN", lcid => 0x00000850, dir => "seed" }, - { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, + { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, sabbrevlangname => "MNG", nativedigits => "0123456789" }, + { name => "mn-Mong-CN", lcid => 0x00000850 }, + { name => "mn-Mong-MN", lcid => 0x00000c50, sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, { name => "mni-IN", lcid => 0x00000458, file => "mni_Beng_IN" }, { name => "mni-Beng" }, { name => "mni-Beng-IN", alias => "mni-IN" }, - { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", dir => "seed", sabbrevlangname => "MWK" }, - { name => "moh-CA", lcid => 0x0000047c, dir => "seed" }, + { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", sabbrevlangname => "MWK" }, + { name => "moh-CA", lcid => 0x0000047c }, { name => "moh-Latn", alias => "moh" }, { name => "moh-Latn-CA", alias => "moh-CA" }, { name => "mr", lcid => 0x0000004e, slist => ",", group => 15 }, @@ -1145,12 +1145,12 @@ my @locales = { name => "nnh" }, { name => "nnh-CM" }, { name => "no", lcid => 0x00000014, oemcp => 850, ebcdiccp => 20277, sortlocale => "nb-NO" }, - { name => "nqo", idigits => 3, inegnumber => 3, slist => "\x{060c}", dir => "seed", sopentypelang => "NKO" }, - { name => "nqo-GN", dir => "seed" }, - { name => "nr", dir => "seed", sopentypelang => "NDB" }, - { name => "nr-ZA", dir => "seed" }, - { name => "nso", lcid => 0x0000006c, oemcp => 850, dir => "seed", sopentypelang => "SOT" }, - { name => "nso-ZA", lcid => 0x0000046c, dir => "seed" }, + { name => "nqo", idigits => 3, inegnumber => 3, slist => "\x{060c}", sopentypelang => "NKO" }, + { name => "nqo-GN" }, + { name => "nr", sopentypelang => "NDB" }, + { name => "nr-ZA" }, + { name => "nso", lcid => 0x0000006c, oemcp => 850, sopentypelang => "SOT" }, + { name => "nso-ZA", lcid => 0x0000046c }, { name => "nus" }, { name => "nus-SD", alias => "nus-SS" }, { name => "nus-SS" }, @@ -1174,7 +1174,7 @@ my @locales = { name => "pa-Guru" }, { name => "pa-Guru-IN", alias => "pa-IN" }, { name => "pa-IN", lcid => 0x00000446, sparent => "pa-Guru", file => "pa_Guru_IN", group => 15 }, -## name => "pap", lcid => 0x00000079 }, + { name => "pap", lcid => 0x00000079, oemcp => 850, sopentypelang => "PAP0" }, ## name => "pap-029", lcid => 0x00000479 }, { name => "pcm" }, { name => "pcm-NG", alias => "pcm-Latn-NG" }, @@ -1182,8 +1182,8 @@ my @locales = { name => "pcm-Latn-NG", file => "pcm_NG" }, { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, -## name => "prg" }, -## name => "prg-001" }, + { name => "prg" }, + { name => "prg-001" }, { name => "prs", lcid => 0x0000008c, file => "fa", inegnumber => 3, oemcp => 720, group => 13, sopentypelang => "DRI" }, { name => "prs-AF", lcid => 0x0000048c, file => "fa_AF" }, { name => "prs-Arab", alias => "prs" }, @@ -1212,9 +1212,9 @@ my @locales = { name => "qu-BO", alias => "quz-BO" }, { name => "qu-EC", alias => "quz-EC" }, { name => "qu-PE", alias => "quz-PE" }, - { name => "quc", lcid => 0x00000086, oemcp => 850, ebcdiccp => 20284, slist => ",", dir => "seed" }, - { name => "quc-Latn", lcid => 0x00007c86, file => "quc", dir => "seed" }, - { name => "quc-Latn-GT", lcid => 0x00000486, file => "quc_GT", dir => "seed" }, + { name => "quc", lcid => 0x00000086, oemcp => 850, ebcdiccp => 20284, slist => "," }, + { name => "quc-Latn", lcid => 0x00007c86, file => "quc" }, + { name => "quc-Latn-GT", lcid => 0x00000486, file => "quc_GT" }, { name => "qut", alias => "quc" }, { name => "qut-GT", alias => "quc-Latn-GT" }, { name => "quz", lcid => 0x0000006b, file => "qu", territory => "BO", oemcp => 850, ebcdiccp => 20284, slist => "," }, @@ -1293,18 +1293,18 @@ my @locales = { name => "sk-SK", lcid => 0x0000041b }, { name => "sl", lcid => 0x00000024, oemcp => 852, ebcdiccp => 20880, group => 2 }, { name => "sl-SI", lcid => 0x00000424 }, - { name => "sma", lcid => 0x0000783b, sparent => "se", ebcdiccp => 20278, dir => "seed", sabbrevlangname => "SMB", sopentypelang => "SSM" }, + { name => "sma", lcid => 0x0000783b, sparent => "se", ebcdiccp => 20278, sabbrevlangname => "SMB", sopentypelang => "SSM" }, { name => "sma-Latn", alias => "sma" }, { name => "sma-Latn-NO", alias => "sma-NO" }, { name => "sma-Latn-SE", alias => "sma-SE" }, - { name => "sma-NO", lcid => 0x0000183b, ebcdiccp => 20277, dir => "seed", sabbrevlangname => "SMA" }, - { name => "sma-SE", lcid => 0x00001c3b, dir => "seed" }, - { name => "smj", lcid => 0x00007c3b, sparent => "se", ebcdiccp => 20278, dir => "seed", sabbrevlangname => "SMK", sopentypelang => "LSM" }, + { name => "sma-NO", lcid => 0x0000183b, ebcdiccp => 20277, sabbrevlangname => "SMA" }, + { name => "sma-SE", lcid => 0x00001c3b }, + { name => "smj", lcid => 0x00007c3b, sparent => "se", ebcdiccp => 20278, sabbrevlangname => "SMK", sopentypelang => "LSM" }, { name => "smj-Latn", alias => "smj" }, { name => "smj-Latn-NO", alias => "smj-NO" }, { name => "smj-Latn-SE", alias => "smj-SE" }, - { name => "smj-NO", lcid => 0x0000103b, ebcdiccp => 20277, dir => "seed", sabbrevlangname => "SMJ" }, - { name => "smj-SE", lcid => 0x0000143b, dir => "seed" }, + { name => "smj-NO", lcid => 0x0000103b, ebcdiccp => 20277, sabbrevlangname => "SMJ" }, + { name => "smj-SE", lcid => 0x0000143b }, { name => "smn", lcid => 0x0000703b, sparent => "se", ebcdiccp => 20278, sopentypelang => "ISM" }, { name => "smn-FI", lcid => 0x0000243b }, { name => "smn-Latn", alias => "smn" }, @@ -1339,14 +1339,14 @@ my @locales = { name => "sr-Latn-XK" }, ## name => "sr-Cyrl-CS", lcid => 0x00000c1a }, ## name => "sr-Latn-CS", lcid => 0x0000081a }, - { name => "ss", dir => "seed", sopentypelang => "SWZ" }, - { name => "ss-SZ", dir => "seed" }, - { name => "ss-ZA", dir => "seed" }, - { name => "ssy", dir => "seed" }, - { name => "ssy-ER", dir => "seed" }, - { name => "st", lcid => 0x00000030, dir => "seed" }, - { name => "st-LS", dir => "seed" }, - { name => "st-ZA", lcid => 0x00000430, dir => "seed" }, + { name => "ss", sopentypelang => "SWZ" }, + { name => "ss-SZ" }, + { name => "ss-ZA" }, + { name => "ssy" }, + { name => "ssy-ER" }, + { name => "st", lcid => 0x00000030 }, + { name => "st-LS" }, + { name => "st-ZA", lcid => 0x00000430 }, { name => "su" }, { name => "su-Latn" }, { name => "su-Latn-ID" }, @@ -1360,8 +1360,8 @@ my @locales = { name => "sw-TZ" }, { name => "sw-UG" }, { name => "swc-CD", alias => "sw-CD" }, - { name => "syr", lcid => 0x0000005a, slist => ",", group => 13, dir => "seed" }, - { name => "syr-SY", lcid => 0x0000045a, dir => "seed" }, + { name => "syr", lcid => 0x0000005a, slist => ",", group => 13 }, + { name => "syr-SY", lcid => 0x0000045a }, { name => "syr-Syrc", alias => "syr" }, { name => "syr-Syrc-SY", alias => "syr-SY" }, { name => "ta", lcid => 0x00000049, slist => ",", group => 15, sabbrevlangname => "TAI" }, @@ -1383,23 +1383,23 @@ my @locales = { name => "ti", lcid => 0x00000073, territory => "ER", sopentypelang => "TGY" }, { name => "ti-ER", lcid => 0x00000873 }, { name => "ti-ET", lcid => 0x00000473, sabbrevlangname => "TIE" }, - { name => "tig", dir => "seed", sopentypelang => "TGR" }, - { name => "tig-ER", dir => "seed" }, + { name => "tig", sopentypelang => "TGR" }, + { name => "tig-ER" }, { name => "tig-Ethi-ER", alias => "tig-ER" }, { name => "tk", lcid => 0x00000042, oemcp => 852, ebcdiccp => 20880, group => 2, sopentypelang => "TKM" }, { name => "tk-Latn", alias => "tk" }, { name => "tk-Latn-TM", alias => "tk-TM" }, { name => "tk-TM", lcid => 0x00000442 }, - { name => "tn", lcid => 0x00000032, oemcp => 850, dir => "seed", sopentypelang => "TNA" }, - { name => "tn-BW", lcid => 0x00000832, dir => "seed", sabbrevlangname => "TSB" }, - { name => "tn-ZA", lcid => 0x00000432, dir => "seed" }, + { name => "tn", lcid => 0x00000032, oemcp => 850, sopentypelang => "TNA" }, + { name => "tn-BW", lcid => 0x00000832, sabbrevlangname => "TSB" }, + { name => "tn-ZA", lcid => 0x00000432 }, { name => "to", sopentypelang => "TGN" }, { name => "to-TO" }, { name => "tr", lcid => 0x0000001f, oemcp => 857, ebcdiccp => 20905, group => 6, sabbrevlangname => "TRK", sopentypelang => "TRK" }, { name => "tr-CY" }, { name => "tr-TR", lcid => 0x0000041f }, - { name => "ts", lcid => 0x00000031, dir => "seed", sopentypelang => "TSG" }, - { name => "ts-ZA", lcid => 0x00000431, dir => "seed" }, + { name => "ts", lcid => 0x00000031, sopentypelang => "TSG" }, + { name => "ts-ZA", lcid => 0x00000431 }, { name => "tt", lcid => 0x00000044, oemcp => 866, group => 5, sabbrevlangname => "TTT" }, { name => "tt-Cyrl", alias => "tt" }, { name => "tt-Cyrl-RU", alias => "tt-RU" }, @@ -1437,20 +1437,20 @@ my @locales = { name => "vai-Latn-LR" }, { name => "vai-Vaii" }, { name => "vai-Vaii-LR" }, - { name => "ve", lcid => 0x00000033, dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "ve-ZA", lcid => 0x00000433, dir => "seed" }, + { name => "ve", lcid => 0x00000033, sabbrevlangname => "ZZZ" }, + { name => "ve-ZA", lcid => 0x00000433 }, { name => "vi", lcid => 0x0000002a, oemcp => 1258, slist => ",", group => 14, sabbrevlangname => "VIT", sopentypelang => "VIT" }, { name => "vi-VN", lcid => 0x0000042a }, - { name => "vo", dir => "seed" }, - { name => "vo-001", dir => "seed" }, + { name => "vo" }, + { name => "vo-001" }, { name => "vun" }, { name => "vun-TZ" }, - { name => "wa", dir => "seed", oemcp => 850 }, - { name => "wa-BE", dir => "seed" }, + { name => "wa", oemcp => 850 }, + { name => "wa-BE" }, { name => "wae" }, { name => "wae-CH" }, - { name => "wal", dir => "seed" }, - { name => "wal-ET", dir => "seed" }, + { name => "wal" }, + { name => "wal-ET" }, { name => "wo", lcid => 0x00000088, oemcp => 850, ebcdiccp => 20297, sopentypelang => "WLF" }, { name => "wo-Latn", alias => "wo" }, { name => "wo-Latn-SN", alias => "wo-SN" }, @@ -4411,7 +4411,7 @@ sub convert_time_format($) sub load_iso639() { my %iso639; - my $DATA = open_data_file( "iso639", "iso-639-3_Code_Tables_$ISO639VERSION/iso-639-3.tab" ); + my $DATA = open_data_file( "iso639", "iso-639-3_Code_Tables_$ISO639VERSION/iso-639-3_$ISO639VERSION.tab" ); while (<$DATA>) { if (/^\s*[a-z]{3}\s+[a-z]{3}\s+([a-z]{3})\s+([a-z]{2})\s/) { $iso639{$2} = $1; } @@ -4448,7 +4448,7 @@ sub build_locale_data() next if $loc->{name} eq ""; next if defined $loc->{parent}; (my $unix_name = $loc->{name}) =~ s/-/_/g; - my $parent = xml_query( $suppl, "/supplementalData/parentLocales/parentLocale[contains(concat(' ',\@locales,' '),' $unix_name ')]/\@parent" ); + my $parent = xml_query( $suppl, "/supplementalData/parentLocales[not(\@component)]/parentLocale[contains(concat(' ',\@locales,' '),' $unix_name ')]/\@parent" ); if ($parent) { $parent =~ s/_/-/g;