Merge pull request #10473 from keymanapp/fix/developer/10469-use-keyb…

…oard3-tag fix(developer): use keyboard3 tag rather than DTD to identify LDML keyboard xml files 🌱
keymanapp · Jan 26, 2024 · 95d3261 · 95d3261
2 parents fa91bdc + 7b0406d
commit 95d3261
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
@@ -75,7 +75,7 @@ function TLDMLKeyboardProjectTemplate.GetKeyboardFilename: string;
 const
   TemplateXML: string =
     '<?xml version="1.0" encoding="UTF-8"?>'#13#10+
-    '<!DOCTYPE keyboard3 SYSTEM "ldmlKeyboard3.dtd">'#13#10+
+    // We won't inject the DOCTYPE because of pathing challenges, CLDR-15505: '<!DOCTYPE keyboard3 SYSTEM "ldmlKeyboard3.dtd">'#13#10+
     '<keyboard3 />'#13#10;
 
 const

diff --git a/developer/src/tike/project/Keyman.Developer.System.Project.xmlLdmlProjectFile.pas b/developer/src/tike/project/Keyman.Developer.System.Project.xmlLdmlProjectFile.pas
@@ -83,7 +83,7 @@ class function TxmlLdmlProjectFile.IsFileTypeSupported(const Filename: string):
     ss := TStringStream.Create('', TEncoding.UTF8);
     try
       ss.LoadFromFile(Filename);
-      Result := ss.DataString.IndexOf('ldmlKeyboard3.dtd') > 0;
+      Result := ss.DataString.IndexOf('<keyboard3') > 0;
     finally
       ss.Free;
     end;