Skip to content

CLDR-15698 Time examples < 10 and > 12 #3895

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

Merged
merged 2 commits into from
Sep 11, 2024
Merged

CLDR-15698 Time examples < 10 and > 12 #3895

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffef7c7
CLDR-15698 Time examples < 10 and > 12
e-ikwut Aug 20, 2024
f2304f4
CLDR-15698 Apply formatter changes
echeran Sep 11, 2024
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
46 changes: 45 additions & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/test/ExampleGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.unicode.cldr.tool.LikelySubtags;
import org.unicode.cldr.util.AnnotationUtil;
import org.unicode.cldr.util.CLDRConfig;
Expand Down Expand Up @@ -92,6 +93,36 @@
import org.unicode.cldr.util.personname.PersonNameFormatter.NamePattern;
import org.unicode.cldr.util.personname.SimpleNameObject;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.ibm.icu.impl.Row.R3;
import com.ibm.icu.impl.Utility;
import com.ibm.icu.impl.number.DecimalQuantity;
import com.ibm.icu.impl.number.DecimalQuantity_DualStorageBCD;
import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.text.BreakIterator;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.DateFormatSymbols;
import com.ibm.icu.text.DateTimePatternGenerator;
import com.ibm.icu.text.DecimalFormat;
import com.ibm.icu.text.DecimalFormatSymbols;
import com.ibm.icu.text.ListFormatter;
import com.ibm.icu.text.MessageFormat;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.text.PluralRules;
import com.ibm.icu.text.PluralRules.DecimalQuantitySamples;
import com.ibm.icu.text.PluralRules.DecimalQuantitySamplesRange;
import com.ibm.icu.text.PluralRules.Operand;
import com.ibm.icu.text.PluralRules.SampleType;
import com.ibm.icu.text.SimpleDateFormat;
import com.ibm.icu.text.SimpleFormatter;
import com.ibm.icu.text.UTF16;
import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.Output;
import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale;

/**
* Class to generate examples and help messages for the Survey tool (or console version).
*
Expand Down Expand Up @@ -169,6 +200,9 @@ public class ExampleGenerator {

private static final Date DATE_SAMPLE2;
private static final Date DATE_SAMPLE3;
private static final Date DATE_SAMPLE4;
private static final Date DATE_SAMPLE5;


static {
Calendar calendar = Calendar.getInstance(ZONE_SAMPLE, ULocale.ENGLISH);
Expand All @@ -179,6 +213,11 @@ public class ExampleGenerator {
DATE_SAMPLE2 = calendar.getTime();
calendar.set(1999, 8, 5, 7, 0, 0); // 1999-09-05 07:00:00
DATE_SAMPLE3 = calendar.getTime();
calendar.set(1999, 8, 5, 23, 0, 0); // 1999-09-05 23:00:00
DATE_SAMPLE4 = calendar.getTime();

calendar.set(1999, 8, 5, 3, 25, 59); // 1999-09-05 03:25:59
DATE_SAMPLE5 = calendar.getTime();
}

static final List<DecimalQuantity> CURRENCY_SAMPLES =
Expand Down Expand Up @@ -2670,7 +2709,12 @@ private String handleDateFormatItem(String xpath, String value, boolean showCont
+ contextheader
+ exampleEndSymbol
: "";
example = addExampleResult(sdf.format(DATE_SAMPLE), example, showContexts);
String sup_twelve_example = sdf.format(DATE_SAMPLE);
String sub_ten_example = sdf.format(DATE_SAMPLE5);
example = addExampleResult(sup_twelve_example, example, showContexts);
if (!sup_twelve_example.equals(sub_ten_example)) {
example = addExampleResult(sub_ten_example, example, showContexts);
}
return example;
}
} else {
Expand Down
Loading