Changeset 79

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

Files:

• Forms/UFormMain.pas (modified) (6 diffs)
• Install/deb/AcronymDecoder.deb (deleted)
• Install/deb/build-deb-amd64.sh (modified) (1 diff)
• Install/deb/build-deb-i386.sh (modified) (1 diff)
• Packages/Common/Languages/UJobProgressView.cs.po (modified) (1 diff)
• Packages/CoolTranslator/UCoolTranslator.pas (modified) (5 diffs)

trunk/Forms/UFormMain.pas

@@ -9 +9 @@
   ComCtrls, StdCtrls, ExtCtrls, ActnList, UAcronym, UPersistentForm, URegistry,
   ULastOpenedList, UListViewSort, UJobProgressView, UCoolTranslator, Registry,
-  SpecializedList, LazUTF8;
+  SpecializedList, LazUTF8, LazFileUtils;
 
 type
@@ -167 +167 @@
   ProjectExt = '.adp';
   DefaultFileName = 'Acronyms' + ProjectExt;
-  DefaultRegKey = '\Software\Acronym Decoder';
+  DefaultRegKey = '\Software\Chronosoft\Acronym Decoder';
   RegistryRunKey = '\Software\Microsoft\Windows\CurrentVersion\Run';
   ExampleFile = 'Example acronyms.adp';
@@ -480 +480 @@
     LoadConfig;
 
-{$IFDEF 0}
+    {$IFDEF 0}
     if Application.HasOption('h', 'help') then begin
       WriteLn('AcronymDecoder <project file>');
@@ -488 +488 @@
       Exit;
     end;
-{$ENDIF}
+    {$ENDIF}
+
     if Application.HasOption('t', 'tray') then begin
       Visible := False;
@@ -504 +505 @@
     end else begin
       // Open default database with examples if no item is in recent openned history
-      ProjectOpen(ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile);
+      FileNameOption := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
+      {$IFDEF Linux}
+      // If installed in Linux system then use installation directory for po files
+      if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
+        FileNameOption := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/Examples/' + ExampleFile;
+      {$ENDIF}
+      ProjectOpen(FileNameOption);
     end;
     UpdateAcronymsList;
@@ -620 +627 @@
   LastOpenedList1.LoadFromRegistry(RegistryContext);
 
+  {$IFDEF Linux}
+  // If installed in Linux system then use installation directory for po files
+  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
+    CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
+  {$ENDIF}
+
   with TRegistryEx.Create do
   try

trunk/Install/deb/build-deb-amd64.sh

@@ -7 +7 @@
 cat >AcronymDecoder/DEBIAN/control << EOF
 Package: AcronymDecoder
-Version: 1.0.1
+Version: 1.2.0
 Section: custom
 Priority: optional
 Architecture: amd64
 Essential: no
-Installed-Size: 6461192
 Maintainer: Chronos <robie@centrum.cz>
-Description: A tool for quick searching of acronym meaning
+Description: A tool for quick searching of acronym or abbreviaton meaning
 HomePage: http://svn.zdechov.net/trac/AcronymDecoder
 EOF

trunk/Install/deb/build-deb-i386.sh

@@ -7 +7 @@
 cat >AcronymDecoder/DEBIAN/control << EOF
 Package: AcronymDecoder
-Version: 1.0.1
+Version: 1.2.0
 Section: custom
 Priority: optional
 Architecture: i386
 Essential: no
-Installed-Size: 6461192
 Maintainer: Chronos <robie@centrum.cz>
 Description: A tool for quick searching of acronym meaning

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;