Mercurial > hg > openjdk > jdk8u > jdk

changeset 14400:8b0939dc1d12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8255086: Update the root locale display names Reviewed-by: phh, andrew
author sgehwolf
date Mon, 08 Mar 2021 06:06:11 +0000
parents e4f39f4e0d3a
children 0270a999297f
files src/share/classes/sun/util/resources/LocaleNames.properties test/java/util/Locale/LocaleEnhanceTest.java test/java/util/Locale/LocaleTest.java test/sun/text/resources/LocaleData test/sun/text/resources/LocaleDataTest.java
diffstat 5 files changed, 234 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/util/resources/LocaleNames.properties	Wed Mar 03 10:55:56 2021 +0100
+++ b/src/share/classes/sun/util/resources/LocaleNames.properties	Mon Mar 08 06:06:11 2021 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@
 bh=Bihari
 bi=Bislama
 bm=Bambara
-bn=Bengali
+bn=Bangla
 bo=Tibetan
 br=Breton
 bs=Bosnian
@@ -87,10 +87,10 @@
 fj=Fijian
 fo=Faroese
 fr=French
-fy=Frisian
+fy=Western Frisian
 ga=Irish
 gd=Scottish Gaelic
-gl=Gallegan
+gl=Galician
 gn=Guarani
 gu=Gujarati
 gv=Manx
@@ -99,7 +99,7 @@
 hi=Hindi
 ho=Hiri Motu
 hr=Croatian
-ht=Haitian
+ht=Haitian Creole
 hu=Hungarian
 hy=Armenian
 hz=Herero
@@ -121,9 +121,9 @@
 ka=Georgian
 kg=Kongo
 ki=Kikuyu
-kj=Kwanyama
+kj=Kuanyama
 kk=Kazakh
-kl=Greenlandic
+kl=Kalaallisut
 km=Khmer
 kn=Kannada
 ko=Korean
@@ -132,7 +132,7 @@
 ku=Kurdish
 kv=Komi
 kw=Cornish
-ky=Kirghiz
+ky=Kyrgyz
 la=Latin
 lb=Luxembourgish
 lg=Ganda
@@ -167,15 +167,15 @@
 oc=Occitan
 oj=Ojibwa
 om=Oromo
-or=Oriya
-os=Ossetian
-pa=Panjabi
+or=Odia
+os=Ossetic
+pa=Punjabi
 pi=Pali
 pl=Polish
-ps=Pushto
+ps=Pashto
 pt=Portuguese
 qu=Quechua
-rm=Raeto-Romance
+rm=Romansh
 rn=Rundi
 ro=Romanian
 ru=Russian
@@ -185,7 +185,7 @@
 sd=Sindhi
 se=Northern Sami
 sg=Sango
-si=Sinhalese
+si=Sinhala
 sk=Slovak
 sl=Slovenian
 sm=Samoan
@@ -206,13 +206,13 @@
 tk=Turkmen
 tl=Tagalog
 tn=Tswana
-to=Tonga
+to=Tongan
 tr=Turkish
 ts=Tsonga
 tt=Tatar
 tw=Twi
 ty=Tahitian
-ug=Uighur
+ug=Uyghur
 uk=Ukrainian
 ur=Urdu
 uz=Uzbek
@@ -246,14 +246,14 @@
 alg=Algonquian
 alt=Southern Altai
 amh=Amharic
-ang=English, Old (ca.450-1100)
+ang=Old English
 anp=Angika
 apa=Apache
 ara=Arabic
-arc=Official Aramaic (700-300 BCE)
+arc=Aramaic
 arg=Aragonese
 arm=Armenian
-arn=Mapudungun
+arn=Mapuche
 arp=Arapaho
 art=Artificial
 arw=Arawak
@@ -273,7 +273,7 @@
 bam=Bambara
 ban=Balinese
 baq=Basque
-bas=Basa
+bas=Basaa
 bat=Baltic
 bej=Beja
 bel=Belarusian
@@ -298,7 +298,7 @@
 byn=Blin
 cad=Caddo
 cai=Central American Indian
-car=Galibi Carib
+car=Carib
 cat=Catalan
 cau=Caucasian
 ceb=Cebuano
@@ -310,7 +310,7 @@
 chi=Chinese
 chk=Chuukese
 chm=Mari
-chn=Chinook jargon
+chn=Chinook Jargon
 cho=Choctaw
 chp=Chipewyan
 chr=Cherokee
