mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-19 09:59:29 +02:00
Merge branch 'ZeroSeparators' into 'main'
DateTimeToString: do not write #0 separators See merge request freepascal.org/fpc/source!5
This commit is contained in:
commit
5221388659
@ -1089,8 +1089,8 @@ var
|
||||
else
|
||||
raise EConvertError.Create('Illegal character in format string');
|
||||
end ;
|
||||
'/': StoreStr(@FormatSettings.DateSeparator, 1);
|
||||
':': StoreStr(@FormatSettings.TimeSeparator, 1);
|
||||
'/': if FormatSettings.DateSeparator<>#0 then StoreStr(@FormatSettings.DateSeparator, 1);
|
||||
':': if FormatSettings.TimeSeparator<>#0 then StoreStr(@FormatSettings.TimeSeparator, 1);
|
||||
'[': if (fdoInterval in Options) then isInterval := true else StoreStr(FormatCurrent, 1);
|
||||
']': if (fdoInterval in Options) then isInterval := false else StoreStr(FormatCurrent, 1);
|
||||
' ', 'C', 'D', 'H', 'M', 'N', 'S', 'T', 'Y', 'Z', 'F' {$IFDEF MSWindows}, 'G', 'E'{$ENDIF MSWindows} :
|
||||
|
Loading…
Reference in New Issue
Block a user