paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 13:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

win: fix default ShortDateFormat and LongDateFormat

Browse Source
This commit is contained in:
Ondrej Pokorny 2021-08-11 11:06:17 +02:00 committed by Ondrej Pokorny
parent 2c81b44b1c
commit 0ae0e741cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtl/win/sysutils.pp
View File

@ -1197,7 +1197,7 @@ begin
end;
procedure GetLocaleFormatSettings(LCID: Integer; var FormatSettings: TFormatSettings);
function FixSeparator(const FromSeparator, ToSeparator: Char; const Format: string): string;
function FixSeparator(const Format: string; const FromSeparator, ToSeparator: Char): string;
var
R: PChar;
begin
@ -1208,7 +1208,7 @@ procedure GetLocaleFormatSettings(LCID: Integer; var FormatSettings: TFormatSett
while R^<>#0 do
begin
if R^=FromSeparator then
R^:='/';
R^:=ToSeparator;
Inc(R);
end;
end;
@ -1233,8 +1233,8 @@ begin
LongDayNames[I]:=GetLocaleStr(LID,LOCALE_SDAYNAME1+Day,LongDayNames[i]);
end;
DateSeparator := GetLocaleChar(LID, LOCALE_SDATE, '/');
ShortDateFormat := FixSeparator(DateSeparator, '/', GetLocaleStr(LID, LOCALE_SSHORTDATE, 'm/d/yy'));
LongDateFormat := FixSeparator(DateSeparator, '/', GetLocaleStr(LID, LOCALE_SLONGDATE, 'mmmm d, yyyy'));
ShortDateFormat := FixSeparator(GetLocaleStr(LID, LOCALE_SSHORTDATE, 'm/d/yy'), DateSeparator, '/');
LongDateFormat := FixSeparator(GetLocaleStr(LID, LOCALE_SLONGDATE, 'mmmm d, yyyy'), DateSeparator, '/');
{ Time stuff }
TimeSeparator := GetLocaleChar(LID, LOCALE_STIME, ':');
TimeAMString := GetLocaleStr(LID, LOCALE_S1159, 'AM');