From c9f00734dfc352df59cf2e26897c7547cbfe1070 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 10 Feb 2019 12:49:14 +0100 Subject: [PATCH] Translate data type categories not too early, but after activating the user-wanted language. Closes #533 --- source/main.pas | 6 ++++++ source/mysql_structures.pas | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/main.pas b/source/main.pas index c8108993..d6c2964e 100644 --- a/source/main.pas +++ b/source/main.pas @@ -1595,6 +1595,7 @@ var 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 @@ begin 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 index 6ba538eb..9c186c03 100644 --- 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 @@ var ); - dti: TDBDatatypeCategoryIndex; function GetFunctionCategories: TStringList; @@ -7644,10 +7643,6 @@ MySQLErrorCodes := Explode(',', '0=No error,'+ '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.