Changeset 75 for trunk

Timestamp:

Jan 15, 2017, 5:20:33 PM (8 years ago)

Author:

chronos

Message:

• Added: By default interface language should be selected according system language.

Location:

trunk

Files:

• Directories.pas (modified) (3 diffs)
• Locale.pas (modified) (1 diff)

trunk/Directories.pas

@@ -6 +6 @@
 var
   HomeDir, DataDir: string;
-  LocaleCode: string;
+  LocaleCode: string = '';
+  LocaleCodeAuto: string = '';
 
 function LocalizedFilePath(const Path: string): string;
@@ -14 +15 @@
 
 uses
-  LCLIntf, LCLType, SysUtils, FileUtil;
+  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils;
 
 var
   AppDataDir: string;
   src, dst: TSearchRec;
+
 
 function DirectoryExists(path: string): boolean;
@@ -27 +29 @@
 end;
 
+function GetLocale: string;
+var
+  Lang: string;
+  I: Integer;
+  T: string;
+begin
+  // Win32 user may decide to override locale with LANG variable.
+  Lang := GetEnvironmentVariableUTF8('LANG');
+
+  if Lang = '' 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);
+  end;
+  if Lang = '' then begin
+    LazGetLanguageIDs(Lang, T);
+    Lang := Copy(Lang, 1, 2);
+  end;
+
+  Result := Lang;
+end;
+
 function LocalizedFilePath(const Path: string): string;
+var
+  LocaleCodeDir: string;
 begin
-  if LocaleCode <> '' then begin
-    Result := HomeDir + 'Localization' + DirectorySeparator + LocaleCode + DirectorySeparator + Path;
+  if LocaleCode = '' then begin
+    if LocaleCodeAuto = '' then LocaleCodeAuto := GetLocale;
+    LocaleCodeDir := LocaleCodeAuto;
+  end else LocaleCodeDir := LocaleCode;
+
+  if LocaleCode <> 'en' then begin
+    Result := HomeDir + 'Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path;
     if not FileExists(Result) then
       Result := HomeDir + Path;

trunk/Locale.pas

@@ -88 +88 @@
 
   Languages := TLanguages.Create;
-  Languages.AddItem('', 'English');
+  Languages.AddItem('', 'System');
   Languages.AddItem('cs', 'Czech');
   Languages.AddItem('de', 'Deutch');
+  Languages.AddItem('en', 'English');
 
   OKBtn.Caption := Phrases.Lookup('BTN_OK');