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

* Fix AM/PM for strtotime

Browse Source
This commit is contained in:
michael 2019-10-02 19:16:20 +00:00
parent b827092f20
commit 1d588bea49
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

@ -2979,12 +2979,12 @@ var
allowedchars:=DecimalSeparator+' ';
if Separator<>#0 then
allowedchars:=allowedchars+Separator;
while (Cur < Len -1) and (Pos(S[Cur + 1],AllowedChars)=0)
while (Cur < Len) and (Pos(S[Cur + 1],AllowedChars)=0)
and (Pos(S[Cur + 1],Digits)=0) do Inc(Cur);
ElemLen := 1 + Cur - OffSet;
// writeln(' S[Offset] = ',S[1+Offset], ' S[Cur] = ',S[Cur],' ElemLen = ',ElemLen,' -> ', S[1+Offset], ElemLen);
// writeln(' Cur = ',Cur, 'S =',S);
AmPmStr := Copy(S,1+OffSet, ElemLen);
// writeln(' S[Offset] = ',S[Offset], ' S[Cur] = ',S[Cur],' ElemLen = ',ElemLen,' -> ', S[1+Offset], ElemLen);
// writeln(' Cur = ',Cur, ', S =',S);
AmPmStr := Copy(S,OffSet, ElemLen);
// writeln('AmPmStr = ',ampmstr,' (',length(ampmstr),')');
//We must compare to TimeAMString before hardcoded 'AM' for delphi compatibility