From 81e2db47a98ba14a2d01bd67dbb61e05c92610f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Wed, 1 Nov 2023 17:07:04 +0100 Subject: [PATCH] * Add some methods to TFormatSettings for Delphi compatibility --- rtl/objpas/sysutils/sysint.inc | 35 +++++++++++++++++++++++++++++++++ rtl/objpas/sysutils/sysinth.inc | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/rtl/objpas/sysutils/sysint.inc b/rtl/objpas/sysutils/sysint.inc index d17b8cdb48..74d9ebdd6d 100644 --- a/rtl/objpas/sysutils/sysint.inc +++ b/rtl/objpas/sysutils/sysint.inc @@ -13,6 +13,41 @@ **********************************************************************} +class function TFormatSettings.Invariant : TFormatSettings; + +begin + With Result do + begin + CurrencyFormat:=1; + NegCurrFormat:=5; + ThousandSeparator:=','; + DecimalSeparator:='.'; + CurrencyDecimals:=2; + DateSeparator:='-'; + TimeSeparator:=':'; + ListSeparator:=','; + CurrencyString:='$'; + ShortDateFormat:='d/m/y'; + LongDateFormat:='dd" "mmmm" "yyyy'; + TimeAMString:='AM'; + TimePMString:='PM'; + ShortTimeFormat:='hh:nn'; + LongTimeFormat:='hh:nn:ss'; + ShortMonthNames:=['Jan','Feb','Mar','Apr','May','Jun', + 'Jul','Aug','Sep','Oct','Nov','Dec']; + LongMonthNames:=['January','February','March','April','May','June', + 'July','August','September','October','November','December']; + ShortDayNames:=['Sun','Mon','Tue','Wed','Thu','Fri','Sat']; + LongDayNames:=['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']; + TwoDigitYearCenturyWindow:=50; + end; +end; + +class function TFormatSettings.Create: TFormatSettings; inline; + +begin + Result:=DefaultFormatSettings; +end; procedure InitInternationalGeneric; begin diff --git a/rtl/objpas/sysutils/sysinth.inc b/rtl/objpas/sysutils/sysinth.inc index 90810b9cb7..d48bb0cc90 100644 --- a/rtl/objpas/sysutils/sysinth.inc +++ b/rtl/objpas/sysutils/sysinth.inc @@ -52,6 +52,10 @@ type ShortDayNames: TWeekNameArray; LongDayNames: TWeekNameArray; TwoDigitYearCenturyWindow: Word; + class function Invariant : TFormatSettings; static; + class function Create: TFormatSettings; overload; static; inline; + // class function Create(Locale: TLocaleID): TFormatSettings; overload; platform; static; + // class function Create(const LocaleName: string): TFormatSettings; overload; static; end; var