Skip to content
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

CLDR-18294 Avoid null Bailey values for paths with INHERITANCE_MARKER #4363

Merged
merged 1 commit into from
Feb 12, 2025
Merged

CLDR-18294 Avoid null Bailey values for paths with INHERITANCE_MARKER #4363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions common/main/br.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7745,9 +7745,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<zone type="Asia/Phnom_Penh">
<exemplarCity>Phnum Pénh</exemplarCity>
</zone>
<zone type="Pacific/Enderbury">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Kiritimati">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
Expand Down
2 changes: 0 additions & 2 deletions common/main/bs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2697,7 +2697,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
Expand Down Expand Up @@ -4100,7 +4099,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
Expand Down
2 changes: 0 additions & 2 deletions common/main/eu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2535,7 +2535,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
Expand Down Expand Up @@ -2839,7 +2838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yM">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
<dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="yMMMd">↑↑↑</dateFormatItem>
Expand Down
3 changes: 0 additions & 3 deletions common/main/gaa.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,9 +1681,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<zone type="Asia/Phnom_Penh">
<exemplarCity draft="unconfirmed">↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Enderbury">
<exemplarCity draft="unconfirmed">↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Kiritimati">
<exemplarCity draft="unconfirmed">↑↑↑</exemplarCity>
</zone>
Expand Down
3 changes: 0 additions & 3 deletions common/main/ha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3175,9 +3175,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<zone type="Asia/Phnom_Penh">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Enderbury">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Kanton">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
Expand Down
2 changes: 0 additions & 2 deletions common/main/so.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
Expand Down Expand Up @@ -2495,7 +2494,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
Expand Down
1 change: 0 additions & 1 deletion common/main/sv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,7 +1959,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="UMMM" draft="contributed">MMM U</dateFormatItem>
<dateFormatItem id="UMMMd" draft="contributed">d MMM U</dateFormatItem>
<dateFormatItem id="y" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="yMd" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyy" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyM" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyMd" draft="contributed">↑↑↑</dateFormatItem>
Expand Down
3 changes: 0 additions & 3 deletions common/main/yo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,9 +2949,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<zone type="Asia/Phnom_Penh">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Enderbury">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Pacific/Kanton">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
Expand Down
20 changes: 20 additions & 0 deletions tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,15 @@ public String getLocaleID() {
{"zhuyin", "collation"}
};

// Start, reference: https://unicode-org.atlassian.net/browse/CLDR-18294
// These codes are exceptional in the sense that adding code-fallback for them is expected
// to be temporary for v47, and different handling will be implemented in v48.
private static final String[] exceptionalLanguageTypes = {"gaa", "luo", "vai"};
private static final String[] exceptionalScriptTypes = {
"Ahom", "Arab", "Bali", "Cham", "Jamo", "Modi", "Newa", "Thai", "Toto"
};
// End, reference: https://unicode-org.atlassian.net/browse/CLDR-18294

private static final boolean SKIP_SINGLEZONES = false;
private static XMLSource constructedItems = new SimpleXMLSource(CODE_FALLBACK_ID);

Expand Down Expand Up @@ -1617,6 +1626,17 @@ public String getLocaleID() {
}
}

// Start, reference: https://unicode-org.atlassian.net/browse/CLDR-18294
for (String code : exceptionalLanguageTypes) {
constructedItems.putValueAtPath(NameType.LANGUAGE.getKeyPath(code), code);
}
for (String code : exceptionalScriptTypes) {
constructedItems.putValueAtPath(NameType.SCRIPT.getKeyPath(code), code);
}
constructedItems.putValueAtPath(
"//ldml/dates/timeZoneNames/metazone[@type=\"Acre\"]/long/generic", "Acre");
// End, reference: https://unicode-org.atlassian.net/browse/CLDR-18294

addFallbackCode(
"//ldml/dates/calendars/calendar[@type=\"gregorian\"]/eras/eraAbbr/era[@type=\"0\"]",
"BCE",
Expand Down
Loading