@@ -325,7 +325,7 @@
 cpf=Creoles and pidgins, French-based
 cpp=Creoles and pidgins, Portuguese-based
 cre=Cree
-crh=Crimean Tatar
+crh=Crimean Turkish
 crp=Creoles and pidgins
 csb=Kashubian
 cus=Cushitic
@@ -335,7 +335,7 @@
 dar=Dargwa
 day=Land Dayak
 del=Delaware
-den=Slave (Athapascan)
+den=Slave
 dgr=Dogrib
 din=Dinka
 div=Divehi
@@ -343,16 +343,16 @@
 dra=Dravidian
 dsb=Lower Sorbian
 dua=Duala
-dum=Dutch, Middle (ca.1050-1350)
+dum=Middle Dutch
 dut=Dutch
 dyu=Dyula
 dzo=Dzongkha
 efi=Efik
-egy=Egyptian (Ancient)
+egy=Ancient Egyptian
 eka=Ekajuk
 elx=Elamite
 eng=English
-enm=English, Middle (1100-1500)
+enm=Middle English
 epo=Esperanto
 est=Estonian
 ewe=Ewe
@@ -366,8 +366,8 @@
 fiu=Finno-Ugrian
 fon=Fon
 fre=French
-frm=French, Middle (ca.1400-1600)
-fro=French, Old (842-ca.1400)
+frm=Middle French
+fro=Old French
 frr=Northern Frisian
 frs=Eastern Frisian
 fry=Western Frisian
@@ -385,18 +385,18 @@
 gle=Irish
 glg=Galician
 glv=Manx
-gmh=German, Middle High (ca.1050-1500)
-goh=German, Old High (ca.750-1050)
+gmh=Middle High German
+goh=Old High German
 gon=Gondi
 gor=Gorontalo
 got=Gothic
 grb=Grebo
-grc=Greek, Ancient (to 1453)
+grc=Ancient Greek
 gre=Greek, Modern (1453-)
 grn=Guarani
 gsw=Swiss German
 guj=Gujarati
-gwi=Gwich'in
+gwi=Gwich\u02bcin
 hai=Haida
 hat=Haitian
 hau=Hausa
@@ -488,8 +488,8 @@
 lug=Ganda
 lui=Luiseno
 lun=Lunda
-luo=Luo (Kenya and Tanzania)
-lus=Lushai
+luo=Luo
+lus=Mizo
 mac=Macedonian
 mad=Madurese
 mag=Magahi
@@ -506,7 +506,7 @@
 mdf=Moksha
 mdr=Mandar
 men=Mende
-mga=Irish, Middle (900-1200)
+mga=Middle Irish
 mic=Mi'kmaq
 min=Minangkabau
 mis=Uncoded
@@ -519,9 +519,9 @@
 moh=Mohawk
 mon=Mongolian
 mos=Mossi
-mul=Multiple
+mul=Multiple languages
 mun=Munda
-mus=Creek
+mus=Muscogee
 mwl=Mirandese
 mwr=Marwari
 myn=Mayan
@@ -536,17 +536,17 @@
 ndo=Ndonga
 nds=Low German
 nep=Nepali
-new=Nepal Bhasa
+new=Newari
 nia=Nias
 nic=Niger-Kordofanian
 niu=Niuean
 nno=Norwegian Nynorsk
 nob=Bokm\u00e5l, Norwegian
 nog=Nogai
-non=Norse, Old
+non=Old Norse
 nor=Norwegian
-nqo=N'Ko
-nso=Pedi
+nqo=N\u2019Ko
+nso=Northern Sotho
 nub=Nubian
 nwc=Classical Newari
 nya=Chichewa
@@ -560,7 +560,7 @@
 orm=Oromo
 osa=Osage
 oss=Ossetian
-ota=Turkish, Ottoman (1500-1928)
+ota=Ottoman Turkish
 oto=Otomian
 paa=Papuan
 pag=Pangasinan
@@ -569,7 +569,7 @@
 pan=Panjabi
 pap=Papiamento
 pau=Palauan
-peo=Persian, Old (ca.600-400 B.C.)
+peo=Old Persian
 per=Persian
 phi=Philippine
 phn=Phoenician
@@ -578,7 +578,7 @@
 pon=Pohnpeian
 por=Portuguese
 pra=Prakrit
