Changeset 416

Timestamp:

Nov 17, 2021, 10:47:48 AM (2 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

Files:

• Help/Help.txt (moved) (moved from trunk/Help/help.txt )
• Integrated.lpi (modified) (2 diffs)
• LocalPlayer/Help.pas (modified) (1 diff)
• Localization/cs/Help/Help.txt (moved) (moved from trunk/Localization/cs/Help/help.txt )
• Localization/de/Help/Help.txt (moved) (moved from trunk/Localization/de/Help/help.txt )
• Localization/it/Help/Help.txt (moved) (moved from trunk/Localization/it/Help/help.txt )
• Localization/ru/Help/Help.txt (moved) (moved from trunk/Localization/ru/Help/help.txt )
• Localization/zh-Hans/Fonts.txt (moved) (moved from trunk/Localization/zh-Hans/fonts.txt )
• Localization/zh-Hans/Help/Help.txt (moved) (moved from trunk/Localization/zh-Hans/Help/help.txt )
• Localization/zh-Hans/Language.txt (moved) (moved from trunk/Localization/zh-Hans/language.txt )
• Localization/zh-Hant/Help/Help.txt (moved) (moved from trunk/Localization/zh-Hant/Help/help.txt )
• Localization/zh-Hant/Language.txt (moved) (moved from trunk/Localization/zh-Hant/language.txt )
• Packages/Common/ULanguages.pas (modified) (5 diffs)
• Packages/Common/UTranslator.pas (modified) (20 diffs)
• Settings.pas (modified) (4 diffs)
• Start.pas (modified) (7 diffs)
• ULanguages.pas (deleted)

trunk/Integrated.lpi

@@ -99 +99 @@
       </Item3>
     </RequiredPackages>
-    <Units Count="48">
+    <Units Count="47">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -360 +360 @@
         <IsPartOfProject Value="True"/>
       </Unit46>
-      <Unit47>
-        <Filename Value="ULanguages.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit47>
     </Units>
   </ProjectOptions>

trunk/LocalPlayer/Help.pas

@@ -290 +290 @@
 
   HelpText := TStringTable.Create;
-  HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'help.txt'));
+  HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'Help.txt'));
   hADVHELP := HelpText.Gethandle('ADVHELP');
   hIMPHELP := HelpText.Gethandle('IMPHELP');

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;
 

trunk/Settings.pas

@@ -58 +58 @@
 {$R *.lfm}
 
+uses
+  Start;
+
 var
   SFullScreen, SGamma, SRestartMsg, SShortCutPrimary, SShortCutSecondary,
@@ -193 +196 @@
 begin
   ReloadLanguages;
-  Languages.LoadToStrings(ListLanguages.Items);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items);
   ListLanguages.Font.Color := MainTexture.ColorMark;
   ListKeyBindings.Font.Color := MainTexture.ColorMark;
@@ -260 +263 @@
 procedure TSettingsDlg.LoadData;
 begin
-  ListLanguages.ItemIndex := Languages.Search(LocaleCode);
-  if (ListLanguages.ItemIndex = -1) and (Languages.Count > 0) then
-    ListLanguages.ItemIndex := 0;
+  StartDlg.Translator.Language := StartDlg.Translator.Languages.SearchByCode(LocaleCode);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items, False);
+  ListLanguages.ItemIndex := ListLanguages.Items.IndexOfObject(StartDlg.Translator.Language);
+  if ListLanguages.ItemIndex = -1 then ListLanguages.ItemIndex := 0;
   if FullScreen then ButtonFullscreen.ButtonIndex := 3
     else ButtonFullscreen.ButtonIndex := 2;
@@ -274 +278 @@
 begin
   NeedRestart := Gamma <> LocalGamma;
-  LocaleCode := Languages[ListLanguages.ItemIndex].ShortName;
+  if ListLanguages.ItemIndex <> -1 then begin
+    StartDlg.Translator.Language := TLanguage(ListLanguages.Items.Objects[ListLanguages.ItemIndex]);
+    LocaleCode := StartDlg.Translator.Language.Code;
+  end else begin
+    StartDlg.Translator.Language := nil;
+    LocaleCode := '';
+  end;
   FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
   Gamma := LocalGamma;

trunk/Start.pas

@@ -7 +7 @@
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap, UBrain;
+  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap, UBrain, UTranslator;
 
 type
@@ -133 +133 @@
     procedure LoadConfig;
     procedure SaveConfig;
+    procedure LoadLanguages;
     procedure LoadAiBrainsPictures;
     procedure UpdateInterface;
@@ -138 +139 @@
   public
     EmptyPicture: TBitmap;
+    Translator: TTranslator;
     procedure UpdateFormerGames;
     procedure UpdateMaps;
@@ -149 +151 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UKeyBindings;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UKeyBindings,
+  ULanguages;
 
 {$R *.lfm}
@@ -226 +229 @@
   LoadConfig;
   LoadAssets;
+  LoadLanguages;
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
@@ -325 +329 @@
 begin
   SaveConfig;
+  FreeAndNil(Translator);
   FreeAndNil(FormerGames);
   FreeAndNil(Maps);
@@ -454 +459 @@
 
   KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+end;
+
+procedure TStartDlg.LoadLanguages;
+var
+  I: Integer;
+begin
+  Translator := TTranslator.Create(nil);
+  with Translator, Languages do begin
+    AddNew('zh-Hant', 'Traditional Chinese');
+    AddNew('zh-Hans', 'Simplified Chinese');
+    SearchByCode('').Available := True;
+
+    for I := 1 to Languages.Count - 1 do
+    with Languages[I] do begin
+      Available := DirectoryExists(HomeDir + 'Localization' + DirectorySeparator + Code) or (Code = 'en');
+    end;
+  end;
 end;