Changeset 154 for tags/1.4.0/Forms/UFormMain.pas

Timestamp:

Jan 14, 2025, 12:35:35 PM (16 months ago)

Author:

chronos

Message:

Merged revision(s) 152-153 from trunk:

• Modified: Improved flatpak packaging.
• Fixed: Detection of languages directory on Linux.
• Fixed: Top left menu alignment.
• Modified: Improved debian control script.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Forms/UFormMain.pas (modified) (1 diff)

tags/1.4.0/Forms/UFormMain.pas

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