-pro=Proven\u00e7al, Old (to 1500)
+pro=Old Proven\u00e7al
 pus=Pushto; Pashto
 que=Quechua
 raj=Rajasthani
@@ -593,7 +593,7 @@
 rus=Russian
 sad=Sandawe
 sag=Sango
-sah=Yakut
+sah=Sakha
 sai=South American Indian
 sal=Salishan
 sam=Samaritan Aramaic
@@ -604,7 +604,7 @@
 sco=Scots
 sel=Selkup
 sem=Semitic
-sga=Irish, Old (to 900)
+sga=Old Irish
 sgn=Sign
 shn=Shan
 sid=Sidamo
@@ -624,7 +624,7 @@
 sna=Shona
 snd=Sindhi
 snk=Soninke
-sog=Sogdian
+sog=Sogdien
 som=Somali
 son=Songhai
 sot=Sotho, Southern
@@ -662,7 +662,7 @@
 tlh=Klingon
 tli=Tlingit
 tmh=Tamashek
-tog=Tonga (Nyasa)
+tog=Nyasa Tonga
 ton=Tonga (Tonga Islands)
 tpi=Tok Pisin
 tsi=Tsimshian
@@ -681,7 +681,7 @@
 uig=Uighur
 ukr=Ukrainian
 umb=Umbundu
-und=Undetermined
+und=Unknown language
 urd=Urdu
 uzb=Uzbek
 vai=Vai
@@ -690,7 +690,7 @@
 vol=Volap\u00fck
 vot=Votic
 wak=Wakashan
-wal=Wolaitta
+wal=Wolaytta
 war=Waray
 was=Washo
 wel=Welsh
@@ -725,7 +725,7 @@
 Bamu=Bamum
 Bass=Bassa Vah
 Batk=Batak
-Beng=Bengali
+Beng=Bangla
 Blis=Blissymbols
 Bopo=Bopomofo
 Brah=Brahmi
@@ -750,7 +750,7 @@
 Egyp=Egyptian hieroglyphs
 Elba=Elbasan
 Ethi=Ethiopic
-Geok=Khutsuri
+Geok=Georgian Khutsuri
 Geor=Georgian
 Glag=Glagolitic
 Goth=Gothic
@@ -761,12 +761,12 @@
 Hang=Hangul
 Hani=Han
 Hano=Hanunoo
-Hans=Simplified Han
-Hant=Traditional Han
+Hans=Simplified
+Hant=Traditional
 Hebr=Hebrew
 Hira=Hiragana
 Hmng=Pahawh Hmong
-Hrkt=Katakana or Hiragana
+Hrkt=Japanese syllabaries
 Hung=Old Hungarian
 Inds=Indus
 Ital=Old Italic
@@ -780,7 +780,7 @@
 Kore=Korean
 Kpel=Kpelle
 Kthi=Kaithi
-Lana=Tai Tham
+Lana=Lanna
 Laoo=Lao
 Latf=Fraktur Latin
 Latg=Gaelic Latin
@@ -789,11 +789,11 @@
 Limb=Limbu
 Lina=Linear A
 Linb=Linear B
-Lisu=Lisu
+Lisu=Fraser
 Loma=Loma
 Lyci=Lycian
 Lydi=Lydian
-Mand=Mandaic
+Mand=Mandaean
 Mani=Manichaean
 Maya=Mayan hieroglyphs
 Mend=Mende
@@ -806,12 +806,12 @@
 Mymr=Myanmar
 Narb=Old North Arabian
 Nbat=Nabataean
-Nkgb=Nakhi Geba
+Nkgb=Naxi Geba
 Nkoo=N\u2019Ko
 Ogam=Ogham
 Olck=Ol Chiki
 Orkh=Orkhon
-Orya=Oriya
+Orya=Odia
 Osma=Osmanya
 Palm=Palmyrene
 Perm=Old Permic
@@ -820,7 +820,7 @@
 Phlp=Psalter Pahlavi
 Phlv=Book Pahlavi
 Phnx=Phoenician
-Plrd=Miao
+Plrd=Pollard Phonetic
 Prti=Inscriptional Parthian
 Rjng=Rejang
 Roro=Rongorongo
@@ -831,7 +831,7 @@
 Saur=Saurashtra
 Sgnw=SignWriting
 Shaw=Shavian
-Sind=Sindhi
+Sind=Khudawadi
 Sinh=Sinhala
 Sund=Sundanese
 Sylo=Syloti Nagri
