Changeset 23 for trunk/UCore.pas

Timestamp:

Aug 19, 2021, 11:47:56 AM (3 years ago)

Author:

chronos

Message:

• Added: Snap package definition file.
• Fixed: Selected theme in settings also changed language.
• Modified: Load correctly language files if installed on Linux.

File:

• trunk/UCore.pas (modified) (4 diffs)

trunk/UCore.pas

@@ -41 +41 @@
     ActionList1: TActionList;
     ApplicationInfo1: TApplicationInfo;
-    CoolTranslator1: TTranslator;
+    Translator: TTranslator;
     ImageList1: TImageList;
     LastOpenedList1: TLastOpenedList;
@@ -273 +273 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-begin
+const
+  LinuxLanguagesDir = '/usr/share/vCardStudio/Languages';
+begin
+  {$IFDEF Linux}
+  // If installed in Linux system then use installation directory for po files
+  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+    Translator.POFilesFolder := LinuxLanguagesDir;
+  {$ENDIF}
+
   DataFile := nil;
   DefaultDataFileClass := TContactsFile;
@@ -396 +404 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
     if ValueExists('LanguageCode') then
-      CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-      else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+      Translator.Language := Translator.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else Translator.Language := Translator.Languages.SearchByCode('');
     if ValueExists('Theme') then
       ThemeManager1.Theme := ThemeManager1.Themes.FindByName(ReadStringWithDefault('Theme', 'System'))
@@ -416 +424 @@
   try
     CurrentContext := ApplicationInfo1.GetRegistryContext;
-    if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-      WriteString('LanguageCode', CoolTranslator1.Language.Code)
+    if Assigned(Translator.Language) and (Translator.Language.Code <> '') then
+      WriteString('LanguageCode', Translator.Language.Code)
       else DeleteValue('LanguageCode');
     if Assigned(ThemeManager1.Theme) and (ThemeManager1.Theme.Name <> '') then