Prechádzať zdrojové kódy

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

git-svn-id: trunk@27772 -
michael 11 rokov pred
rodič
commit
a397b1b480
1 zmenil súbory, kde vykonal 6 pridanie a 1 odobranie
  1. 6 1
      rtl/objpas/sysutils/dati.inc

+ 6 - 1
rtl/objpas/sysutils/dati.inc

@@ -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