Skip to content

Commit

Permalink
Fixed formatting using spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
haytenf committed Aug 12, 2024
1 parent 8cc6f65 commit 2d1b73d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2623,15 +2623,23 @@ private String handleDateFormatItem(String xpath, String value, boolean showCont
}
} else {
List<String> examples = new ArrayList<>();
DayPeriodInfo dayPeriodInfo = supplementalDataInfo.getDayPeriods(DayPeriodInfo.Type.format, cldrFile.getLocaleID());
Set<DayPeriod> dayPeriods = new LinkedHashSet<DayPeriod>(dayPeriodInfo.getPeriods());
DayPeriodInfo dayPeriodInfo =
supplementalDataInfo.getDayPeriods(
DayPeriodInfo.Type.format, cldrFile.getLocaleID());
Set<DayPeriod> dayPeriods =
new LinkedHashSet<DayPeriod>(dayPeriodInfo.getPeriods());
for (DayPeriod dayPeriod : dayPeriods) {
if (dayPeriod.equals(DayPeriod.midnight)) { // suppress midnight, see ICU-12278 bug
if (dayPeriod.equals(
DayPeriod.midnight)) { // suppress midnight, see ICU-12278 bug
continue;
}
R3<Integer, Integer, Boolean> info = dayPeriodInfo.getFirstDayPeriodInfo(dayPeriod);
R3<Integer, Integer, Boolean> info =
dayPeriodInfo.getFirstDayPeriodInfo(dayPeriod);
if (info != null) {
int time = ((info.get0() + info.get1()) / 2); // dayPeriod endpoints overlap, midpoint to disambiguate
int time =
((info.get0() + info.get1())
/ 2); // dayPeriod endpoints overlap, midpoint to
// disambiguate
String formatted = sdf.format(time);
examples.add(formatted);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1123,38 +1123,38 @@ private void checkDayPeriod(
checkPathValue(exampleGenerator, path, cldrFile.getStringValue(path), expected);
}

public void TestAllDayPeriods() { // excludes midnight, see ICU-12278
public void TestAllDayPeriods() { // excludes midnight, see ICU-12278
checkDayPeriodsForLocale(
"en",
"Bhm",
"en",
"Bhm",
"〖3:00 at night〗〖9:00 in the morning〗〖12:00 noon〗〖3:00 in the afternoon〗〖7:30 in the evening〗");
checkDayPeriodsForLocale(
"it",
"Bhm",
"it",
"Bhm",
"〖3:00 di notte〗〖9:00 di mattina〗〖12:00 mezzogiorno〗〖3:00 di pomeriggio〗〖9:00 di sera〗");
checkDayPeriodsForLocale(
"de",
"Bhm",
"de",
"Bhm",
"〖2:30 nachts〗〖7:30 morgens〗〖11:00 vorm.〗〖12:30 mittags〗〖3:30 nachm.〗〖9:00 abends〗");
checkDayPeriodsForLocale("zh", "Bhm", "〖凌晨2:30〗〖早上6:30〗〖上午10:00〗〖中午12:30〗〖下午4:00〗〖晚上9:30〗");
checkDayPeriodsForLocale(
"zh",
"Bhm",
"〖凌晨2:30〗〖早上6:30〗〖上午10:00〗〖中午12:30〗〖下午4:00〗〖晚上9:30〗");
checkDayPeriodsForLocale(
"am",
"EBhm",
"am",
"EBhm",
"〖ሐሙስ በሌሊት 3:00〗〖ሐሙስ ጥዋት 9:00〗〖ሐሙስ ቀትር 12:00〗〖ሐሙስ ከሰዓት 3:00〗〖ሐሙስ በምሽት 9:00〗");
checkDayPeriodsForLocale(
"hi",
"EBhms",
"hi",
"EBhms",
"〖गुरु रात 2:00:00〗〖गुरु सुबह 8:00:00〗〖गुरु दोपहर 2:00:00〗〖गुरु शाम 6:00:00〗");
}

public void checkDayPeriodsForLocale(String localeId, String pattern, String expected) {
ExampleGenerator exampleGenerator = getExampleGenerator(localeId);
String path = "//ldml/dates/calendars/calendar[@type=\"gregorian\"]"
+ "/dateTimeFormats/availableFormats/dateFormatItem"
+ "[@id=\"" + pattern + "\"]";
String path =
"//ldml/dates/calendars/calendar[@type=\"gregorian\"]"
+ "/dateTimeFormats/availableFormats/dateFormatItem"
+ "[@id=\""
+ pattern
+ "\"]";
String message = "Day periods with pattern \"" + pattern + "\"";
checkValue(message, expected, exampleGenerator, path);
}
Expand Down

0 comments on commit 2d1b73d

Please sign in to comment.