CLDR-17113 merge from upstream

unicode-org · Oct 3, 2023 · 1c4eacd · 1c4eacd
2 parents 95f8459 + 462530f
commit 1c4eacd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml
@@ -68,8 +68,6 @@
 		<key id="a" flickId="a" output="a" longPress="à â á ä ã å ā" />
 		<!-- test key -->
 		<key id="A" flickId="b" output="A" longPress="À Á Ä Ã Å Ā" />
-
-		<!-- test flick -->
 		<!-- TODO: all additional maps, hardware and touch -->
 	</keys>
 

diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
@@ -781,11 +781,10 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
                         || elementName.equals("key") && attribute.equals("flickId")
                         || elementName.equals("transforms") && attribute.equals("type")
                         || elementName.equals("transform") && attribute.equals("after")
-                        // || elementName.equals("row") && attribute.equals("keys")
+                        || elementName.equals("flickSegment") && attribute.equals("directions")
                         || elementName.equals("display") && attribute.equals("output")
                         || elementName.equals("display") && attribute.equals("id")
-                        || elementName.equals("flick") && attribute.equals("id")
-                        || elementName.equals("flickSegment") && attribute.equals("directions");
+                        || elementName.equals("flick") && attribute.equals("id");
             case keyboardTest3:
                 return elementName.equals("tests") && attribute.equals("name")
                         || elementName.equals("test") && attribute.equals("name")