Changeset 116 for trunk/UCore.pas

Timestamp:

Aug 18, 2021, 5:50:18 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package files.
• Fixed: Translation of About dialog.
• Added: Snap package definition file.
• Modified: Detect different data dir on Linux.

File:

• trunk/UCore.pas (modified) (3 diffs)

trunk/UCore.pas

@@ -31 +31 @@
     procedure ScaleDPI;
   public
+    DataDir: string;
     Project: TProject;
     Targets: TTargetList;
@@ -64 +65 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-begin
+const
+  LinuxDataDir = '/usr/share/LazFuck';
+  LinuxLanguagesDir = LinuxDataDir + '/Languages';
+begin
+  DataDir := '';
+  {$IFDEF Linux}
+  // If installed in Linux system then use installation shared game directory for data files
+  if DirectoryExists(LinuxDataDir) then
+    DataDir := LinuxDataDir;
+  // If installed in Linux system then use installation directory for po files
+  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+    Translator.POFilesFolder := LinuxLanguagesDir;
+  {$ENDIF}
+
   Project := TProject.Create;
   Targets := TTargetList.Create;
@@ -79 +93 @@
   Targets.Add(TTargetCSharp.Create);
   Targets.Add(TTargetJavascript.Create);
-
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-    Translator.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
-  {$ENDIF}
 
   LoadFromRegistry(Core.ApplicationInfo.GetRegistryContext);