feat: re-enable codepage => charset mapping using GetACP from DelphiCompat unit

ansgarbecker · ansgarbecker · commit 79e4654fc072 · 2026-01-02T10:21:48.000+01:00
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -8,7 +8,7 @@ interface
   Classes, SysUtils, Generics.Collections, Controls, RegExpr, Math, FileUtil,
   StrUtils, Graphics, GraphUtil, LCLIntf, Forms, Clipbrd, Process, ActnList, Menus, Dialogs,
   Character, DateUtils, laz.VirtualTrees, SynEdit, SynCompletion, fphttpclient,
-  {$IFDEF WINDOWS} Windows, {$ENDIF}
+  {$IFDEF WINDOWS} Windows, {$ENDIF} DelphiCompat,
   dbconnection, dbstructures, jsonregistry, lazaruscompat, fpjson, SynEditKeyCmds, LazFileUtils, gettext, LazUTF8,
   IniFiles, GraphType;
 
@@ -2463,7 +2463,7 @@ function GetHTMLCharsetByEncoding(Encoding: TEncoding): String;
 begin
   Result := '';
   if Encoding = TEncoding.Default then
-    Result := 'utf-8' // 'Windows-'+IntToStr(GetACP)
+    Result := 'Windows-'+IntToStr(GetACP)
   else if Encoding.CodePage = 437 then
     Result := 'ascii'
   else if Encoding = TEncoding.Unicode then
diff --git a/source/main.pas b/source/main.pas
@@ -13739,8 +13739,7 @@ function TMainForm.GetCharsetByEncoding(Encoding: TEncoding): String;
   Result := '';
   if Encoding = TEncoding.Default then begin
     // Listing taken from http://forge.mysql.com/worklog/task.php?id=1349
-    // This would require to use the Windows unit, which would cause conflicts with Beep
-    {case GetACP of
+    case GetACP of
       437: Result := 'cp850';
       850: Result := 'cp850';
       852: Result := 'cp852';
@@ -13789,7 +13788,7 @@ function TMainForm.GetCharsetByEncoding(Encoding: TEncoding): String;
       51950: Result := 'big5';
       54936: Result := 'gb18030';
       65001: Result := 'utf8';
-    end;}
+    end;
   end else if (Encoding <> nil) and (Encoding.CodePage = 437) then
     Result := 'ascii'
   else if Encoding = TEncoding.Unicode then
