Changeset 219 for trunk/Packages/Common/Translator.pas

Timestamp:

Jan 17, 2025, 9:05:54 PM (4 days ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Remove U prefix from unit names.
• Modified: Use Gneeric.Collections instead of fgl.
• Modified: Do not use global form variables.

File:

• trunk/Packages/Common/Translator.pas (moved) (moved from trunk/Packages/Common/UTranslator.pas ) (10 diffs)

trunk/Packages/Common/Translator.pas

@@ -1 @@
-unit UTranslator;
-
-{$mode delphi}{$H+}
+unit Translator;
 
 interface
 
 uses
-  Classes, SysUtils, Forms, ExtCtrls, Controls, fgl, LazFileUtils, LazUTF8,
-  Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType,
-  LCLVersion;
+  Classes, SysUtils, Forms, ExtCtrls, Controls, LazFileUtils, LazUTF8,
+  Translations, TypInfo, Dialogs, FileUtil, LCLProc, Languages, LCLType,
+  LCLVersion, Generics.Collections;
 
 type
   THandleStringEvent = function (AValue: string): string of object;
 
-  TPoFiles = class(TFPGObjectList<TPOFile>)
+  TPoFiles = class(TObjectList<TPOFile>)
   end;
 
@@ -27 +25 @@
   { TComponentExcludesList }
 
-  TComponentExcludesList = class(TFPGObjectList<TComponentExcludes>)
+  TComponentExcludesList = class(TObjectList<TComponentExcludes>)
     function FindByClassType(AClassType: TClass): TComponentExcludes;
     procedure DumpToStrings(Strings: TStrings);
@@ -50 +48 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
-    function GetLangFileDir: string;
+    function GetLangFileDirs: TStrings;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -73 +71 @@
   end;
 
+const
+  PoExt = '.po';
+
 procedure Register;
 
-const
-  PoFileExt = '.po';
-
 
 implementation
+
+uses
+  Common;
 
 procedure Register;
@@ -166 +167 @@
   FileList: TStringList;
   I: Integer;
+  J: Integer;
   LocaleShort: string;
   SearchMask: string;
+  LangDirs: TStrings;
 begin
   FPoFiles.Clear;
-  if Assigned(FLanguage) then
-  try
+  if Assigned(FLanguage) then begin
     LocaleShort := GetLocaleShort;
     SearchMask := '*';
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
-    SearchMask := SearchMask + PoFileExt;
-    FileList := FindAllFiles(GetLangFileDir, SearchMask);
-    for I := 0 to FileList.Count - 1 do begin
-      FileName := FileList[I];
-      if FileExists(FileName) and (
-      ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoFileExt, FileName))) or
-      (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
-    end;
-  finally
-    FileList.Free;
+    SearchMask := SearchMask + PoExt;
+    LangDirs := GetLangFileDirs;
+    for J := 0 to LangDirs.Count - 1 do begin
+      FileList := FindAllFiles(LangDirs[J], SearchMask);
+      try
+        for I := 0 to FileList.Count - 1 do begin
+          FileName := FileList[I];
+          //FileName := FindLocaleFileName('.po');
+           if FileExists(FileName) and (
+          ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoExt, FileName))) or
+          (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
+        end;
+      finally
+        FileList.Free;
+      end;
+    end;
+    LangDirs.Free;
   end;
 end;
@@ -245 +254 @@
   I: Integer;
 begin
+
 //  PropInfo^.Name;
   // Using IsDefaultPropertyValue will tell us if we should write out
@@ -300 +310 @@
 end;
 
-function TTranslator.GetLangFileDir: string;
-begin
-  Result := FPoFilesFolder;
-  if not FilenameIsAbsolute(Result) then
-    Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Result;
+function TTranslator.GetLangFileDirs: TStrings;
+var
+  I: Integer;
+begin
+  Result := TStringList.Create;
+  Result.Delimiter := ';';
+  Result.StrictDelimiter := True;
+  Result.DelimitedText := FPoFilesFolder;
+
+  for I := 0 to Result.Count - 1 do begin
+    Result[I] := StringReplace(Result[I], '/', DirectorySeparator, [rfReplaceAll]);
+    Result[I] := StringReplace(Result[I], '\', DirectorySeparator, [rfReplaceAll]);
+    if (Copy(Result[I], 1, 1) <> DirectorySeparator) and (Copy(Result[I], 2, 2) <> ':\') then
+      Result[I] := ExtractFileDir(Application.ExeName) +
+        DirectorySeparator + Result[I];
+  end;
 end;
 
@@ -371 +392 @@
 var
   I: Integer;
-  LangDir: string;
-begin
-  LangDir := GetLangFileDir;
+  J: Integer;
+  LangDirs: TStrings;
+begin
+  LangDirs := GetLangFileDirs;
   Languages.SearchByCode('').Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with Languages[I] do begin
-    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
-      '.' + Code + PoFileExt) or (Code = 'en');
-  end;
+    for J := 0 to LangDirs.Count - 1 do begin
+      if FileExists(LangDirs[J] + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+        '.' + Code + PoExt) or (Code = 'en') then begin
+          Available := True;
+          Continue;
+        end;
+    end;
+  end;
+  LangDirs.Free;
 end;
 
@@ -468 +496 @@
 
   begin
+
     // ParamStrUTF8(0) is said not to work properly in linux, but I've tested it
     Result := ExtractFilePath(ParamStrUTF8(0)) + LangID +
@@ -568 +597 @@
 end;
 
-
 end.
-