From d6d8756e3da0d673df12e0bfb169455eb6c8294f Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 20 Nov 2005 22:19:37 +0000
Subject: [PATCH] * hopefully fixed setup of long/shortdateformat setup

git-svn-id: trunk@1797 -
---
 rtl/win32/sysutils.pp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/rtl/win32/sysutils.pp b/rtl/win32/sysutils.pp
index 4233b8bd97..6b3fc944a6 100644
--- a/rtl/win32/sysutils.pp
+++ b/rtl/win32/sysutils.pp
@@ -581,7 +581,7 @@ procedure GetFormatSettings;
 var
   HF  : Shortstring;
   LID : LCID;
-  I,Day,DateOrder : longint;
+  I,Day : longint;
 begin
   LID := GetThreadLocale;
   { Date stuff }
@@ -597,21 +597,8 @@ begin
     LongDayNames[I]:=GetLocaleStr(LID,LOCALE_SDAYNAME1+Day,LongDayNames[i]);
     end;
   DateSeparator := GetLocaleChar(LID, LOCALE_SDATE, '/');
-  DateOrder := GetLocaleInt(LID, LOCALE_IDate, 0);
-  Case DateOrder Of
-     1: Begin
-        ShortDateFormat := 'dd/mm/yyyy';
-        LongDateFormat := 'dddd, d. mmmm yyyy';
-        End;
-     2: Begin
-        ShortDateFormat := 'yyyy/mm/dd';
-        LongDateFormat := 'dddd, yyyy mmmm d.';
-        End;
-  else
-    // Default american settings...
-    ShortDateFormat := 'mm/dd/yyyy';
-    LongDateFormat := 'dddd, mmmm d. yyyy';
-  End;
+  ShortDateFormat := GetLocaleStr(LID, LOCALE_SSHORTDATE, 'm/d/yy');
+  LongDateFormat := GetLocaleStr(LID, LOCALE_SLONGDATE, 'mmmm d, yyyy');
   { Time stuff }
   TimeSeparator := GetLocaleChar(LID, LOCALE_STIME, ':');
   TimeAMString := GetLocaleStr(LID, LOCALE_S1159, 'AM');