Changeset 159

Timestamp:

Jun 12, 2023, 11:46:36 PM (17 months ago)

Author:

chronos

Message:

• Modified: Support multiple translator PO directories.

Location:

trunk

Files:

• Core.lfm (modified) (1 diff)
• Forms/FormCompareSideBySide.lfm (modified) (10 diffs)
• Forms/FormCompareSideBySide.pas (modified) (1 diff)
• Forms/FormContacts.pas (modified) (1 diff)
• Forms/FormExport.lfm (modified) (3 diffs)
• Packages/Common/Translator.pas (modified) (6 diffs)
• Packages/SynEditEx/SynEditEx.lpk (modified) (1 diff)
• Packages/SynEditEx/SynEditEx.pas (moved) (moved from trunk/Packages/SynEditEx/USynEditEx.pas ) (3 diffs)
• Packages/SynEditEx/SynEditExPackage.pas (added)

trunk/Core.lfm

@@ -8544 +8544 @@
   end
   object Translator: TTranslator
-    POFilesFolder = 'Languages'
+    POFilesFolder = 'Languages;Packages/Common/Languages;Packages/VCard/Languages'
     OnTranslate = TranslatorTranslate
     Left = 115

trunk/Forms/FormCompareSideBySide.lfm

@@ -5 +5 @@
   Width = 1191
   Caption = 'Compare side by side'
-  ClientHeight = 858
+  ClientHeight = 854
   ClientWidth = 1191
   DesignTimePPI = 144
@@ -18 +18 @@
   object PanelLeft: TPanel
     Left = 0
-    Height = 858
+    Height = 854
     Top = 0
     Width = 584
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 858
+    ClientHeight = 854
     ClientWidth = 584
     TabOrder = 0
     object EditLeftFileName: TEdit
       Left = 15
-      Height = 33
+      Height = 43
       Top = 11
       Width = 523
@@ -37 +37 @@
     inline SynEditLeft: TSynEditEx
       Left = 15
-      Height = 785
+      Height = 781
       Top = 61
       Width = 562
@@ -48 +48 @@
       ParentFont = False
       TabOrder = 1
-      Gutter.Width = 73
+      Gutter.Width = 75
       Gutter.MouseActions = <>
       RightGutter.Width = 0
@@ -503 +503 @@
         end
         object SynGutterLineNumber1: TSynGutterLineNumber
-          Width = 13
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clBtnFace
@@ -548 +548 @@
   object Splitter1: TSplitter
     Left = 584
-    Height = 858
+    Height = 854
     Top = 0
     Width = 8
@@ -554 +554 @@
   object PanelRight: TPanel
     Left = 592
-    Height = 858
+    Height = 854
     Top = 0
     Width = 599
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 858
+    ClientHeight = 854
     ClientWidth = 599
     TabOrder = 2
     object EditRightFileName: TEdit
       Left = 12
-      Height = 33
+      Height = 43
       Top = 11
       Width = 527
@@ -573 +573 @@
     inline SynEditRight: TSynEditEx
       Left = 15
-      Height = 785
+      Height = 781
       Top = 61
       Width = 571
@@ -584 +584 @@
       ParentFont = False
       TabOrder = 1
-      Gutter.Width = 73
+      Gutter.Width = 75
       Gutter.MouseActions = <>
       RightGutter.Width = 0
@@ -1039 +1039 @@
         end
         object SynGutterLineNumber1: TSynGutterLineNumber
-          Width = 13
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clBtnFace

trunk/Forms/FormCompareSideBySide.pas

@@ -7 +7 @@
   VCard, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
   SynEditMiscClasses, SynHighlighterPosition, SynEditHighlighter, Common,
-  USynEditEx;
+  SynEditEx;
 
 type

trunk/Forms/FormContacts.pas

@@ -384 +384 @@
 begin
   LoadFromRegistry(Context);
-  UpdateColumns;
   Core.Core.Translator.TranslateComponentRecursive(Self);
   Core.Core.ThemeManager1.UseTheme(Self);
   Core.Core.PersistentForm1.Load(Self);
+  UpdateColumns;
   ReloadList;
   UpdateInterface;

trunk/Forms/FormExport.lfm

@@ -41 +41 @@
     Top = 9
     Width = 805
-    HorzScrollBar.Page = 521
+    HorzScrollBar.Page = 473
     VertScrollBar.Page = 225
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -56 +56 @@
     end
     object ComboBoxOutputFormat: TComboBox
-      Left = 256
+      Left = 208
       Height = 42
       Top = 76
@@ -75 +75 @@
     end
     object EditOutputFile: TEdit
-      Left = 139
+      Left = 208
       Height = 43
       Top = 24
-      Width = 533
+      Width = 464
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 1

trunk/Packages/Common/Translator.pas

@@ -48 +48 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
-    function GetLangFileDir: string;
+    function GetLangFileDirs: TStrings;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -71 +71 @@
   end;
 
+const
+  PoExt = '.po';
+
 procedure Register;
 
 
 implementation
+
+uses
+  Common;
 
 procedure Register;
@@ -161 +167 @@
   FileList: TStringList;
   I: Integer;
+  J: Integer;
   LocaleShort: string;
   SearchMask: string;
+  LangDirs: TStrings;
 begin
   FPoFiles.Clear;
@@ -172 +180 @@
     SearchMask := '*';
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
-    SearchMask := SearchMask + '.po';
-    FileList := FindAllFiles(GetLangFileDir, SearchMask);
-    for I := 0 to FileList.Count - 1 do begin
-      FileName := FileList[I];
-      //FileName := FindLocaleFileName('.po');
-      if FileExists(FileName) and (
-      ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
-      (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
-    end;
+    SearchMask := SearchMask + PoExt;
+    LangDirs := GetLangFileDirs;
+    for J := 0 to LangDirs.Count - 1 do begin
+      FileList := FindAllFiles(LangDirs[J], SearchMask);
+      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;
+    end;
+    LangDirs.Free;
   finally
     FileList.Free;
@@ -299 +311 @@
 end;
 
-function TTranslator.GetLangFileDir: string;
-begin
-  Result := FPoFilesFolder;
-  if Copy(Result, 1, 1) <> DirectorySeparator 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 then
+      Result[I] := ExtractFileDir(Application.ExeName) +
+        DirectorySeparator + Result[I];
+  end;
 end;
 
@@ -371 +393 @@
 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 + ExtensionSeparator + 'po') 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;
 

trunk/Packages/SynEditEx/SynEditEx.lpk

@@ -30 +30 @@
     <Files>
       <Item>
-        <Filename Value="USynEditEx.pas"/>
+        <Filename Value="SynEditEx.pas"/>
         <HasRegisterProc Value="True"/>
-        <UnitName Value="USynEditEx"/>
+        <UnitName Value="SynEditEx"/>
+      </Item>
+      <Item>
+        <Filename Value="SynEditExPackage.pas"/>
+        <Type Value="Main Unit"/>
+        <UnitName Value="SynEditExPackage"/>
       </Item>
     </Files>

trunk/Packages/SynEditEx/SynEditEx.pas

@@ -1 @@
-unit USynEditEx;
+unit SynEditEx;
 
 interface
@@ -28 +28 @@
 end;
 
-
 { TSynEditEx }
 
@@ -38 +37 @@
 end;
 
-
 end.