Changeset 218 for trunk/Packages/Common/UTranslator.pas

Timestamp:

Jan 22, 2022, 4:21:47 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Relative path detection for language files directory.

File:

• trunk/Packages/Common/UTranslator.pas (modified) (7 diffs)

trunk/Packages/Common/UTranslator.pas

@@ -75 +75 @@
 procedure Register;
 
+const
+  PoFileExt = '.po';
+
 
 implementation
@@ -170 +173 @@
   try
     LocaleShort := GetLocaleShort;
-    //ShowMessage(ExtractFileDir(Application.ExeName) +
-    //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
     SearchMask := '*';
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
-    SearchMask := SearchMask + '.po';
+    SearchMask := SearchMask + PoFileExt;
     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 = '') and (Pos('.', FileName) = Pos(PoFileExt, FileName))) or
       (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
     end;
@@ -245 +245 @@
   I: Integer;
 begin
-
 //  PropInfo^.Name;
   // Using IsDefaultPropertyValue will tell us if we should write out
@@ -290 +289 @@
   Item := Component.ClassType;
   while Assigned(Item) do begin
-    //ShowMessage(Component.Name + ', ' + Component.ClassName + ', ' + Item.ClassName + ', ' + PropertyName);
     Excludes := ComponentExcludes.FindByClassType(Item.ClassType);
     if Assigned(Excludes) then begin
@@ -305 +303 @@
 begin
   Result := FPoFilesFolder;
-  if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(Application.ExeName) +
-      DirectorySeparator + Result;
+  if not FilenameIsAbsolute(Result) then
+    Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Result;
 end;
 
@@ -382 +379 @@
   with Languages[I] do begin
     Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
-      '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
+      '.' + Code + PoFileExt) or (Code = 'en');
   end;
 end;
@@ -471 +468 @@
 
   begin
-
     // ParamStrUTF8(0) is said not to work properly in linux, but I've tested it
     Result := ExtractFilePath(ParamStrUTF8(0)) + LangID +