Changeset 416 for trunk/Packages/Common

Timestamp:

Nov 17, 2021, 10:47:48 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Use Common package translator to solve duplicate ULanguages unit name.
• Modified: Also automatically detect new localizations in Localization directory.
• Fixed: Use localization files with first capital letter to work correctly on Linux.

Location:

trunk/Packages/Common

Files:

• ULanguages.pas (modified) (5 diffs)
• UTranslator.pas (modified) (20 diffs)

trunk/Packages/Common/ULanguages.pas

@@ -1 +1 @@
 unit ULanguages;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, fgl;
 
 type
@@ -15 +15 @@
   end;
 
-  { TLanguageList }
-
-  TLanguageList = class(TObjectList)
+  { TLanguages }
+
+  TLanguages = class(TFPGObjectList<TLanguage>)
     function SearchByCode(ACode: string): TLanguage;
     procedure AddNew(Code: string; Name: string);
-    constructor Create;
+    constructor Create(FreeObjects: Boolean = True);
   end;
 
@@ -223 +223 @@
 
 
-{ TLanguageList }
-
-function TLanguageList.SearchByCode(ACode: string): TLanguage;
+{ TLanguages }
+
+function TLanguages.SearchByCode(ACode: string): TLanguage;
 var
   I: Integer;
@@ -235 +235 @@
 end;
 
-procedure TLanguageList.AddNew(Code: string; Name: string);
+procedure TLanguages.AddNew(Code: string; Name: string);
 var
   NewItem: TLanguage;
@@ -245 +245 @@
 end;
 
-constructor TLanguageList.Create;
+constructor TLanguages.Create(FreeObjects: Boolean);
 begin
-  inherited Create;
+  inherited;
   AddNew('', SLangAuto);
   AddNew('aa', SLang_aa);

trunk/Packages/Common/UTranslator.pas

@@ -1 +1 @@
 unit UTranslator;
 
-{$mode Delphi}{$H+}
+{$mode delphi}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, Forms, ExtCtrls, Controls, Contnrs, LazFileUtils, LazUTF8,
+  Classes, SysUtils, Forms, ExtCtrls, Controls, fgl, LazFileUtils, LazUTF8,
   Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType,
   LCLVersion;
@@ -12 +12 @@
 type
   THandleStringEvent = function (AValue: string): string of object;
+
+  TPoFiles = class(TFPGObjectList<TPOFile>)
+  end;
 
   { TComponentExcludes }
@@ -24 +27 @@
   { TComponentExcludesList }
 
-  TComponentExcludesList = class(TObjectList)
+  TComponentExcludesList = class(TFPGObjectList<TComponentExcludes>)
     function FindByClassType(AClassType: TClass): TComponentExcludes;
     procedure DumpToStrings(Strings: TStrings);
@@ -36 +39 @@
     FOnAutomaticLanguage: THandleStringEvent;
     FOnTranslate: TNotifyEvent;
-    FPOFilesFolder: string;
-    FPOFiles: TObjectList; // TObjectList<TPOFile>;
+    FPoFilesFolder: string;
+    FPoFiles: TPoFiles;
     function GetLocale: string;
     function GetLocaleShort: string;
@@ -50 +53 @@
   public
     ComponentExcludes: TComponentExcludesList;
-    Languages: TLanguageList;
+    Languages: TLanguages;
     procedure Translate;
-    procedure LanguageListToStrings(Strings: TStrings);
+    procedure LanguageListToStrings(Strings: TStrings; WithCode: Boolean = True);
     procedure TranslateResourceStrings(PoFileName: string);
     procedure TranslateUnitResourceStrings(UnitName: string; PoFileName: string);
@@ -63 +66 @@
     destructor Destroy; override;
   published
-    property POFilesFolder: string read FPOFilesFolder write SetPOFilesFolder;
+    property POFilesFolder: string read FPoFilesFolder write SetPOFilesFolder;
     property Language: TLanguage read FLanguage write SetLanguage;
     property OnTranslate: TNotifyEvent read FOnTranslate write FOnTranslate;
@@ -71 +74 @@
 
 procedure Register;
+
 
 implementation
@@ -117 +121 @@
 destructor TComponentExcludes.Destroy;
 begin
-  PropertyExcludes.Free;
-  inherited Destroy;
+  FreeAndNil(PropertyExcludes);
+  inherited;
 end;
 
@@ -128 +132 @@
   I, J: Integer;
   Po: TPoFile;
-  Item: TPOFileItem;
+  Item: TPoFileItem;
 begin
   TranslateComponentRecursive(Application);
@@ -134 +138 @@
   // Merge files to single translation file
   try
-    Po := TPOFile.Create;
-    for I := 0 to FPOFiles.Count - 1 do
+    Po := TPoFile.Create;
+    for I := 0 to FPoFiles.Count - 1 do
     with TPoFile(FPoFiles[I]) do
       for J := 0 to Items.Count - 1 do
@@ -162 +166 @@
   SearchMask: string;
 begin
-  FPOFiles.Clear;
+  FPoFiles.Clear;
   if Assigned(FLanguage) then
   try
@@ -177 +181 @@
       if FileExists(FileName) and (
       ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
-      (LocaleShort <> '')) then FPOFiles.Add(TPOFile.Create(FileName));
+      (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
     end;
   finally
@@ -281 +285 @@
 var
   Item: TClass;
-
   Excludes: TComponentExcludes;
 begin
@@ -301 +304 @@
 function TTranslator.GetLangFileDir: string;
 begin
-  Result := FPOFilesFolder;
+  Result := FPoFilesFolder;
   if Copy(Result, 1, 1) <> DirectorySeparator then
     Result := ExtractFileDir(Application.ExeName) +
@@ -307 +310 @@
 end;
 
-procedure TTranslator.LanguageListToStrings(Strings: TStrings);
+procedure TTranslator.LanguageListToStrings(Strings: TStrings; WithCode: Boolean = True);
 var
   I: Integer;
@@ -318 +321 @@
       if Available then begin
         ItemName := Name;
-        if Code <> '' then ItemName := ItemName + ' (' + Code + ')';
+        if WithCode and (Code <> '') then ItemName := ItemName + ' (' + Code + ')';
         AddObject(ItemName, Languages[I]);
       end;
@@ -342 +345 @@
   if Text <> '' then begin
     for I := 0 to FPoFiles.Count - 1 do begin
-      Result := TPoFile(FPOFiles[I]).Translate(Identifier, Text);
+      Result := TPoFile(FPoFiles[I]).Translate(Identifier, Text);
       if Result <> Text then Break;
     end;
@@ -369 +372 @@
 begin
   LangDir := GetLangFileDir;
-  TLanguage(Languages[0]).Available := True; // Automatic
+  Languages.SearchByCode('').Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
@@ -381 +384 @@
 begin
   inherited;
-  FPOFiles := TObjectList.Create;
+  FPoFiles := TPoFiles.Create;
   ComponentExcludes := TComponentExcludesList.Create;
-  Languages := TLanguageList.Create;
+  Languages := TLanguages.Create;
   POFilesFolder := 'Languages';
   CheckLanguageFiles;
@@ -395 +398 @@
 destructor TTranslator.Destroy;
 begin
-  FPOFiles.Free;
-  Languages.Free;
-  ComponentExcludes.Free;
-  inherited Destroy;
+  FreeAndNil(FPoFiles);
+  FreeAndNil(Languages);
+  FreeAndNil(ComponentExcludes);
+  inherited;
 end;