mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-16 13:09:20 +02:00
lazutils: SysToUTF8: only UTF8_RTL, issue #35696, from Serge Anvarov
git-svn-id: trunk@61352 -
This commit is contained in:
parent
540835858f
commit
0eb446e94a
@ -322,10 +322,13 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
function SysToUTF8(const AFormatSettings: TFormatSettings): TFormatSettings;
|
function SysToUTF8(const AFormatSettings: TFormatSettings): TFormatSettings;
|
||||||
|
{$IFNDEF UTF8_RTL}
|
||||||
var
|
var
|
||||||
i: Integer;
|
i: Integer;
|
||||||
|
{$ENDIF}
|
||||||
begin
|
begin
|
||||||
Result := AFormatSettings;
|
Result := AFormatSettings;
|
||||||
|
{$IFNDEF UTF8_RTL}
|
||||||
Result.CurrencyString := SysToUTF8(AFormatSettings.CurrencyString);
|
Result.CurrencyString := SysToUTF8(AFormatSettings.CurrencyString);
|
||||||
for i:=1 to 12 do begin
|
for i:=1 to 12 do begin
|
||||||
Result.LongMonthNames[i] := SysToUTF8(AFormatSettings.LongMonthNames[i]);
|
Result.LongMonthNames[i] := SysToUTF8(AFormatSettings.LongMonthNames[i]);
|
||||||
@ -335,6 +338,7 @@ begin
|
|||||||
Result.LongDayNames[i] := SysToUTF8(AFormatSettings.LongDayNames[i]);
|
Result.LongDayNames[i] := SysToUTF8(AFormatSettings.LongDayNames[i]);
|
||||||
Result.ShortDayNames[i] := SysToUTF8(AFormatSettings.ShortDayNames[i]);
|
Result.ShortDayNames[i] := SysToUTF8(AFormatSettings.ShortDayNames[i]);
|
||||||
end;
|
end;
|
||||||
|
{$ENDIF}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function UTF8ToSys(const AFormatSettings: TFormatSettings): TFormatSettings;
|
function UTF8ToSys(const AFormatSettings: TFormatSettings): TFormatSettings;
|
||||||
|
Loading…
Reference in New Issue
Block a user