index 51f2ea698f63a1d6e8f62ebf069195e0fc95923e..b52113c85cf36b8b716f614e7605c809cd7629b4 100644 (file)
--- a/src/editor/f_options.pas
+++ b/src/editor/f_options.pas
procedure bGridClick(Sender: TObject);
- procedure FormActivate(Sender: TObject);
+ procedure FormShow(Sender: TObject);
procedure bOKClick(Sender: TObject);
procedure bCancelClick(Sender: TObject);
procedure bBackClick(Sender: TObject);
implementation
uses
- LazFileUtils, StrUtils, f_main, StdConvs, CONFIG, g_language, g_resources, g_options;
+ LazFileUtils, f_main, StdConvs, CONFIG, g_language, g_resources, g_options;
{$R *.lfm}
edD2dExe.Text := FindD2dDialog.FileName;
end;
-procedure TOptionsForm.FormActivate(Sender: TObject);
- var info: TSearchRec; s: String; i: Integer;
+procedure TOptionsForm.FormShow(Sender: TObject);
+ const langfilename = 'editor';
+ var info: TSearchRec;
begin
sDotColor.Brush.Color := DotColor;
cbShowDots.Checked := DotEnable;
cbLanguage.Items.BeginUpdate;
cbLanguage.Items.Clear;
cbLanguage.Items.Add('Auto');
- if FindFirst(LangDir + DirectorySeparator + '*.mo', faAnyFile, info) = 0 then
+ if FindFirst(LangDir + DirectorySeparator + langfilename + '.*.mo', faAnyFile, info) = 0 then
begin
repeat
- s := ExtractFileNameWithoutExt(info.Name);
- // TODO: check encoding part in name (editor.ru_RU.UTF-8.mo)
- i := Max(RPos('.', s), 1);
- s := Copy(s, i + 1, Length(s) - i);
- cbLanguage.Items.Add(s);
+ cbLanguage.Items.Add(Copy(ExtractFileNameWithoutExt(info.Name), Length(langfilename) + 2));
until FindNext(info) <> 0;
FindClose(info);
end;