* Added (modified) patch for appending 0:0:0 in case of full date (Denis Golovan, bug ID #25109)

git-svn-id: trunk@27772 -
This commit is contained in:
michael 2014-05-11 14:11:44 +00:00
parent a6ad604207
commit a397b1b480

View File

@ -1006,7 +1006,7 @@ var
end ;
'/': StoreStr(@FormatSettings.DateSeparator, 1);
':': StoreStr(@FormatSettings.TimeSeparator, 1);
' ', 'C', 'D', 'H', 'M', 'N', 'S', 'T', 'Y','Z' :
' ', 'C', 'D', 'H', 'M', 'N', 'S', 'T', 'Y', 'Z', 'F' :
begin
while (P < FormatEnd) and (UpCase(P^) = Token) do
Inc(P);
@ -1088,6 +1088,11 @@ var
StoreFormat(FormatSettings.LongTimeFormat, Nesting+1, True);
end;
end;
'F': begin
StoreFormat(FormatSettings.ShortDateFormat, Nesting+1, False);
StoreString(' ');
StoreFormat(FormatSettings.LongTimeFormat, Nesting+1, True);
end;
{$IFDEF MSWindows}
'E':
begin