Changeset 416 for trunk/Settings.pas

Timestamp:

Nov 17, 2021, 10:47:48 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Use Common package translator to solve duplicate ULanguages unit name.
• Modified: Also automatically detect new localizations in Localization directory.
• Fixed: Use localization files with first capital letter to work correctly on Linux.

File:

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

trunk/Settings.pas

@@ -58 +58 @@
 {$R *.lfm}
 
+uses
+  Start;
+
 var
   SFullScreen, SGamma, SRestartMsg, SShortCutPrimary, SShortCutSecondary,
@@ -193 +196 @@
 begin
   ReloadLanguages;
-  Languages.LoadToStrings(ListLanguages.Items);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items);
   ListLanguages.Font.Color := MainTexture.ColorMark;
   ListKeyBindings.Font.Color := MainTexture.ColorMark;
@@ -260 +263 @@
 procedure TSettingsDlg.LoadData;
 begin
-  ListLanguages.ItemIndex := Languages.Search(LocaleCode);
-  if (ListLanguages.ItemIndex = -1) and (Languages.Count > 0) then
-    ListLanguages.ItemIndex := 0;
+  StartDlg.Translator.Language := StartDlg.Translator.Languages.SearchByCode(LocaleCode);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items, False);
+  ListLanguages.ItemIndex := ListLanguages.Items.IndexOfObject(StartDlg.Translator.Language);
+  if ListLanguages.ItemIndex = -1 then ListLanguages.ItemIndex := 0;
   if FullScreen then ButtonFullscreen.ButtonIndex := 3
     else ButtonFullscreen.ButtonIndex := 2;
@@ -274 +278 @@
 begin
   NeedRestart := Gamma <> LocalGamma;
-  LocaleCode := Languages[ListLanguages.ItemIndex].ShortName;
+  if ListLanguages.ItemIndex <> -1 then begin
+    StartDlg.Translator.Language := TLanguage(ListLanguages.Items.Objects[ListLanguages.ItemIndex]);
+    LocaleCode := StartDlg.Translator.Language.Code;
+  end else begin
+    StartDlg.Translator.Language := nil;
+    LocaleCode := '';
+  end;
   FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
   Gamma := LocalGamma;