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

…3536)
unicode-org · Feb 28, 2024 · c1c3887 · c1c3887
1 parent acc8544
commit c1c3887
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ChartDtdDelta.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ChartDtdDelta.java
@@ -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) {
                     // skip if current is too old to have “type”
                     continue;
                 }
@@ -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)) {
                     // only read if last isn’t too old to have “type”
                     dtdLast = DtdData.getInstance(type, last);
                 }