organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-21776 integrate CLDR release-40-beta2 to ICU maint/maint-70

Browse source
This commit is contained in:
Peter Edberg 2021-10-06 00:27:34 -07:00 • committed by Peter Edberg
parent d9043765b0
commit 38337a53c0
11 changed files with 238 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4c/source/data/locales/sr.txt
View file

@ -863,18 +863,18 @@ sr{
"д",
}
wide{
"јануара",
"фебруара",
"марта",
"априла",
"маја",
"јуна",
"јула",
"августа",
"септембра",
"октобра",
"новембра",
"децембра",
"јануар",
"фебруар",
"март",
"април",
"мај",
"јун",
"јул",
"август",
"септембар",
"октобар",
"новембар",
"децембар",
}
}
stand-alone{

24
icu4c/source/data/locales/sr_Latn.txt
View file

@ -864,18 +864,18 @@ sr_Latn{
"d",
}
wide{
"januara",
"februara",
"marta",
"aprila",
"maja",
"juna",
"jula",
"avgusta",
"septembra",
"oktobra",
"novembra",
"decembra",
"januar",
"februar",
"mart",
"april",
"maj",
"jun",
"jul",
"avgust",
"septembar",
"oktobar",
"novembar",
"decembar",
}
}
stand-alone{

377
icu4c/source/data/misc/langInfo.txt
View file

@ -2525,24 +2525,25 @@ f006f045f947fa49e13fe541ea4302e9
"5",
"6",
"0123456",
"03",
"16",
"02",
"05",
"04",
"012346",
"13",
"02",
"06",
"026",
"05",
"012345",
}
regionToPartitions:bin{
000008090a00020000000b0009000201
090001010a000a000000000000000a0c
00000001010000000100000000000000
000000010b0000000100000000000000
000000000000010100000b0000000b00
00000000000000000000000000000000
00000000000000000000000000000000
00000000000000000000000000000000
00000000000000000000000000000000
0000000000000000000000000000000c
010001000000000d0100000d01000000
0000000000000000000000000000000d
010001000000000e0100000e01000000
00000000000000000000000000000000
00000000000000000000000000000000
00000000000000000000000900000000
@ -2598,39 +2599,39 @@ f006f045f947fa49e13fe541ea4302e9
00000000000000000000000101010102
00020000010102010001020301010002
01000101020001010101010101000202
01020002020201010201000102020001
01020002020201010201000102040001
01000101010100010201010201000201
00020102010101000000010100010000
01010002000200000000000000000000
04010002000100010400000000000000
05010002000100010500000000000000
00000101010100000000010000000000
00000001010200010001000001000000
00000100000105000201020101010000
00000100000106000201020101010000
02010100020101020203000100020000
00000000000000000006000102000000
00000000000000000007000102000000
01000201000000000000000101010000
00000000010101010001010101000000
00000000000000010000000000000002
00010100000000000000000000000000
00010001010100000001020001000100
00000001000201010102000000000001
00010000000000000101010101000004
00040001010102010300000101010106
03020402010101010201010100010001
00010000000000000101010101000005
00050001010102010300000101010107
03020502010101010201010100010001
01010002000001000001010001000101
00000000010000000000000000000000
00010000000000000000000000000002
00000002010101000001010201000000
07010100000100020001000000000000
00000002010103000001010201000000
04010100000100020001000000000000
00000000000000010000000000010000
00000000000000010000000000000000
00010000000100010001000000010101
01010001010101010101010100000201
01010200020101010002010001010100
01010101040101000100020001010000
01010000000000010000000000030e00
00000007000000000002010100020002
00020007000000000100000000000001
01010101050101000100020001010000
01010000000000010000000000030f00
00000004000000000002010100020002
00020004000000000100000000000001
00000000000000000000010000000000
00000000000000010000000000000000
00000000000000000001000000000000
@ -2640,176 +2641,176 @@ f006f045f947fa49e13fe541ea4302e9
00000000010000000001000000
}
trie:bin{
00196ec43174c1bb77c0d177a28778a2
9179a2a17a046c386daaa1e138e856f5
00196ec42b74c1b177c0c777a27d78a2
8779a2977a046c386daa9be138e856f5
1165ee5d12ed6df335117ae848012a85
4c166174ee48616ef335117ae820022a
8548344c166174ee48616ef34911616e
01e992f41348616ef42007b314b32ab4
26b536b605b3c8bbb329b429b62910b5
292a2bb026b122b205b3c8a7b329b429
b62905b3c89db329b429b6291248616e
01f349f44901752aef1166f25d12f57a
e835016d2ae81165ee5d02eda241f622
f7116de7350369327538e93eef1165ee
5d12e879e93512e57ae8351165ee5c01
2a8548166562f24c6174ee35744a75a2
b476016b2c7212ef65f43501eb22f411
6df3350ee171eb0eeba2a4eea2dfefa2
dcf41172f55de14ee592e7aa53e91165
ee5c012a8545167468e94c6174ee3501
65427410e120012a854c166174ee5461
6dec4910ee5c012a855416616dec4c61
74ee350165427410e520012a854c1661
74ee54656cf54910ee5c012a85541665
6cf54c6174ee356c1c6c366dac187536
7812f96de73512e865ee5d01eda25ef9
126b6cee35643265a2e66b12e76de735
12f86de73505eb18ebb2bcf2a29afa11
72f55c012a854c166174ee437972ec35
722e7a34e7117ae84912eb6df33512f3
75fa3571c16771a2b272a44f730012e8
5bf12df130f234f428f5a825f71165ee
5d107301e829f220022a8543344c1661
74ee437972ec2b167972ec4c6174ee2b
e836e946eb64ee22ef1165ee5d0262ac
3468227310f2291165ee5c012a855316
696ee84c6174ee351163f349702e7052
7258735ee1b20fe41165ee5c012a8541
167261e24c6174ee3512f66ff23512ef
73e33501e8b014f91161e12964346740
68486b12e76de73501e322ee1173e335
13e36b6cee3512f561f23504753a7690
77a26478a26df51165f35d0cec16f30b
f32af726f822f91171f535ec26f022f2
1171f535e709e726e822eb1171f535e2
26e422e61171f5350ded16f00bf02af3
26f722fa1171f535ed26ee22ef1171f5
35e80be82ae926ea22ec1171f535e126
e322e51171f53503e12ae326e822f311
71f5350aef14f409f426f522f71171f5
35ef26f022f21171f535e12ee32ae826
ec22ee1171f5351171f5350361a813ed
30eea285f71166f25d1164e5496ea26f
6fa2d570086b4d6bac0c735ae168f386
f41170f4a28007b3c4cbb3aacfb4aacc
b5aac9b601b129b62901e5a2d5f41170
f3351165ee5c012a8547167572f54c61
74ee351165ee5c012a8541167261e24c
6174ee356234633a65406712e161f235
12f470f33512ed65ee4912ec6df3350a
7946ee19ee2eef38f91165ee5d106e01
e249ef4901647c6e01e223ee497948e2
56e51165ee5c012a8544166576e14c61
74ee3501e4a675ee1165ee5d01642c6e
01ee49ef2310e13161a87c6834693a6c
427312ef65ee5d12e467ee3513f16b6c
ee3513e56c75f935046b54725ce3ae2b
eda2e4f21165ee5c012a854f167279e1
4c6174ee3513e96b6cee3502e3a6cdee
22f3116df33567c3336ac24f6aa2bc6b
a4146ca4b76d00107669ee35eea411f2
4ef374f4a2a1f91165ee5c012a854d16
796df24c6174ee350168a6566d10f220
012a854c166174ee446576e1491169e4
5d7676e7a44fe9a611ec0165426d10ec
20012a854c166174ee4d6c79ed4910ee
5c012a854d166c79ed4c6174ee3512e6
6dee356e1f6e34713a73407512e96df3
3512f07ae83512e76df33501e8aca3e9
116df33561346548664e6912ee6df335
01e92af8116df3351168e94912ef6df3
3502e14ae246e51165ee5d02612ee13a
f61169e44901eb22f8116df335116ae1
20032a8548384b784c166174ee4a7061
ee2b026136694272156bf44a7061ee2b
156ee94a7061ee2b1172e10148464a12
7061ee2b12616ee101482c4a127061ee
2b12726bf42b0aeb73ef36ef2ef57cf9
1172f55d116bef20022a8548464a1261
6def01482c4b126f72e52b12616ee72b
11616e01e722e9134b6f72e52b1174f2
5deba8bbed6aee0165426b10ee20012a
854c166174ee4b6e64e14910ee5c012a
854b166e64e14c6174ee351165ee5c01
2a854b16686df24c6174ee357236763c
7848e14ee71166f25d12e965ee5d01e2
22f2116df33512e46df3351165ee5c01
2a854716656ff24c6174ee350e753ee2
21e24ee7a29dee4cef1165ee5c012a85
4c16616fef4c6174ee351164e5291166
f25d753277387a40e11169f44912e166
f25d13e76c75f93512e87ae8356f2a6f
48724e735c7402e730ef22f3126c75f9
35116cf63512fa65ee5d01e922ed126c
75f93513ed6c75f935634669526b02e2
26ef22f3126c75f935126c75f93501e5
22e6116df33512f76df335676a68a281
6905e40ae4a8b7e734f31165ee49642e
6b36e11165ee5d13e16c75f93512f469
f5350a7531ec1eeca40deea40af50167
286810e95d10f520012a854c166174ee
47756af249752ee122e41165ee4901e9
22ee1167ee3561386b4c6e546f5a7312
f764e52902e1a257eea477f8116fed35
13f06b70e53512f767ee3513ed6b6feb
3507e934e94ef26cf4a820f91172f55c
012a854116726dee437972ec351168e9
20012a854c166174ee446576e1490162
287310e82910f32961326a4c7352e111
65ee5d02e530eba419f71165ee49116f
ed3512e96df33512ee7ae83564c0dd64
8865a248660366327538ef6af9116eec
4912ed66e63506e80be82ae926f122f6
1166e635e226e522e61166e6351166e6
351164e149027434753ae1106e01e231
ef3112f96ee53512f06df33506ee78ee
34efa278f396f51165f3491165eea280
07b317b362b430b55ab601b229b62904
b027b127b327b427b5272a2bb030b12c
b201b229b62904b029b129b329b427b5
291165f3a28007b30cb342b43eb53ab6
01b129b6292a2bb026b14eb204b029b2
29b329b429b52904b029b229b329b429
b52901b129b6296e2e7936e51165ee5d
13e26b6cee3513ef6b6cee3561a26062
a49e630c702ee111e1a2ceefa4ddf32a
f91165ee491173eb49703e72447a01e8
22ef117ae835117ae83512f87ae83512
f366f2496a146a306b366f12e16df335
12f97ae83512e261f25d643065366812
f265ee4912ef7ae83513e26669ec5d00
1675c0c0e692f275f24af9a26cfa1172
f55c012a854c166174ee437972ec3511
61f220012a5a4c166174ee417261e248
07b327b364b426b522b605b436b429b5
29b6298407b313b33cb426b522b605b4
22b429b529b62910b3292a2bb026b122
b205b40fb429b529b62905b406b429b5
29b629b029b129b2291165f349e64aeb
a2b1ed1165ee5c012a8545167468e94c
6174ee35116eec497a137a2ee134e211
72f55d12e261fa35127373f92975a42e
763a7903e82aec26ee22f01161f23512
ec61f23566356c1e6c3e70447203f12a
f326f922fa1161f23512ee73f13501e3
22e41161f235663069366a12f061f235
12e261f23513e97379f235613e624e63
5a64906501e222e31161f23502e526ef
32f41173f13501e822f61161f23505f7
09f726f822f91161f235e82eed22f111
61f2351165ee5d1161f23512e661f235
0e7668ee4aee3eef82f2a0f301682873
10e82910f2290162426510ee5c012a85
4216656ee74c6174ee3510ee20012a85
4c166174ee42656ee749117ae848012a
8554166962f448616ef3351166f24976
327a3ee544e81168e95d01e522f5116d
f33512e36de7351172f549682268346a
3a6d4e7412ea6df33512f26de73501ee
2af1116de735116df33512ed6de73561
3062366512ed65ee5d12ec75f24912fa
61f235
01e97ef41348616ef42007b30ab33eb4
3ab536b610b6292a2bb026b122b205b3
c8b8b329b429b52905b3c8aeb329b429
b5291248616e01f349f44901752aef11
66f25d12f57ae835016d2ae81165ee5d
02eda241f622f7116de7350369327538
e93eef1165ee5d12e879e93512e57ae8
351165ee5c012a8548166562f24c6174
ee35744a75a2b476016b2c7212ef65f4
3501eb22f4116df3350ee171eb0eeba2
a4eea2dfefa2dcf41172f55de14ee592
e7aa57e91165ee5c012a8545167468e9
4c6174ee350165427410e120012a854c
166174ee54616dec4910ee5c012a8554
16616dec4c6174ee350165427410e520
012a854c166174ee54656cf54910ee5c
012a855416656cf54c6174ee356c1c6c
366dac1c75367812f96de73512e865ee
5d01eda25ef9126b6cee35643265a2e6
6b12e76de73512f86de73505eb18ebb2
cdf2a29afa1172f55c012a854c166174
ee437972ec35722e7a34e7117ae84912
eb6df33512f375fa3571c16771a2b272
a44f730012e85bf12df130f234f428f5
a829f71165ee5d107301e829f220022a
8543344c166174ee437972ec2b167972
ec4c6174ee2be836e946eb64ee22ef11
65ee5d0262ac3868227310f2291165ee
5c012a855316696ee84c6174ee351163
f349702e70527258735ee1b220e41165
ee5c012a8541167261e24c6174ee3512
f66ff23512ef73e33501e8b025f91161
e1296434674068486b12e76de73501e3
22ee1173e33513e36b6cee3512f561f2
3504753a769077a26478a26df51165f3
5d0cec16f30bf32af726f822f91171f5
35ec26f022f21171f535e709e726e822
eb1171f535e226e422e61171f5350ded
16f00bf02af326f722fa1171f535ed26
ee22ef1171f535e80be82ae926ea22ec
1171f535e126e322e51171f53503e12a
e326e822f31171f5350aef14f409f426
f522f71171f535ef26f022f21171f535
e12ee32ae826ec22ee1171f5351171f5
350361a817ed30eea289f71166f25d11
64e5496ea2736fa2d970086b516bac1d
7362e170f38ef41170f4a28007b3c4dc
b3aaf6b426b522b604b029b229b429b5
29b62901e5a2d5f41170f3351165ee5c
012a8547167572f54c6174ee351165ee
5c012a8541167261e24c6174ee356234
633a65406712e161f23512f470f33512
ed65ee4912ec6df3350a7946ee19ee2e
ef38f91165ee5d106e01e249ef490164
7c6e01e223ee497948e256e51165ee5c
012a8544166576e14c6174ee3501e4a6
75ee1165ee5d01642c6e01ee49ef2310
e13161a87c6834693a6c427312ef65ee
5d12e467ee3513f16b6cee3513e56c75
f935046b54725ce3ae38eda2e4f21165
ee5c012a854f167279e14c6174ee3513
e96b6cee3502e3a6cdee22f3116df335
67c3336ac24f6aa2bc6ba4146ca4b76d
00107669ee35eea411f24ef374f4a2a1
f91165ee5c012a854d16796df24c6174
ee350168a6566d10f220012a854c1661
74ee446576e1491169e45d7676e7a44f
e9a611ec0165426d10ec20012a854c16
6174ee4d6c79ed4910ee5c012a854d16
6c79ed4c6174ee3512e66dee356e1f6e
34713a73407512e96df33512f07ae835
12e76df33501e8acb0e9116df3356134
6548664e6912ee6df33501e92af8116d
f3351168e94912ef6df33502e14ae246
e51165ee5d02612ee13af61169e44901
eb22f8116df335116ae120032a854838
4b784c166174ee4a7061ee2b02613669
4272156bf44a7061ee2b156ee94a7061
ee2b1172e10148464a127061ee2b1261
6ee101482c4a127061ee2b12726bf42b
0aeb73ef36ef2ef57cf91172f55d116b
ef20022a8548464a12616def01482c4b
126f72e52b12616ee72b11616e01e722
e9134b6f72e52b1174f25deba8c8ed6a
ee0165426b10ee20012a854c166174ee
4b6e64e14910ee5c012a854b166e64e1
4c6174ee351165ee5c012a854b16686d
f24c6174ee357236763c7848e14ee711
66f25d12e965ee5d01e222f2116df335
12e46df3351165ee5c012a854716656f
f24c6174ee350e753ee221e24ee7a29d
ee4cef1165ee5c012a854c16616fef4c
6174ee351164e5291166f25d75327738
7a40e11169f44912e166f25d13e76c75
f93512e87ae8356f2a6f48724e735c74
02e730ef22f3126c75f935116cf63512
fa65ee5d01e922ed126c75f93513ed6c
75f935634669526b02e226ef22f3126c
75f935126c75f93501e522e6116df335
12f76df335676a68a2816905e40ae4a8
c4e734f31165ee49642e6b36e11165ee
5d13e16c75f93512f469f5350a7531ec
1eeca40eeea40bf50167286810e95d10
f520012a854c166174ee47756af24975
2ee122e41165ee4901e922ee1167ee35
61386b4c6e546f5a7312f764e52902e1
a257eea484f8116fed3513f06b70e535
12f767ee3513ed6b6feb3507e934e94e
f26cf4a82df91172f55c012a85411672
6dee437972ec351168e920012a854c16
6174ee446576e1490162287310e82910
f32961326a4c7352e11165ee5d02e530
eba426f71165ee49116fed3512e96df3
3512ee7ae83564c0ea648865a2486603
66327538ef6af9116eec4912ed66e635
06e80be82ae926f122f61166e635e226
e522e61166e6351166e6351164e14902
7434753ae1106e01e231ef3112f96ee5
3512f06df33506ee85ee36efa285f3a2
41f51165f3491165eea28007b31db364
b426b538b604b029b129b429b527b629
04b027b127b427b527b6272a2bb030b1
2cb201b229b32904b029b129b429b527
b6291165f3a28007b312b37ab426b522
b604b029b229b429b529b6292a2bb026
b14eb204b029b229b429b529b62904b0
29b229b429b529b62901b129b3296e2e
7936e51165ee5d13e26b6cee3513ef6b
6cee3561a26062a49e630c702ee111e1
a2ceefa4ddf32af91165ee491173eb49
703e72447a01e822ef117ae835117ae8
3512f87ae83512f366f2496a146a306b
366f12e16df33512f97ae83512e261f2
5d643065366812f265ee4912ef7ae835
13e26669ec5d001675c0c0e692f275f2
4af9a26cfa1172f55c012a854c166174
ee437972ec351161f220012a5a4c1661
74ee417261e24807b327b32ab460b522
b605b336b329b529b6298407b313b32a
b438b522b605b322b329b529b62910b4
292a2bb026b122b205b30fb329b529b6
2905b306b329b529b629b029b129b229
1165f349e64aeba2b1ed1165ee5c012a
8545167468e94c6174ee35116eec497a
137a2ee134e21172f55d12e261fa3512
7373f92975a42e763a7903e82aec26ee
22f01161f23512ec61f23566356c1e6c
3e70447203f12af326f922fa1161f235
12ee73f13501e322e41161f235663069
366a12f061f23512e261f23513e97379
f235613e624e635a64906501e222e311
61f23502e526ef32f41173f13501e822
f61161f23505f709f726f822f91161f2
35e82eed22f11161f2351165ee5d1161
f23512e661f2350e7668ee4aee3eef82
f2a0f30168287310e82910f229016242
6510ee5c012a854216656ee74c6174ee
3510ee20012a854c166174ee42656ee7
49117ae848012a8554166962f448616e
f3351166f24976327a3ee544e81168e9
5d01e522f5116df33512e36de7351172
f549682268346a3a6d4e7412ea6df335
12f26de73501ee2af1116de735116df3
3512ed6de735613062366512ed65ee5d
12ec75f24912fa61f235
}
}
}

