paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-27 01:21:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Invariant no format settings.

Browse Source
This commit is contained in:
Henrique Gottardi Werlang 2021-05-25 11:01:34 -03:00
parent bd550876b2
commit ffcb2ac150
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/rtl/sysutils.pas
View File

@ -93,6 +93,7 @@ type
class var InitLocaleHandler : TLocaleInitCallback; class var InitLocaleHandler : TLocaleInitCallback;
class function Create: TFormatSettings; overload; static; class function Create: TFormatSettings; overload; static;
class function Create(const ALocale: string): TFormatSettings; overload; static; class function Create(const ALocale: string): TFormatSettings; overload; static;
class function Invariant: TFormatSettings; static;
end; end;
@ -4960,11 +4961,6 @@ begin
Result:='0'+Result; Result:='0'+Result;
end; end;
{ TFormatSettings }
{ TFormatSettings } { TFormatSettings }
class function TFormatSettings.Create: TFormatSettings; class function TFormatSettings.Create: TFormatSettings;
@ -4972,11 +4968,8 @@ begin
Result := Create(GetJSLocale); Result := Create(GetJSLocale);
end; end;
class function TFormatSettings.Create(const ALocale: String): TFormatSettings;
class function TFormatSettings.Create(const ALocale: string): TFormatSettings;
begin begin
Result.LongDayNames:=DefaultLongDayNames; Result.LongDayNames:=DefaultLongDayNames;
Result.ShortDayNames:=DefaultShortDayNames; Result.ShortDayNames:=DefaultShortDayNames;
Result.ShortMonthNames:=DefaultShortMonthNames; Result.ShortMonthNames:=DefaultShortMonthNames;
@ -4998,10 +4991,35 @@ begin
Result.NegCurrFormat:=0; Result.NegCurrFormat:=0;
Result.CurrencyDecimals:=2; Result.CurrencyDecimals:=2;
Result.CurrencyString:='$'; Result.CurrencyString:='$';
If Assigned(TFormatSettings.InitLocaleHandler) then
if Assigned(TFormatSettings.InitLocaleHandler) then
TFormatSettings.InitLocaleHandler(UpperCase(aLocale),Result); TFormatSettings.InitLocaleHandler(UpperCase(aLocale),Result);
end; end;
class function TFormatSettings.Invariant: TFormatSettings;
begin
Result.CurrencyString := #$00A4;
Result.CurrencyFormat := 0;
Result.CurrencyDecimals := 2;
Result.DateSeparator := '/';
Result.TimeSeparator := ':';
Result.ShortDateFormat := 'MM/dd/yyyy';
Result.LongDateFormat := 'dddd, dd MMMMM yyyy HH:mm:ss';
Result.TimeAMString := 'AM';
Result.TimePMString := 'PM';
Result.ShortTimeFormat := 'HH:mm';
Result.LongTimeFormat := 'HH:mm:ss';
Result.ShortMonthNames := DefaultShortMonthNames;
Result.ShortMonthNames := DefaultShortMonthNames;
Result.LongMonthNames := DefaultLongMonthNames;
Result.ShortDayNames := DefaultShortDayNames;
Result.LongDayNames := DefaultLongDayNames;
Result.ThousandSeparator := ',';
Result.DecimalSeparator := '.';
Result.TwoDigitYearCenturyWindow := 50;
Result.NegCurrFormat := 0;
end;
class function TFormatSettings.GetJSLocale: string; assembler; class function TFormatSettings.GetJSLocale: string; assembler;
asm asm
return Intl.DateTimeFormat().resolvedOptions().locale return Intl.DateTimeFormat().resolvedOptions().locale