From 4e446c618440270e2585d23d05cb037365578fc0 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Thu, 16 Jul 2009 16:44:15 +0000 Subject: [PATCH] * use ShortTimeFormat also for LongTimeFormat if T_FMT_AMPM is not defined for the current locale (Kylix-compatible, thanks to Luca Olivetti for the hint, fixes mantis #13947) git-svn-id: trunk@13395 - --- rtl/unix/clocale.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rtl/unix/clocale.pp b/rtl/unix/clocale.pp index 0e5f451578..38360a3933 100644 --- a/rtl/unix/clocale.pp +++ b/rtl/unix/clocale.pp @@ -260,7 +260,10 @@ begin OrgFormatSettings.LongTimeFormat:=longtimeformat; {$endif} - LongTimeFormat := TransformFormatStr(LongTimeFormat); + if (LongTimeFormat='') then + LongTimeFormat:=ShortTimeFormat + else + LongTimeFormat := TransformFormatStr(LongTimeFormat); {$Ifdef BSD} plocale:=localeconv;