summaryrefslogtreecommitdiff
path: root/icu4j
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2021-01-19 10:16:54 +0000
committerVictor Chang <vichang@google.com>2022-11-14 15:45:43 +0000
commit81783245fcc782a95cc30ff58a5787fca62c4c91 (patch)
treeeeb4960881892ac4dc27ca5bd61044d1490b679c /icu4j
parente2b5a36020f1fbaabd9f667fdd0ca7c7b8a03c3b (diff)
downloadicu-81783245fcc782a95cc30ff58a5787fca62c4c91.tar.gz
Android patch: CLDR data: Add data for the XA/XB pseudo locales.
In ICU 68, icu4c/source/data/icu-config.xml is removed. This CL adds pseudo locales used in some tests and excludes them from com.ibm.icu.dev.test.format.DateTimeGeneratorTest#testJjMapping because they are not real locales. https://android.googlesource.com/platform/external/icu/+/338b5d35fdb86a9c4cb0ed59a67416693a0fe1e4 Test: n/a Change-Id: Ide8fb0413f28d5da03ae27a1ccf7ec8e8bcc1175
Diffstat (limited to 'icu4j')
-rw-r--r--icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
index 45f7a17bb..2d2c80e07 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
@@ -1709,6 +1709,12 @@ public class DateTimeGeneratorTest extends TestFmwk {
ULocale[] locales = DateFormat.getAvailableULocales();
for (ULocale locale: locales) {
String localeID = locale.getName();
+ // BEGIN Android-added: Exclude pseudo locales since they are not present in CLDR data.
+ if (localeID.endsWith("_XA") || localeID.endsWith("_XB")) {
+ // skip pseudo-locales
+ continue;
+ }
+ // END Android-added: Exclude pseudo locales since they are not present in CLDR data.
DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(locale);
DateFormat dfmt = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
String shortPattern = ((SimpleDateFormat)dfmt).toPattern();