diff --git a/BeefLibs/corlib/src/Globalization/NumberFormatInfo.bf b/BeefLibs/corlib/src/Globalization/NumberFormatInfo.bf index 18ca0f3b..d97b1272 100644 --- a/BeefLibs/corlib/src/Globalization/NumberFormatInfo.bf +++ b/BeefLibs/corlib/src/Globalization/NumberFormatInfo.bf @@ -256,13 +256,14 @@ namespace System.Globalization { }*/ - /*public static NumberFormatInfo GetInstance(IFormatProvider formatProvider) + public static NumberFormatInfo GetInstance(IFormatProvider formatProvider) { // Fast case for a regular CultureInfo - /*NumberFormatInfo info; + NumberFormatInfo info; CultureInfo cultureProvider = formatProvider as CultureInfo; - if (cultureProvider != null && !cultureProvider.m_isInherited) { - info = cultureProvider.numInfo; + if (cultureProvider != null && !cultureProvider.[Friend]m_isInherited) + { + info = cultureProvider.mNumInfo; if (info != null) { return info; } @@ -281,10 +282,8 @@ namespace System.Globalization { return info; } } - return CurrentInfo;*/ - }*/ - - + return CurrentInfo; + } /*public Object Clone() { diff --git a/BeefLibs/corlib/src/NumberFormatter.bf b/BeefLibs/corlib/src/NumberFormatter.bf index edf01dc5..99800f23 100644 --- a/BeefLibs/corlib/src/NumberFormatter.bf +++ b/BeefLibs/corlib/src/NumberFormatter.bf @@ -1510,12 +1510,11 @@ namespace System static NumberFormatInfo sDefaultNFI = new NumberFormatInfo() ~ delete _; - private NumberFormatInfo GetNumberFormatInstance (IFormatProvider fp) + private NumberFormatInfo GetNumberFormatInstance(IFormatProvider fp) { - /*if (_nfi != null && fp == null) + if (_nfi != null && fp == null) return _nfi; - return NumberFormatInfo.GetInstance (fp);*/ - return sDefaultNFI; + return NumberFormatInfo.GetInstance(fp); } CultureInfo CurrentCulture