Changeset 713 for trunk/Packages/CevoComponents/Directories.pas

Timestamp:

Jan 2, 2026, 10:51:00 PM (5 hours ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Packages/CevoComponents/Directories.pas (modified) (4 diffs)

trunk/Packages/CevoComponents/Directories.pas

@@ -22 +22 @@
 
 uses
-  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms;
+  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms,
+  Translations;
 
 function GetAppSharePath(Path: string): string;
@@ -33 +34 @@
   {$IFDEF UNIX}
   // If installed in Linux system then try to use different installation directory
+  NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    DirectorySeparator + 'share' + DirectorySeparator +
+    ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+
   if not DirectoryExists(Result) then begin
-    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
-      DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
     if DirectoryExists(NewPath) then begin
       Result := NewPath;
@@ -42 +44 @@
     end;
   end;
+
   if not FileExists(Result) then begin
-    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
-      DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
     if FileExists(NewPath) then begin
       Result := NewPath;
@@ -56 +56 @@
 function GetLocale: string;
 var
-  Lang: string;
   I: Integer;
-  T: string;
+  LanguageID: TLanguageID;
 begin
   // Win32 user may decide to override locale with LANG variable.
-  Lang := Copy(GetEnvironmentVariableUTF8('LANG'), 1, 2);
+  Result := Copy(GetEnvironmentVariableUTF8('LANG'), 1, 2);
 
-  if Lang = '' then begin
-    for I := 1 to Paramcount - 1 do
+  if Result = '' then begin
+    for I := 1 to ParamCount - 1 do
       if (ParamStrUTF8(I) = '--LANG') or (ParamStrUTF8(I) = '-l') or
         (ParamStrUTF8(I) = '--lang') then
-          Lang := ParamStrUTF8(I + 1);
+          Result := ParamStrUTF8(I + 1);
   end;
-  if Lang = '' then begin
-    T := '';
-    LazGetLanguageIDs(Lang, T);
-    Lang := Copy(Lang, 1, 2);
+  if Result = '' then begin
+    LanguageID := GetLanguageID;
+    Result := Copy(LanguageID.LanguageID, 1, 2);
   end;
-
-  Result := Lang;
 end;