This commit is contained in:
mysticbbs 2012-08-08 13:52:19 -04:00
parent 0732e89c5f
commit 5ca0cb3b15
1 changed files with 8 additions and 4 deletions

View File

@ -69,10 +69,12 @@ Var
XYear : LongInt; XYear : LongInt;
Begin Begin
If Month <= 2 Then Begin If Month <= 2 Then Begin
Dec(Year); Dec (Year);
Inc(Month, 12); Inc (Month, 12);
End; End;
Dec(Month, 3);
Dec (Month, 3);
Century := Year DIV 100; Century := Year DIV 100;
XYear := Year MOD 100; XYear := Year MOD 100;
Century := (Century * JulianDay1) SHR 2; Century := (Century * JulianDay1) SHR 2;
@ -277,9 +279,11 @@ Begin
If Twelve Then Begin If Twelve Then Begin
If DT.Hour > 11 Then Begin If DT.Hour > 11 Then Begin
If DT.Hour = 12 Then Inc(DT.Hour, 12); If DT.Hour = 12 Then Inc(DT.Hour, 12);
Result := strZero(DT.Hour - 12) + ':' + strZero(DT.Min) + 'p' Result := strZero(DT.Hour - 12) + ':' + strZero(DT.Min) + 'p'
End Else Begin End Else Begin
If DT.Hour = 0 Then Inc(DT.Hour, 12); If DT.Hour = 0 Then Inc(DT.Hour, 12);
Result := strZero(DT.Hour) + ':' + strZero(DT.Min) + 'a'; Result := strZero(DT.Hour) + ':' + strZero(DT.Min) + 'a';
End; End;
End Else End Else
@ -326,4 +330,4 @@ Begin
Result := (Temp - Secs) >= 0; Result := (Temp - Secs) >= 0;
End; End;
End. End.