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

* Fix issue with ignored formatsettings, reported by Roman Kassebaum, fixes issue #39235

Browse Source
This commit is contained in:
Michaël Van Canneyt 2022-09-30 21:28:18 +02:00
parent 634acb533a
commit 2f0cc94585
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/rtl/sysutils.pas
View File

@ -4416,18 +4416,18 @@ begin
Dec(I);
If I>0 then
begin
if not TryStrToDate(Copy(S,1,I-1),dtdate) then
if not TryStrToDate(Copy(S,1,I-1),dtdate,aSettings) then
exit;
if not TryStrToTime(Copy(S,i+1, Length(S)-i),dttime) then
if not TryStrToTime(Copy(S,i+1, Length(S)-i),dttime,aSettings) then
exit;
Value:=ComposeDateTime(dtdate,dttime);
result:=true;
end
else
result:=TryStrToTime(s,Value);
result:=TryStrToTime(s,Value,aSettings);
end
else
result:=TryStrToDate(s,Value);
result:=TryStrToDate(s,Value,aSettings);
end;