Changeset 116

Timestamp:

Jan 14, 2025, 10:04:04 AM (8 days ago)

Author:

chronos

Message:

Merged revision(s) 114-115 from trunk:

• Fixed: Linux data directories detection.
• Added: French translation.

Files:

• tags/1.1.1 (modified) (1 prop)
• tags/1.1.1/Engine.pas (modified) (1 diff)
• tags/1.1.1/Forms/FormMain.pas (modified) (1 diff)
• tags/1.1.1/Install/flatpak/net.zdechov.app.Tunneler.yml (modified) (1 diff)
• tags/1.1.1/Languages/Tunneler.cs.po (modified) (2 diffs)
• tags/1.1.1/Languages/Tunneler.fr.po (copied) (copied from trunk/Languages/Tunneler.fr.po )
• trunk/Install/flatpak/net.zdechov.app.Tunneler.yml (modified) (1 diff)
• trunk/Languages/Tunneler.pot (modified) (1 diff)

tags/1.1.1/Engine.pas

@@ -1647 +1647 @@
 {$IFDEF UNIX}
 const
-  UnixDataDir = '/usr/share/Tunneler';
-  UnixAudioDir = UnixDataDir + '/Audio';
+  AudioDirName = 'Audio';
+  UnixDataDir = '../share/Tunneler';
+var
+  NewDir: string;
+  BaseDir: string;
 {$ENDIF}
 begin
-  Result := GetCurrentDir + DirectorySeparator + 'Audio';
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  Result := BaseDir + DirectorySeparator + AudioDirName;
   {$IFDEF UNIX}
-  if not DirectoryExists(Result) and DirectoryExists(UnixAudioDir) then begin
-    Result := UnixAudioDir;
-    Exit;
+  NewDir := ExpandFileName(BaseDir + DirectorySeparator + UnixDataDir +
+    DirectorySeparator + AudioDirName);
+  if not DirectoryExists(Result) and DirectoryExists(NewDir) then begin
+    Result := NewDir;
   end;
   {$ENDIF}

tags/1.1.1/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}
 

tags/1.1.1/Install/flatpak/net.zdechov.app.Tunneler.yml

@@ -29 +29 @@
       - type: svn
         url: https://svn.zdechov.net/Tunneler/tags/1.1.1
-        revision: r113
+        revision: r116
     buildsystem: simple
     build-commands:

tags/1.1.1/Languages/Tunneler.cs.po

@@ -219 +219 @@
 #, object-pascal-format
 msgid "The play command %s does not work on your system"
-msgstr ""
+msgstr "Play příkaz %s na vašem systému nefunguje"
 
 #: sound.sunabletoplay
@@ -374 +374 @@
 msgid "Controls"
 msgstr "Ovládání"
-

trunk/Install/flatpak/net.zdechov.app.Tunneler.yml

@@ -29 +29 @@
       - type: svn
         url: https://svn.zdechov.net/Tunneler/trunk
-        revision: r114
+        revision: r116
     buildsystem: simple
     build-commands:

trunk/Languages/Tunneler.pot

@@ -206 +206 @@
 msgstr ""
 
-#: sound.splaynotsupported
-#, object-pascal-format
-msgid "The play command %s does not work on your system"
-msgstr ""
-
 #: sound.sunabletoplay
 msgctxt "sound.sunabletoplay"