Skip to content

ICU-23209 Don't load standard patterns by default in DTPG #3641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

ICU-23209 Don't load standard patterns by default in DTPG #3641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf67c38
CLDR-18881 Add test illustrating current behavior
sffc Sep 9, 2025
43f9616
Update code
sffc Sep 10, 2025
b779baa
Update test expectation
sffc Sep 10, 2025
c23d392
Update test expectation
sffc Sep 10, 2025
75fa7ae
Update the newly added test
sffc Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions icu4j/main/core/src/main/java/com/ibm/icu/text/DateTimePatternGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ private void initData(ULocale uLocale, boolean skipStdPatterns) {
PatternInfo returnInfo = new PatternInfo();

addCanonicalItems();
if (!skipStdPatterns) { // skip to prevent circular dependency when used by Calendar
addCLDRData(returnInfo, uLocale);
if (!skipStdPatterns && cldrAvailableFormatKeys.isEmpty()) { // skip to prevent circular dependency when used by Calendar
addICUPatterns(returnInfo, uLocale);
}
addCLDRData(returnInfo, uLocale);
if (!skipStdPatterns) { // also skip to prevent circular dependency from Calendar
setDateTimeFromCalendar(uLocale);
} else {
Expand Down
15 changes: 13 additions & 2 deletions icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ public void TestOptions() {
new TestOptionsItem( "da", "Hmm", "HH.mm", DateTimePatternGenerator.MATCH_NO_OPTIONS ),
new TestOptionsItem( "da", "HHmm", "HH.mm", DateTimePatternGenerator.MATCH_NO_OPTIONS ),
new TestOptionsItem( "da", "hhmm", "h.mm\u202Fa", DateTimePatternGenerator.MATCH_NO_OPTIONS ),
new TestOptionsItem( "da", "Hmm", "H.mm", DateTimePatternGenerator.MATCH_HOUR_FIELD_LENGTH ),
new TestOptionsItem( "da", "Hmm", "HH.mm", DateTimePatternGenerator.MATCH_HOUR_FIELD_LENGTH ),
new TestOptionsItem( "da", "HHmm", "HH.mm", DateTimePatternGenerator.MATCH_HOUR_FIELD_LENGTH ),
new TestOptionsItem( "da", "hhmm", "hh.mm\u202Fa", DateTimePatternGenerator.MATCH_HOUR_FIELD_LENGTH ),
//
Expand Down Expand Up @@ -1889,7 +1889,7 @@ public void testDateTimePatterns() {
"d MMM y, HH:mm",
"dd/MM/y HH:mm" } ),
new DTPLocaleAndResults( "ha", new String[]{
"EEEE d MMMM, y 'da' HH:mm",
"y MMMM d, EEEE 'da' HH:mm",
"d MMMM, y 'da' HH:mm",
"d MMM, y, HH:mm",
"y-MM-dd, HH:mm" } ),
Expand Down Expand Up @@ -2077,4 +2077,15 @@ public void testAlphabeticSubstitution23114() {
String bestPattern = dtpg.getBestPattern("GyMEd");
assertEquals("Should not substitute numeric for alpha", "EEE, MMM d, y G", bestPattern);
}

@Test
public void testTimePatternSelection18881() {
DateTimePatternGenerator dtpg0 = DateTimePatternGenerator.getInstance(ULocale.forLanguageTag("th"));
String bestPattern = dtpg0.getBestPattern("MMMMdjmsO");
assertEquals("getInstance", "d MMMM เวลา HH:mm:ss O", bestPattern);

DateTimePatternGenerator dtpg1 = DateTimePatternGenerator.getInstanceNoStdPat(ULocale.forLanguageTag("th"));
bestPattern = dtpg1.getBestPattern("MMMMdjmsO");
assertEquals("getInstanceNoStdPat", "d MMMM HH:mm:ss O", bestPattern);
}
}