@@ -854,16 +854,16 @@
 Ugar=Ugaritic
 Vaii=Vai
 Visp=Visible Speech
-Wara=Warang Citi
+Wara=Varang Kshiti
 Xpeo=Old Persian
 Xsux=Sumero-Akkadian Cuneiform
 Yiii=Yi
-Zinh=Inherited script
+Zinh=Inherited
 Zmth=Mathematical Notation
 Zsym=Symbols
 Zxxx=Unwritten
-Zyyy=Undetermined script
-Zzzz=Uncoded script
+Zyyy=Common
+Zzzz=Unknown Script
 
 # country names
 # key is ISO 3166 country code
@@ -871,7 +871,7 @@
 AD=Andorra
 AE=United Arab Emirates
 AF=Afghanistan
-AG=Antigua and Barbuda
+AG=Antigua & Barbuda
 AI=Anguilla
 AL=Albania
 AM=Armenia
@@ -885,7 +885,7 @@
 AW=Aruba
 AX=\u00c5land Islands
 AZ=Azerbaijan
-BA=Bosnia and Herzegovina
+BA=Bosnia & Herzegovina
 BB=Barbados
 BD=Bangladesh
 BE=Belgium
@@ -894,11 +894,11 @@
 BH=Bahrain
 BI=Burundi
 BJ=Benin
-BL=Saint Barth\u00e9lemy
+BL=St. Barth\u00e9lemy
 BM=Bermuda
 BN=Brunei
 BO=Bolivia
-BQ=Bonaire, Sint Eustatius and Saba
+BQ=Caribbean Netherlands
 BR=Brazil
 BS=Bahamas
 BT=Bhutan
@@ -907,12 +907,12 @@
 BY=Belarus
 BZ=Belize
 CA=Canada
-CC=Cocos Islands
-CD=The Democratic Republic Of Congo
+CC=Cocos (Keeling) Islands
+CD=Congo - Kinshasa
 CF=Central African Republic
-CG=Congo
+CG=Congo - Brazzaville
 CH=Switzerland
-CI=C\u00F4te d'Ivoire
+CI=C\u00f4te d\u2019Ivoire
 CK=Cook Islands
 CL=Chile
 CM=Cameroon
@@ -925,7 +925,7 @@
 CW=Cura\u00e7ao
 CX=Christmas Island
 CY=Cyprus
-CZ=Czech Republic
+CZ=Czechia
 DE=Germany
 DJ=Djibouti
 DK=Denmark
@@ -959,13 +959,13 @@
 GP=Guadeloupe
 GQ=Equatorial Guinea
 GR=Greece
-GS=South Georgia And The South Sandwich Islands
+GS=South Georgia & South Sandwich Islands
 GT=Guatemala
 GU=Guam
 GW=Guinea-Bissau
 GY=Guyana
-HK=Hong Kong
-HM=Heard Island And McDonald Islands
+HK=Hong Kong SAR China
+HM=Heard & McDonald Islands
 HN=Honduras
 HR=Croatia
 HT=Haiti
@@ -973,7 +973,7 @@
 ID=Indonesia
 IE=Ireland
 IL=Israel
-IM=Isle Of Man
+IM=Isle of Man
 IN=India
 IO=British Indian Ocean Territory
 IQ=Iraq
@@ -989,7 +989,7 @@
 KH=Cambodia
 KI=Kiribati
 KM=Comoros
-KN=Saint Kitts And Nevis
+KN=St. Kitts & Nevis
 KP=North Korea
 KR=South Korea
 KW=Kuwait
@@ -997,7 +997,7 @@
 KZ=Kazakhstan
 LA=Laos
 LB=Lebanon
-LC=Saint Lucia
+LC=St. Lucia
 LI=Liechtenstein
 LK=Sri Lanka
 LR=Liberia
@@ -1010,14 +1010,14 @@
 MC=Monaco
 MD=Moldova
 ME=Montenegro
-MF=Saint Martin
+MF=St. Martin
 MG=Madagascar
 MH=Marshall Islands
-MK=Macedonia
+MK=North Macedonia
 ML=Mali
-MM=Myanmar
+MM=Myanmar (Burma)
 MN=Mongolia
-MO=Macao
+MO=Macao SAR China
 MP=Northern Mariana Islands
 MQ=Martinique
 MR=Mauritania
@@ -1049,15 +1049,15 @@
 PH=Philippines
 PK=Pakistan
 PL=Poland
