From c10a04f6040638d85ccfad84d842799c987c21ae Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 3 Nov 2023 17:31:38 -0500
Subject: [PATCH] CLDR-17229 keyboard: v45 cherry-pick from maint-44

- cherry-pick from maint-44: CLDR-17204 kbd: dtd fix for locales (#3369)

- the <locale id> attribute was set as @VALUE which caused it to be wrongly flagged as a duplicate.

(cherry picked from commit b07c9d8c52f1b03bffa85a93672b1101dd19c19d)
---
 keyboards/dtd/ldmlKeyboard3.dtd                                  | 1 -
 keyboards/dtd/ldmlKeyboard3.xsd                                  | 1 -
 .../src/test/java/org/unicode/cldr/unittest/TestDtdData.java     | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd
index ef577e98bf8..64cd256411c 100644
--- a/keyboards/dtd/ldmlKeyboard3.dtd
+++ b/keyboards/dtd/ldmlKeyboard3.dtd
@@ -31,7 +31,6 @@ Please view the subcommittee page for the most recent information.
     <!--@TECHPREVIEW-->
 <!ATTLIST locale id CDATA #REQUIRED >
     <!--@MATCH:validity/bcp47-wellformed-->
-    <!--@VALUE-->
 
 <!ELEMENT version EMPTY >
     <!--@TECHPREVIEW-->
diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd
index 96a6f821e91..21eddd2aab6 100644
--- a/keyboards/dtd/ldmlKeyboard3.xsd
+++ b/keyboards/dtd/ldmlKeyboard3.xsd
@@ -76,7 +76,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   </xs:element>
   
   
-  
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number"/>
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
index f7e7dddbab6..46db897ae8b 100644
--- 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
@@ -766,6 +766,7 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
                         || elementName.equals("keyList") && attribute.equals("id")
                         || elementName.equals("flick") && attribute.equals("id")
                         || elementName.equals("import") && attribute.equals("path")
+                        || elementName.equals("locale") && attribute.equals("id")
                         || elementName.equals("import") && attribute.equals("base")
                         || elementName.equals("layer") && attribute.equals("id")
                         || elementName.equals("string") && attribute.equals("id")