ICU-11060 Fix naming convention for @alt values from CLDR

X-SVN-Rev: 36887

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
index 33725e2cbc1086ed3424585e69b1c31e5e03d0c6..435f2b856021faa27aebee9b2366262ca6fff512 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
@@ -382,7 +382,7 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames {
 
     private String localeIdName(String localeId) {
         if (nameLength == DisplayContext.LENGTH_SHORT) {
-            String locIdName = langData.get("LanguagesShort", localeId);
+            String locIdName = langData.get("Languages%short", localeId);
             if (!locIdName.equals(localeId)) {
                 return locIdName;
             }
@@ -397,7 +397,7 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames {
             return lang;
         }
         if (nameLength == DisplayContext.LENGTH_SHORT) {
-               String langName = langData.get("LanguagesShort", lang);
+               String langName = langData.get("Languages%short", lang);
                if (!langName.equals(lang)) {
                    return adjustForUsageAndContext(CapitalizationContextUsage.LANGUAGE, langName);
                }
@@ -439,7 +439,7 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames {
     @Override
     public String regionDisplayName(String region) {
         if (nameLength == DisplayContext.LENGTH_SHORT) {
-               String regionName = regionData.get("CountriesShort", region);
+               String regionName = regionData.get("Countries%short", region);
                if (!regionName.equals(region)) {
                    return adjustForUsageAndContext(CapitalizationContextUsage.TERRITORY, regionName);
                }

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index e40a3fceab6806597a2c53be0c2b16f1ad528c73..27687f3021d6ec3a9b57c34f08a60660d8c1e2db 100755 (executable)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac913e7aa51264658904f8f5f2284a5a85f857c18270adde61e66d7a3ade66e5
-size 11798306
+oid sha256:75ed6e7d7359c336e87fbc632981e5e26fbbab5550b862fb7e00b2a5acf33078
+size 11802139

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 71e4106dbf89eefeb37605fa555aa189f48d5a8d..c1541378ba15835ee58b1e33bacba2801995a93d 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14d33e2d1b99126a649861770f17ba59757bb7b66e885d7ba2a1a13ac90bd337
+oid sha256:61f738045ab6e4a2550a99e4c492a2a0c76bec6f9ddfee3ff5b92b24a686ac44
 size 90587

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 65a078e332b28a195a9a871feb3c4b86d19b35a0..8fdc9871d41894c616792c0928ebb389e59852b6 100755 (executable)
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a2ec0f306d07d8e98ee9a957887a3f0cc866f18a796259705080ebfdd9a42b8
-size 812405
+oid sha256:90c84cb3b68374b68978f88b1d60504851af39042198b4e74c2b84c00a14757c
+size 812406