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

ICU-7173 Merge CLDR 1.8p1 data from branch

Browse Source 
X-SVN-Rev: 26735
This commit is contained in:
John Emmons 2009-10-03 03:56:15 +00:00
parent f3f70fe978
commit ceb60561d4
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundle.java
View File

@ -783,21 +783,18 @@ public class ICUResourceBundle extends UResourceBundle {
b = (ICUResourceBundle)addToCache(root, fullName, defaultLocale, b);
boolean ParentIsRoot;
try {
b.get("%%ParentIsRoot");
boolean ParentIsRoot = false;
if (b.getTableResource("%%ParentIsRoot") != RES_BOGUS) {
ParentIsRoot = true;
} catch (MissingResourceException ex) {
ParentIsRoot = false;
}
if (i != -1 && !ParentIsRoot) {
parent = instantiateBundle(baseName, localeName.substring(0, i), root, disableFallback);
}else if(!localeName.equals(rootLocale)){
} else if (!localeName.equals(rootLocale)){
parent = instantiateBundle(baseName, rootLocale, root, true);
}
if(!b.equals(parent)){
if (!b.equals(parent)){
b.setParent(parent);
}
}

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:789d219e5096b85eaa00b7826504fdf40247afd343ea89346b1c458c33e7ad74
size 6408961
oid sha256:9d0750cfdc01d9d3c6fc8718ba263bb017406fd98c38ed8dd672949f8e6c643a
size 6466881

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff60c10bffa9b19ad3e4a6dcc2d2415e45d4fdb6ac8133c0d673ecf0b75ffc74
size 720071
oid sha256:19cbe9dc7cb7e87c559d5afd674094c76a19389a70b208301ef54d48b37fc8a7
size 720100

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
View File

@ -5,7 +5,7 @@
package com.ibm.icu.dev.test.util;
public class DebugUtilitiesData extends Object {
public static final String ICU4C_VERSION="4.2";
public static final String ICU4C_VERSION="4.3.2";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;
@ -136,7 +136,7 @@ public class DebugUtilitiesData extends Object {
com.ibm.icu.util.Calendar.EXTENDED_YEAR, /* 19 */
com.ibm.icu.util.Calendar.JULIAN_DAY, /* 20 */
com.ibm.icu.util.Calendar.MILLISECONDS_IN_DAY, /* 21 */
com.ibm.icu.util.Calendar.IS_LEAP_MONTH, /* 22 */
com.ibm.icu.util.ChineseCalendar.IS_LEAP_MONTH, /* 22 */
},
/* UCalendarMonths, 2 */
{