Translate data type categories not too early, but after activating th…

…e user-wanted language. Closes #533
HeidiSQL · Feb 10, 2019 · c9f0073 · c9f0073
1 parent f72a2b7
commit c9f0073
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/source/main.pas b/source/main.pas
@@ -1595,6 +1595,7 @@ procedure TMainForm.FormCreate(Sender: TObject);
   wine_nt_to_unix_file_name: procedure(p1:pointer; p2:pointer); stdcall;
   OldSnippetsDir, CurrentSnippetsDir, TargetSnippet: String;
   Files: TStringDynArray;
+  dti: TDBDatatypeCategoryIndex;
 begin
   caption := APPNAME;
 
@@ -1617,6 +1618,11 @@ procedure TMainForm.FormCreate(Sender: TObject);
   menuQueryHelpersGenerateUpdate.Caption := f_('Generate %s ...', ['UPDATE']);
   menuQueryHelpersGenerateDelete.Caption := f_('Generate %s ...', ['DELETE']);
 
+  // Translate data type categories
+  for dti:=Low(DatatypeCategories) to High(DatatypeCategories) do begin
+    DatatypeCategories[dti].Name := _(DatatypeCategories[dti].Name);
+  end;
+
   // Detect version
   dwInfoSize := GetFileVersionInfoSize(PChar(Application.ExeName), dwWnd);
   GetMem(ptrVerBuf, dwInfoSize);

diff --git a/source/mysql_structures.pas b/source/mysql_structures.pas
@@ -1,4 +1,4 @@
-unit mysql_structures;
+unit mysql_structures;
 
 // -------------------------------------
 // MySQL Constants, Variables and Types
@@ -7504,7 +7504,6 @@   TServerVariable = record
 
   );
 
-  dti: TDBDatatypeCategoryIndex;
 
 
   function GetFunctionCategories: TStringList;
@@ -7644,10 +7643,6 @@ initialization
   '151=Cannot add a child row,'+
   '152=Cannot delete a parent row');
 
-// Translate data type categories
-for dti:=Low(DatatypeCategories) to High(DatatypeCategories) do begin
-  DatatypeCategories[dti].Name := _(DatatypeCategories[dti].Name);
-end;
 
 
 end.