Changeset 79 for trunk/Packages

Timestamp:

Aug 2, 2016, 10:06:50 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Use correct path for language files under Linux.

Location:

trunk/Packages

Files:

• Common/Languages/UJobProgressView.cs.po (modified) (1 diff)
• CoolTranslator/UCoolTranslator.pas (modified) (5 diffs)

trunk/Packages/Common/Languages/UJobProgressView.cs.po

@@ -39 +39 @@
 msgid "Total estimated time: %s"
 msgstr "Celkový odhadovaný čas: %s"
+

trunk/Packages/CoolTranslator/UCoolTranslator.pas

@@ -46 +46 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
+    function GetLangFileDir: string;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -161 +162 @@
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
     SearchMask := SearchMask + '.po';
-    FileList := FindAllFiles(ExtractFileDir(UTF8Encode(Application.ExeName)) +
-      DirectorySeparator + FPOFilesFolder, SearchMask);
+    FileList := FindAllFiles(GetLangFileDir, SearchMask);
     for I := 0 to FileList.Count - 1 do begin
       FileName := FileList[I];
@@ -180 +180 @@
   FPoFilesFolder := AValue;
   ReloadFiles;
+  CheckLanguageFiles;
 end;
 
@@ -290 +291 @@
 end;
 
+function TCoolTranslator.GetLangFileDir: string;
+begin
+  Result := FPOFilesFolder;
+  if Copy(Result, 1, 1) <> DirectorySeparator then
+    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+      DirectorySeparator + Result;
+end;
+
 procedure TCoolTranslator.LanguageListToStrings(Strings: TStrings);
 var
@@ -349 +358 @@
 var
   I: Integer;
-begin
+  LangDir: string;
+begin
+  LangDir := GetLangFileDir;
   TLanguage(Languages[0]).Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with TLanguage(Languages[I]) do begin
-    Available := FileExists(ExtractFileDir(UTF8Encode(Application.ExeName)) +
-      DirectorySeparator + POFilesFolder + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
       '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
   end;