Changeset 114 for trunk/Forms/FormMain.pas

Timestamp:

Jan 14, 2025, 8:56:52 AM (8 days ago)

Author:

chronos

Message:

• Fixed: Linux data directories detection.

File:

• trunk/Forms/FormMain.pas (modified) (1 diff)

trunk/Forms/FormMain.pas

@@ -165 +165 @@
 {$IFDEF UNIX}
 const
-  UnixLanguagesDir = '../Tunneler/Languages';
+  LanguagesDirName = 'Languages';
+  UnixLanguagesDir = '../share/Tunneler/' + LanguagesDirName;
+var
+  BaseDir: string;
+  NewDir: string;
 {$ENDIF}
 begin
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  Core.Core.Translator1.POFilesFolder := BaseDir + DirectorySeparator + LanguagesDirName;
+
   {$IFDEF UNIX}
   // If installed in UNIX system then use installation directory for po files
-  if not DirectoryExists(Core.Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
-    Core.Core.Translator1.POFilesFolder := UnixLanguagesDir;
+  NewDir := ExpandFileName(BaseDir + DirectorySeparator + UnixLanguagesDir);
+  if not DirectoryExists(Core.Core.Translator1.POFilesFolder) and DirectoryExists(NewDir) then
+    Core.Core.Translator1.POFilesFolder := NewDir;
   {$ENDIF}