From fe5cd430d32ed37095e2c2a5e6b4baeeeebda4cc Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 22 Nov 2005 00:32:41 +0000 Subject: [PATCH] STABLE14-windows-date-representation-20051121 change date representation to yyyy-MM-dd HH:mm:ss so that it sorts properly (cherry picked from commit 81365856ce91121c82969f97c1e79d34d30da648) --- src/WINNT/talocale/tal_string.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/WINNT/talocale/tal_string.cpp b/src/WINNT/talocale/tal_string.cpp index f1a96e5d8..c0422cacf 100644 --- a/src/WINNT/talocale/tal_string.cpp +++ b/src/WINNT/talocale/tal_string.cpp @@ -823,21 +823,21 @@ BOOL FormatTime (LPTSTR pszTarget, LPTSTR pszFormatUser, SYSTEMTIME *pst, BOOL f } else { - GetTimeFormat (LOCALE_USER_DEFAULT, 0, <, NULL, szTime, cchRESOURCE); - GetDateFormat (LOCALE_USER_DEFAULT, DATE_SHORTDATE, <, NULL, szDate, cchRESOURCE); + GetTimeFormat (LOCALE_USER_DEFAULT, 0, <, "HH:mm:ss", szTime, cchRESOURCE); + GetDateFormat (LOCALE_USER_DEFAULT, 0, <, "yyyy-MM-dd", szDate, cchRESOURCE); if (fShowTime && fShowDate) { - lstrcat (szTime, TEXT(" ")); - lstrcat (szTime, szDate); + lstrcat (szDate, TEXT(" ")); + lstrcat (szDate, szTime); } - else if (fShowDate && !fShowTime) + else if (!fShowDate && fShowTime) { - lstrcpy (szTime, szDate); + lstrcpy (szDate, szTime); } } - wsprintf (pszTarget, FixFormatString (pszFormatUser), szTime); + wsprintf (pszTarget, FixFormatString (pszFormatUser), szDate); return rc; } -- 2.39.5