diff --git a/icu4j/src/com/ibm/icu/dev/data/testdata.jar b/icu4j/src/com/ibm/icu/dev/data/testdata.jar index d8fdae2ae7..2e1da457fc 100644 --- a/icu4j/src/com/ibm/icu/dev/data/testdata.jar +++ b/icu4j/src/com/ibm/icu/dev/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ddb422cbe2d20bae943c64cf1d405038ff0dbd36baf3deca3932a87e4afd5d -size 663198 +oid sha256:fa4cef998bc121b307a3c4047a50567c89b1024c7e7bdc6a9e2901fc1498952a +size 661421 diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index 4a7a0c48e5..737e8b5723 100755 --- a/icu4j/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java @@ -2073,13 +2073,23 @@ public class TransliteratorTest extends TestFmwk { * Test instantiation from a locale. */ public void TestLocaleInstantiation() { + try{ + Transliterator t = Transliterator.getInstance("te_IN-Latin"); + //expect(t, "\u0430", "a"); + }catch(IllegalArgumentException ex){ + warnln("Could not load locale data for obtaining the script used in the locale te_IN. "+ex.getMessage()); + } try{ Transliterator t = Transliterator.getInstance("ru_RU-Latin"); expect(t, "\u0430", "a"); - t = Transliterator.getInstance("en-el"); + }catch(IllegalArgumentException ex){ + warnln("Could not load locale data for obtaining the script used in the locale ru_RU. "+ex.getMessage()); + } + try{ + Transliterator t = Transliterator.getInstance("en-el"); expect(t, "a", "\u03B1"); }catch(IllegalArgumentException ex){ - warnln("Could not load locale data for obtaining the script used in the locale"); + warnln("Could not load locale data for obtaining the script used in the locale el. "+ ex.getMessage()); } } diff --git a/icu4j/src/com/ibm/icu/impl/data/icudata.jar b/icu4j/src/com/ibm/icu/impl/data/icudata.jar index a233e74cd9..030ca354e4 100644 --- a/icu4j/src/com/ibm/icu/impl/data/icudata.jar +++ b/icu4j/src/com/ibm/icu/impl/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c1907c51760e190ef17d92220f730ddd3ce1abf2aaf2c704961f18d5249fbd6 -size 2002539 +oid sha256:e77e46a98e8c64cd3ace35c366568a5539ec03087b9bf5adb03d178e316cb89c +size 2002570 diff --git a/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java b/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java index 4c718a6807..ac8417cc00 100755 --- a/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java +++ b/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java @@ -117,7 +117,7 @@ class TransliteratorRegistry { // If 'top' is not a script name, try a locale lookup if (script == UScript.INVALID_CODE) { Locale toploc = LocaleUtility.getLocaleFromName(top); - res = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(ICUResourceBundle.ICU_TRANSLIT_BASE_NAME,toploc.toString(), true); + res = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_TRANSLIT_BASE_NAME,toploc); // Make sure we got the bundle we wanted; otherwise, don't use it if (res!=null && LocaleUtility.isFallbackOf(res.getULocale().toString(), top)) { isSpecLocale = true;