2
icu4c/source/data/misc/supplementalData.txt
View file

@ -17555,7 +17555,7 @@ supplementalData:table(nofallback){
matchVariable{
americas{"019"}
cnsar{"HK+MO"}
enUS{"AS+GU+MH+MP+PR+UM+US+VI"}
enUS{"AS+CA+GU+MH+MP+PH+PR+UM+US+VI"}
maghreb{"MA+DZ+TN+LY+MR+EH"}
}
paradigmLocales{

16
icu4c/source/test/testdata/localeMatcherTest.txt vendored
View file

@ -404,7 +404,7 @@ en >> it
@supported=es-AR, es
es-MX >> es-AR
@supported=fr, en, en-GB
en-CA >> en-GB
en-CA >> en
@supported=de-AT, de-DE, de-CH
de >> de-DE
@ -412,7 +412,7 @@ de >> de-DE
@supported=es-AR, es
es-MX >> es-AR
@supported=fr, en, en-GB
en-CA >> en-GB
en-CA >> en
@supported=de-AT, de-DE, de-CH
de >> de-DE
@ -837,7 +837,7 @@ pt-US, pt-PT >> pt
** test: TestScriptAndRegion
@supported=en-GB, en
en-CA >> en-GB
en-CA >> en
# fr-CA is a "close enough" match to "fr" to be returned in favor of "en-GB"
@supported=fr, en-GB, en
fr-CA, en-CA >> fr
@ -846,7 +846,7 @@ zh-HK >> zh-Hant
@favor=script
@supported=en-GB, en
en-CA >> en-GB
en-CA >> en
@supported=fr, en-GB, en
fr-CA, en-CA >> fr
@supported=zh-Hant, zh-TW
@ -1306,7 +1306,6 @@ fr-CA >> und
# Great Britain fallback
en-AU >> en-GB
en-BZ >> en-GB
en-CA >> en-GB
en-IN >> en-GB
en-IE >> en-GB
en-JM >> en-GB
@ -1316,6 +1315,7 @@ en-TT >> en-GB
en-ZA >> en-GB
# United States fallback
en-CA >> en-US
en-US >> en-US
en >> en-US
@ -1325,7 +1325,7 @@ ja >> und
fr-CA >> en-US
en-AU >> en-GB
en-BZ >> en-GB
en-CA >> en-GB
en-CA >> en-US
en-IN >> en-GB
en-IE >> en-GB
en-JM >> en-GB
@ -1877,10 +1877,10 @@ es-MX >> es-419
** test: testLooseMatchForEnglish_getBestMatches
@supported=en, en-GB
en-CA >> en-GB
en-CA >> en
@favor=script
en-CA >> en-GB
en-CA >> en
** test: testLooseMatchForChinese_getBestMatches
@supported=zh

4
icu4j/main/shared/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7a56cb0519ca384bb5b6d273c74bf237853e9865b7151a8624816360321a35a
size 13627867
oid sha256:9a60e8eead3f049ca4c6f21983c05f172df6ed2f6d9e09603ed7d939435a32a1
size 13627084

4
icu4j/main/shared/data/icutzdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f3d0856773cfb2db6c6a95efefcf2cec1145a691199cbb81583d6b416010068
size 96356
oid sha256:5138343516d6c1d0cc079f0f2c77b8bde76373a20ace379bc56d054f4a12922e
size 96360

4
icu4j/main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:683ed2daa2eedcdf4795e98fc2f7295c1945d6e953e93881db8f8f85ff43dcbe
size 829042
oid sha256:ee3331f88ddca0a688515e392b913b2c3e4b040198489746e49f022943fe1239
size 826063

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
View file

@ -492,7 +492,7 @@ public class LocaleMatcherTest extends TestFmwk {
assertEquals("es_AR", matcher.getBestMatch("es_MX").toString());
matcher = newLocaleMatcher("fr, en, en_GB");
assertEquals("en_GB", matcher.getBestMatch("en_CA").toString());
assertEquals("en", matcher.getBestMatch("en_CA").toString());
matcher = newLocaleMatcher("de_AT, de_DE, de_CH");
assertEquals("de_DE", matcher.getBestMatch("de").toString());

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeDistanceTest.txt
View file

@ -30,7 +30,7 @@ zh-Hans ; en ; 100
en-US ; en-AU ; 5 # across clusters
en-VI ; en-GU ; 4 # within cluster
en-AU ; en-CA ; 4 # within cluster
en-AU ; en-CA ; 5 # across cluster
# testScript
en-CA ; en-Cyrl ; 100

16
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeMatcherTest.txt
View file

@ -404,7 +404,7 @@ en >> it
@supported=es-AR, es
es-MX >> es-AR
@supported=fr, en, en-GB
en-CA >> en-GB
en-CA >> en
@supported=de-AT, de-DE, de-CH
de >> de-DE
@ -412,7 +412,7 @@ de >> de-DE
@supported=es-AR, es
es-MX >> es-AR
@supported=fr, en, en-GB
en-CA >> en-GB
en-CA >> en
@supported=de-AT, de-DE, de-CH
de >> de-DE
@ -837,7 +837,7 @@ pt-US, pt-PT >> pt
** test: TestScriptAndRegion
@supported=en-GB, en
en-CA >> en-GB
en-CA >> en
# fr-CA is a "close enough" match to "fr" to be returned in favor of "en-GB"
@supported=fr, en-GB, en
fr-CA, en-CA >> fr
@ -846,7 +846,7 @@ zh-HK >> zh-Hant
@favor=script
@supported=en-GB, en
en-CA >> en-GB
en-CA >> en
@supported=fr, en-GB, en
fr-CA, en-CA >> fr
@supported=zh-Hant, zh-TW
@ -1306,7 +1306,6 @@ fr-CA >> und
# Great Britain fallback
en-AU >> en-GB
en-BZ >> en-GB
en-CA >> en-GB
en-IN >> en-GB
en-IE >> en-GB
en-JM >> en-GB
@ -1316,6 +1315,7 @@ en-TT >> en-GB
en-ZA >> en-GB
# United States fallback
en-CA >> en-US
en-US >> en-US
en >> en-US
@ -1325,7 +1325,7 @@ ja >> und
fr-CA >> en-US
en-AU >> en-GB
en-BZ >> en-GB
en-CA >> en-GB
en-CA >> en-US
en-IN >> en-GB
en-IE >> en-GB
en-JM >> en-GB
@ -1877,10 +1877,10 @@ es-MX >> es-419
** test: testLooseMatchForEnglish_getBestMatches
@supported=en, en-GB
en-CA >> en-GB
en-CA >> en
@favor=script
en-CA >> en-GB
en-CA >> en
** test: testLooseMatchForChinese_getBestMatches
@supported=zh