pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fix localization for select date component

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1220 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2010-05-10 16:45:12 +00:00
parent 162d9c868b
commit 14bfd3e8a9
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
components/rx/pickdate.pas
View File

@ -40,7 +40,7 @@ uses
LCLProc, LMessages, ExtCtrls, StdCtrls, Buttons, Forms, Menus; LCLProc, LMessages, ExtCtrls, StdCtrls, Buttons, Forms, Menus;
{ TRxCalendar } { TRxCalendar }
{
const const
//TRxShortDaysWeek: array[0..6] of string = ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); //TRxShortDaysWeek: array[0..6] of string = ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
TRxShortDaysOfWeek: array[0..6] of string = TRxShortDaysOfWeek: array[0..6] of string =
@ -48,7 +48,7 @@ const
TRxLongMonthNames: array[0..11] of string = TRxLongMonthNames: array[0..11] of string =
('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', ('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August',
'September', 'October', 'November', 'December'); 'September', 'October', 'November', 'December');
}
type type
TDayOfWeek = 0..6; TDayOfWeek = 0..6;
@ -292,10 +292,19 @@ begin
else else
{$ENDIF} {$ENDIF}
*) *)
with AFont do begin with AFont do
begin
Color := clWindowText; Color := clWindowText;
{$IFDEF WINDOWS}
Name := 'MS Sans Serif'; Name := 'MS Sans Serif';
Size := 8; Size := 8;
{$ELSE}
if Assigned(Application) and Assigned(Application.MainForm) then
Size := Application.MainForm.Font.Size
else
Size := 9;
Name := 'default';
{$ENDIF}
Style := []; Style := [];
end; end;
end; end;
@ -309,11 +318,7 @@ begin
for i:=1 to 12 do for i:=1 to 12 do
begin begin
MI:=TMenuItem.Create(Result); MI:=TMenuItem.Create(Result);
(* MI.Caption := LongMonthNames[i - 1];
// Old variant
// MI.Caption:=LongMonthNames[i];
*)
MI.Caption := TRxLongMonthNames[i - 1];
MI.OnClick:=AOnClick; MI.OnClick:=AOnClick;
MI.Tag:=i; MI.Tag:=i;
Result.Items.Add(MI); Result.Items.Add(MI);
@ -660,8 +665,8 @@ begin
if (FShortDaysOfWeek <> nil) and (FShortDaysOfWeek.Count = 0) then begin if (FShortDaysOfWeek <> nil) and (FShortDaysOfWeek.Count = 0) then begin
//OldNotify := FDaysOfWeek.OnChange; //OldNotify := FDaysOfWeek.OnChange;
//TStringList(FShortDays).OnChange := nil; //TStringList(FShortDays).OnChange := nil;
for Ind := Low(TRxShortDaysOfWeek) to High(TRxShortDaysOfWeek) do for Ind := 1 to 7 do
FShortDaysOfWeek.Add(TRxShortDaysOfWeek[Ind]); FShortDaysOfWeek.Add(SysUtils.ShortDayNames[Ind]);
//FShortDaysOfWeek.OnChange := OldNotify; //FShortDaysOfWeek.OnChange := OldNotify;
end; end;
end; end;
@ -979,8 +984,8 @@ begin
FMonthNames := TStringList.Create; FMonthNames := TStringList.Create;
if FMonthNames.Count = 0 then begin if FMonthNames.Count = 0 then begin
for i := Low(TRxLongMonthNames) to High(TRxLongMonthNames) do for i := Low(LongMonthNames) to High(LongMonthNames) do
FMonthNames.Add(TRxLongMonthNames[i]); FMonthNames.Add(LongMonthNames[i]);
end; end;
BackPanel := TPanel.Create(Self); BackPanel := TPanel.Create(Self);
@ -1121,7 +1126,7 @@ procedure TPopupCalendar.AutoSizeForm;
begin begin
FControlPanel.Height:=FCalendar.Canvas.TextHeight('Wg')+4; FControlPanel.Height:=FCalendar.Canvas.TextHeight('Wg')+4;
Height:=(FCalendar.Canvas.TextHeight('Wg')+4)*7+FControlPanel.Height + FCloseBtn.Height; Height:=(FCalendar.Canvas.TextHeight('Wg')+4)*7+FControlPanel.Height + FCloseBtn.Height;
Width:=FCalendar.Canvas.TextWidth('WWW')*7; Width:=FCalendar.Canvas.TextWidth(' WWW')*7;
FCalendar.AutoFillColumns:=true; FCalendar.AutoFillColumns:=true;
end; end;
@ -1240,7 +1245,7 @@ var
AYear, AMonth, ADay: Word; AYear, AMonth, ADay: Word;
begin begin
DecodeDate(FCalendar.CalendarDate, AYear, AMonth, ADay); DecodeDate(FCalendar.CalendarDate, AYear, AMonth, ADay);
s := Format('%s, %d', [TRxLongMonthNames[AMonth - 1], AYear]); s := Format('%s, %d', [LongMonthNames[AMonth - 1], AYear]);
FTitleLabel.Caption := s; // FTitleLabel.Caption := s; //
// FTitleLabel.Caption := FormatDateTime('MMMM, YYYY', FCalendar.CalendarDate); // FTitleLabel.Caption := FormatDateTime('MMMM, YYYY', FCalendar.CalendarDate);
end; end;