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-17339 Fix problem in ChartDeltaDtds that was skipping keyboard3 #3536

Merged
merged 1 commit into from
Feb 28, 2024
Merged

CLDR-17339 Fix problem in ChartDeltaDtds that was skipping keyboard3 #3536

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
10 changes: 8 additions & 2 deletions tools/cldr-code/src/main/java/org/unicode/cldr/tool/ChartDtdDelta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ public void writeContents(FormattedFileWriter pw) throws IOException {
String firstVersion = type.firstVersion; // FIRST_VERSION.get(type);
if (firstVersion != null
&& current != null
&& current.compareTo(firstVersion) < 0) {
&& VersionInfo.getInstance(current)
.compareTo(VersionInfo.getInstance(firstVersion))
< 0) {
Comment on lines +155 to +157
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, needed to be a version compare not a lexical compare

// skip if current is too old to have “type”
continue;
}
Expand All @@ -174,7 +176,11 @@ public void writeContents(FormattedFileWriter pw) throws IOException {
continue;
}
DtdData dtdLast = null;
if (last != null && (firstVersion == null || last.compareTo(firstVersion) >= 0)) {
if (last != null
&& (firstVersion == null
|| VersionInfo.getInstance(last)
.compareTo(VersionInfo.getInstance(firstVersion))
>= 0)) {
Comment on lines +179 to +183
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

// only read if last isn’t too old to have “type”
dtdLast = DtdData.getInstance(type, last);
}
Expand Down
Loading