paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 05:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

* some debug stuff under ifdef + one fix for *BSD currency

Browse Source 
git-svn-id: trunk@10801 -
This commit is contained in:
marco 2008-04-26 11:30:11 +00:00
parent a88af10e7e
commit a37bb0dd6e
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rtl/unix/clocale.pp
View File

@ -20,6 +20,21 @@ unit clocale;
interface interface
{$ifdef localedebug}
// for easier debugging, allows to print untransformed values in test
Type TOrgFormatSettings = record
ShortDateFormat,
LongDateFormat ,
ShortTimeFormat,
LongTimeFormat ,
CurrencyString1,
CurrencyString2: string;
end;
var OrgFormatSettings : TOrgFormatSettings;
{$endif}
implementation implementation
{$linklib c} {$linklib c}
@ -198,17 +213,32 @@ begin
end; end;
//Date stuff //Date stuff
ShortDateFormat := GetLocaleStr(D_FMT); ShortDateFormat := GetLocaleStr(D_FMT);
{$ifdef localedebug}
OrgFormatSettings.ShortDateFormat:=shortdateformat;
{$endif}
DateSeparator := FindSeparator(ShortDateFormat, DateSeparator); DateSeparator := FindSeparator(ShortDateFormat, DateSeparator);
ShortDateFormat := TransformFormatStr(ShortDateFormat); ShortDateFormat := TransformFormatStr(ShortDateFormat);
LongDateFormat := GetLocaleStr(D_T_FMT); LongDateFormat := GetLocaleStr(D_T_FMT);
{$ifdef localedebug}
OrgFormatSettings.LongDateFormat:=longdateformat;
{$endif}
LongDateFormat := TransformFormatStr(LongDateFormat); LongDateFormat := TransformFormatStr(LongDateFormat);
//Time stuff //Time stuff
TimeAMString := GetLocaleStr(AM_STR); TimeAMString := GetLocaleStr(AM_STR);
TimePMString := GetLocaleStr(PM_STR); TimePMString := GetLocaleStr(PM_STR);
ShortTimeFormat := GetLocaleStr(T_FMT); ShortTimeFormat := GetLocaleStr(T_FMT);
{$ifdef localedebug}
OrgFormatSettings.ShortTimeFormat:=shorttimeformat;
{$endif}
TimeSeparator := FindSeparator(ShortTimeFormat, TimeSeparator); TimeSeparator := FindSeparator(ShortTimeFormat, TimeSeparator);
ShortTimeFormat := TransformFormatStr(ShortTimeFormat); ShortTimeFormat := TransformFormatStr(ShortTimeFormat);
LongTimeFormat := GetLocaleStr(T_FMT_AMPM); LongTimeFormat := GetLocaleStr(T_FMT_AMPM);
{$ifdef localedebug}
OrgFormatSettings.LongTimeFormat:=longtimeformat;
{$endif}
LongTimeFormat := TransformFormatStr(LongTimeFormat); LongTimeFormat := TransformFormatStr(LongTimeFormat);
{$Ifdef BSD} {$Ifdef BSD}
@ -216,8 +246,12 @@ begin
// for these fields there is a separate BSD derived POSIX function. // for these fields there is a separate BSD derived POSIX function.
if not assigned(plocale) then exit; // for now. if not assigned(plocale) then exit; // for now.
CurrencyString:=plocale^.CURRENCY_SYMBOL; CurrencyString:=plocale^.CURRENCY_SYMBOL;
CurrencyString := Copy(CurrencyString, 2, Length(CurrencyString)); CurrencyString := Copy(CurrencyString, 1, Length(CurrencyString));
CurrencyDecimals:=ord(plocale^.FRAC_DIGITS); CurrencyDecimals:=ord(plocale^.FRAC_DIGITS);
{$ifdef localedebug}
OrgFormatSettings.CurrencyString1:=plocale^.currency_symbol;
OrgFormatSettings.CurrencyString2:=plocale^.int_curr_symbol;
{$endif}
prec:=ord(plocale^.P_CS_PRECEDES); prec:=ord(plocale^.P_CS_PRECEDES);
sep:=ord(plocale^.P_SEP_BY_SPACE); sep:=ord(plocale^.P_SEP_BY_SPACE);
if (prec<=1) and (sep<=1) then if (prec<=1) and (sep<=1) then
@ -232,8 +266,11 @@ begin
{$else} {$else}
//Currency stuff //Currency stuff
CurrencyString := GetLocaleStr(_NL_MONETARY_CRNCYSTR); CurrencyString := GetLocaleStr(_NL_MONETARY_CRNCYSTR);
{$ifdef localedebug}
OrgFormatSettings.CurrencyString1:=currencystring;
OrgFormatSettings.CurrencyString2:='';
{$endif}
CurrencyString := Copy(CurrencyString, 2, Length(CurrencyString)); CurrencyString := Copy(CurrencyString, 2, Length(CurrencyString));
CurrencyDecimals := StrToIntDef(GetLocaleStr(__FRAC_DIGITS), CurrencyDecimals); CurrencyDecimals := StrToIntDef(GetLocaleStr(__FRAC_DIGITS), CurrencyDecimals);
prec := byte(GetLocaleChar(__P_CS_PRECEDES)); prec := byte(GetLocaleChar(__P_CS_PRECEDES));
sep := byte(GetLocaleChar(__P_SEP_BY_SPACE)); sep := byte(GetLocaleChar(__P_SEP_BY_SPACE));