organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-4122 fix a bug

Browse source 
X-SVN-Rev: 17769
This commit is contained in:
Ram Viswanadha 2005-06-01 18:51:05 +00:00
parent 5e2bae8909
commit ea98fcb3a0
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4j/src/com/ibm/icu/impl/ICUResourceBundle.java
View file

@ -603,7 +603,7 @@ public abstract class ICUResourceBundle extends UResourceBundle{
ICUResourceBundle actualBundle = this;
// now recuse to pick up sub levels of the items
result = findResourceWithFallback(path, actualBundle);
result = findResourceWithFallback(path, actualBundle, null);
if(result == null){
throw new MissingResourceException("Can't find resource for bundle "
@ -1000,14 +1000,17 @@ public abstract class ICUResourceBundle extends UResourceBundle{
return ae;
}
private ICUResourceBundle findResourceWithFallback(String path, ICUResourceBundle actualBundle) {
private ICUResourceBundle findResourceWithFallback(String path, ICUResourceBundle actualBundle, ICUResourceBundle requested) {
ICUResourceBundle sub = null;
if(requested==null){
requested=actualBundle;
}
while (actualBundle != null) {
StringTokenizer st = new StringTokenizer(path, "/");
ICUResourceBundle current = actualBundle;
while (st.hasMoreTokens()) {
String subKey = st.nextToken();
sub = current.handleGet(subKey, null);
sub = current.handleGet(subKey, requested);
if(sub==null){
break;
}

2
icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java
View file

@ -646,7 +646,7 @@ public class ICUResourceBundleImpl extends ICUResourceBundle {
if(bundleName.equals(LOCALE)){
bundleName = baseName;
bundle = requested;
keyPath = locale;
keyPath = resPath.substring(LOCALE.length() + 2/* prepending and appending / */, resPath.length());
locale = requested.getLocaleID();
}else if (locale == null) {
bundle = (ICUResourceBundle) getBundleInstance(bundleName, "",