AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
X-SVN-Rev: 36887
This commit is contained in:
John Emmons 2014-12-17 23:26:00 +00:00
parent 0d0a369333
commit f4fcba39d9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
View File

@ -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);
}

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac913e7aa51264658904f8f5f2284a5a85f857c18270adde61e66d7a3ade66e5
size 11798306
oid sha256:75ed6e7d7359c336e87fbc632981e5e26fbbab5550b862fb7e00b2a5acf33078
size 11802139

2
icu4j/main/shared/data/icutzdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14d33e2d1b99126a649861770f17ba59757bb7b66e885d7ba2a1a13ac90bd337
oid sha256:61f738045ab6e4a2550a99e4c492a2a0c76bec6f9ddfee3ff5b92b24a686ac44
size 90587

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a2ec0f306d07d8e98ee9a957887a3f0cc866f18a796259705080ebfdd9a42b8
size 812405
oid sha256:90c84cb3b68374b68978f88b1d60504851af39042198b4e74c2b84c00a14757c
size 812406