Skip to content

Commit

Permalink
CLDR-17229 keyboard: v45 cherry-pick from maint-44
Browse files Browse the repository at this point in the history
- 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 b07c9d8)
  • Loading branch information
srl295 committed Nov 3, 2023
1 parent 12380e8 commit c10a04f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion keyboards/dtd/ldmlKeyboard3.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -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-->
Expand Down
1 change: 0 additions & 1 deletion keyboards/dtd/ldmlKeyboard3.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit c10a04f

Please sign in to comment.