-PM=Saint Pierre And Miquelon
-PN=Pitcairn
+PM=St. Pierre & Miquelon
+PN=Pitcairn Islands
 PR=Puerto Rico
-PS=Palestine
+PS=Palestinian Territories
 PT=Portugal
 PW=Palau
 PY=Paraguay
 QA=Qatar
-RE=Reunion
+RE=R\u00e9union
 RO=Romania
 RS=Serbia
 RU=Russia
@@ -1068,9 +1068,9 @@
 SD=Sudan
 SE=Sweden
 SG=Singapore
-SH=Saint Helena
+SH=St. Helena
 SI=Slovenia
-SJ=Svalbard And Jan Mayen
+SJ=Svalbard & Jan Mayen
 SK=Slovakia
 SL=Sierra Leone
 SM=San Marino
@@ -1078,12 +1078,12 @@
 SO=Somalia
 SR=Suriname
 SS=South Sudan
-ST=Sao Tome And Principe
+ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
 SV=El Salvador
-SX=Sint Maarten (Dutch part)
+SX=Sint Maarten
 SY=Syria
-SZ=Swaziland
-TC=Turks And Caicos Islands
+SZ=Eswatini
+TC=Turks & Caicos Islands
 TD=Chad
 TF=French Southern Territories
 TG=Togo
@@ -1095,24 +1095,24 @@
 TN=Tunisia
 TO=Tonga
 TR=Turkey
-TT=Trinidad and Tobago
+TT=Trinidad & Tobago
 TV=Tuvalu
 TW=Taiwan
 TZ=Tanzania
 UA=Ukraine
 UG=Uganda
-UM=United States Minor Outlying Islands
+UM=U.S. Outlying Islands
 US=United States
 UY=Uruguay
 UZ=Uzbekistan
-VA=Vatican
-VC=Saint Vincent And The Grenadines
+VA=Vatican City
+VC=St. Vincent & Grenadines
 VE=Venezuela
 VG=British Virgin Islands
 VI=U.S. Virgin Islands
 VN=Vietnam
 VU=Vanuatu
-WF=Wallis And Futuna
+WF=Wallis & Futuna
 WS=Samoa
 YE=Yemen
 YT=Mayotte
@@ -1139,9 +1139,9 @@
 029=Caribbean
 030=Eastern Asia
 034=Southern Asia
-035=South-Eastern Asia
+035=Southeast Asia
 039=Southern Europe
-053=Australia and New Zealand
+053=Australasia
 054=Melanesia
 057=Micronesian Region
 061=Polynesia
@@ -1152,7 +1152,7 @@
 151=Eastern Europe
 154=Northern Europe
 155=Western Europe
-419=Latin America and the Caribbean
+419=Latin America
 
 # variant names
 # key is %%variant
