Changeset 112 for trunk

Timestamp:

Jan 13, 2025, 11:21:28 PM (6 weeks ago)

Author:

chronos

Message:

• Fixed: Languages directory detection on Linux.

Location:

trunk

Files:

• Core.lfm (modified) (1 diff)
• Forms/FormMain.pas (modified) (1 diff)
• Install/flatpak/build.sh (modified) (1 diff)
• Packages/Common/Translator.pas (modified) (1 diff)

trunk/Core.lfm

@@ -546 +546 @@
   end
   object Translator1: TTranslator
-    POFilesFolder = 'Languages'
+    POFilesFolder = 'Languages;Packages/Common/Languages'
     Left = 660
     Top = 266

trunk/Forms/FormMain.pas

@@ -165 +165 @@
 {$IFDEF UNIX}
 const
-  UnixLanguagesDir = '/usr/share/Tunneler/Languages';
+  UnixLanguagesDir = '../Tunneler/Languages';
 {$ENDIF}
 begin

trunk/Install/flatpak/build.sh

@@ -13 +13 @@
 
 # Build
-flatpak run org.flatpak.Builder --force-clean --sandbox --system --install --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=$REPO_DIR $BUILD_DIR $FLATPAK_ID.yml
+flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=$REPO_DIR $BUILD_DIR $FLATPAK_ID.yml
 
 # Run

trunk/Packages/Common/Translator.pas

@@ -322 +322 @@
     Result[I] := StringReplace(Result[I], '/', DirectorySeparator, [rfReplaceAll]);
     Result[I] := StringReplace(Result[I], '\', DirectorySeparator, [rfReplaceAll]);
-    if Copy(Result[I], 1, 1) <> DirectorySeparator then
+    if (Copy(Result[I], 1, 1) <> DirectorySeparator) and (Copy(Result[I], 2, 2) <> ':\') then
       Result[I] := ExtractFileDir(Application.ExeName) +
         DirectorySeparator + Result[I];