--- a/test/java/util/Locale/LocaleEnhanceTest.java	Wed Mar 03 10:55:56 2021 +0100
+++ b/test/java/util/Locale/LocaleEnhanceTest.java	Mon Mar 08 06:06:11 2021 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,8 @@
 
 /**
  * @test
- * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019
+ * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603
+ *    7044019 8255086
  * @summary test API changes to Locale
  * @compile LocaleEnhanceTest.java
  * @run main/othervm -esa LocaleEnhanceTest
@@ -612,7 +613,7 @@
 
         Locale.setDefault(Locale.US);
         assertEquals("latn US", "Latin", latnLocale.getDisplayScript());
-        assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript());
+        assertEquals("hans US", "Simplified", hansLocale.getDisplayScript());
 
         Locale.setDefault(Locale.GERMANY);
         assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript());
@@ -626,7 +627,7 @@
         Locale hansLocale = Locale.forLanguageTag("und-hans");
 
         assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US));
-        assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US));
+        assertEquals("hans US", "Simplified", hansLocale.getDisplayScript(Locale.US));
 
         assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY));
         assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY));
@@ -653,10 +654,10 @@
                 "United States",
                 "Norwegian (Norway,Nynorsk)",
                 "Nynorsk",
-                "Chinese (Simplified Han)",
-                "Chinese (Traditional Han)",
-                "Chinese (Simplified Han,China)",
-                "Simplified Han",
+                "Chinese (Simplified)",
+                "Chinese (Traditional)",
+                "Chinese (Simplified,China)",
+                "Simplified",
         };
 
         final String[] displayNameSimplifiedChinese = {
--- a/test/java/util/Locale/LocaleTest.java	Wed Mar 03 10:55:56 2021 +0100
+++ b/test/java/util/Locale/LocaleTest.java	Mon Mar 08 06:06:11 2021 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
  * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
  * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
- * 6786276 7066203 7085757
+ * 6786276 7066203 7085757 8255086
  * @summary test Locales
  */
 /*
@@ -576,7 +576,7 @@
         // names, and other stuff like that.  This test just checks specific language
         // and country codes to make sure we have the correct names for them.
         String[] languageCodes = { "he", "id", "iu", "ug", "yi", "za" };
-        String[] languageNames = { "Hebrew", "Indonesian", "Inuktitut", "Uighur", "Yiddish",
+        String[] languageNames = {"Hebrew", "Indonesian", "Inuktitut", "Uyghur", "Yiddish",
                                    "Zhuang" };
 
         for (int i = 0; i < languageCodes.length; i++) {
--- a/test/sun/text/resources/LocaleData	Wed Mar 03 10:55:56 2021 +0100
+++ b/test/sun/text/resources/LocaleData	Mon Mar 08 06:06:11 2021 +0000
@@ -2399,7 +2399,7 @@
 FormatData/uk_UA/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 
 # bug #4122468 # Use common country names
-LocaleNames//CI=C\u00F4te d'Ivoire
+LocaleNames//CI=C\u00F4te d\u2019Ivoire
 LocaleNames//LY=Libya
 LocaleNames//RU=Russia
 LocaleNames//VN=Vietnam
@@ -2470,7 +2470,7 @@
 LocaleNames//fo=Faroese
 LocaleNames//iu=Inuktitut
 LocaleNames//sg=Sango
-LocaleNames//si=Sinhalese
+LocaleNames//si=Sinhala
 
 #bug 4331446 Localized country and language names for major locales (excerpt only)
 LocaleNames/es/SV=El Salvador
@@ -5471,7 +5471,7 @@
 # JE, GG, IM (6544471)
 LocaleNames//JE=Jersey
 LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle Of Man
+LocaleNames//IM=Isle of Man
 
 # bugs 6497154
 CalendarData/sk/firstDayOfWeek=2
@@ -5550,11 +5550,11 @@
 # JE, GG, IM (6544471)
 LocaleNames//JE=Jersey
 LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle Of Man
+LocaleNames//IM=Isle of Man
 
 # BL, MF (6627549)
-LocaleNames//BL=Saint Barth\u00e9lemy
-LocaleNames//MF=Saint Martin
+LocaleNames//BL=St. Barth\u00e9lemy
+LocaleNames//MF=St. Martin
 
 # bug 6609737
 FormatData/de/TimePatterns/0=HH:mm' Uhr 'z
@@ -8324,3 +8324,114 @@
 TimeZoneNames/en/Turkey/2=TRT
 TimeZoneNames/en/Turkey/3=Turkey Summer Time
 TimeZoneNames/en/Turkey/4=TRST
+
+# bug 8255086
+LocaleNames//bn=Bangla
+LocaleNames//fy=Western Frisian
+LocaleNames//gl=Galician
+LocaleNames//ht=Haitian Creole
+LocaleNames//kj=Kuanyama
+LocaleNames//kl=Kalaallisut
+LocaleNames//ky=Kyrgyz
+LocaleNames//nb=Norwegian Bokm\u00E5l
+LocaleNames//or=Odia
+LocaleNames//os=Ossetic
+LocaleNames//pa=Punjabi
+LocaleNames//ps=Pashto
+LocaleNames//rm=Romansh
+LocaleNames//si=Sinhala
+LocaleNames//to=Tongan
+LocaleNames//ug=Uyghur
+LocaleNames//vo=Volap\u00FCk
+LocaleNames//ang=Old English
+LocaleNames//arc=Aramaic
+LocaleNames//arn=Mapuche
+LocaleNames//bas=Basaa
+LocaleNames//car=Carib
+LocaleNames//chn=Chinook Jargon
+LocaleNames//crh=Crimean Turkish
+LocaleNames//den=Slave
+LocaleNames//dum=Middle Dutch
+LocaleNames//egy=Ancient Egyptian
+LocaleNames//enm=Middle English
+LocaleNames//frm=Middle French
+LocaleNames//fro=Old French
+LocaleNames//gmh=Middle High German
+LocaleNames//goh=Old High German
+LocaleNames//grc=Ancient Greek
+LocaleNames//gwi=Gwich\u02BCin
+LocaleNames//luo=Luo
+LocaleNames//lus=Mizo
+LocaleNames//mga=Middle Irish
+LocaleNames//mul=Multiple languages
+LocaleNames//mus=Muscogee
+LocaleNames//new=Newari
+LocaleNames//nob=Bokm\u00E5l, Norwegian
+LocaleNames//non=Old Norse
+LocaleNames//nqo=N\u2019Ko
+LocaleNames//nso=Northern Sotho
+LocaleNames//ota=Ottoman Turkish
+LocaleNames//peo=Old Persian
+LocaleNames//pro=Old Proven\u00E7al
+LocaleNames//sah=Sakha
+LocaleNames//sga=Old Irish
+LocaleNames//sog=Sogdien
+LocaleNames//tog=Nyasa Tonga
+LocaleNames//und=Unknown language
+LocaleNames//vol=Volap\u00FCk
+LocaleNames//wal=Wolaytta
+LocaleNames//Beng=Bangla
+LocaleNames//Geok=Georgian Khutsuri
+LocaleNames//Hans=Simplified
+LocaleNames//Hant=Traditional
+LocaleNames//Hrkt=Japanese syllabaries
+LocaleNames//Lana=Lanna
+LocaleNames//Lisu=Fraser
+LocaleNames//Mand=Mandaean
+LocaleNames//Nkgb=Naxi Geba
+LocaleNames//Orya=Odia
+LocaleNames//Plrd=Pollard Phonetic
+LocaleNames//Sind=Khudawadi
+LocaleNames//Wara=Varang Kshiti
+LocaleNames//Zinh=Inherited
+LocaleNames//Zyyy=Common
+LocaleNames//Zzzz=Unknown Script
+LocaleNames//AG=Antigua & Barbuda
+LocaleNames//AX=\u00C5land Islands
+LocaleNames//BA=Bosnia & Herzegovina
+LocaleNames//BL=St. Barth\u00E9lemy
+LocaleNames//BQ=Caribbean Netherlands
+LocaleNames//CC=Cocos (Keeling) Islands
+LocaleNames//CD=Congo - Kinshasa
+LocaleNames//CG=Congo - Brazzaville
+LocaleNames//CI=C\u00F4te d\u2019Ivoire
+LocaleNames//CW=Cura\u00E7ao
+LocaleNames//CZ=Czechia
+LocaleNames//GS=South Georgia & South Sandwich Islands
+LocaleNames//HK=Hong Kong SAR China
+LocaleNames//HM=Heard & McDonald Islands
+LocaleNames//IM=Isle of Man
+LocaleNames//KN=St. Kitts & Nevis
+LocaleNames//LC=St. Lucia
+LocaleNames//MF=St. Martin
+LocaleNames//MK=North Macedonia
+LocaleNames//MM=Myanmar (Burma)
+LocaleNames//MO=Macao SAR China
+LocaleNames//PM=St. Pierre & Miquelon
+LocaleNames//PN=Pitcairn Islands
+LocaleNames//PS=Palestinian Territories
+LocaleNames//RE=R\u00E9union
+LocaleNames//SH=St. Helena
+LocaleNames//SJ=Svalbard & Jan Mayen
+LocaleNames//ST=S\u00E3o Tom\u00E9 & Pr\u00EDncipe
+LocaleNames//SX=Sint Maarten
+LocaleNames//SZ=Eswatini
+LocaleNames//TC=Turks & Caicos Islands
+LocaleNames//TT=Trinidad & Tobago
+LocaleNames//UM=U.S. Outlying Islands
+LocaleNames//VA=Vatican City
+LocaleNames//VC=St. Vincent & Grenadines
+LocaleNames//WF=Wallis & Futuna
+LocaleNames//035=Southeast Asia
+LocaleNames//053=Australasia
+LocaleNames//419=Latin America
--- a/test/sun/text/resources/LocaleDataTest.java	Wed Mar 03 10:55:56 2021 +0100
+++ b/test/sun/text/resources/LocaleDataTest.java	Mon Mar 08 06:06:11 2021 +0000
@@ -38,7 +38,7 @@
  *      7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8145952
  *      8164784 8187946 8195478 8193552 8202026 8204269 8208746 8209775 8234228
- *      8250665
+ *      8250665 8255086
  * @summary Verify locale data
  *
  */