Browse Source

Calculator: missed a localization spot

pull/1645/head
brianlagunas_cp 16 years ago
parent
commit
7fe3ee4d96
  1. 7
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs

7
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs

@ -2,6 +2,7 @@
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using System.Globalization;
namespace Microsoft.Windows.Controls.Core.Utilities namespace Microsoft.Windows.Controls.Core.Utilities
{ {
@ -32,7 +33,7 @@ namespace Microsoft.Windows.Controls.Core.Utilities
} }
//the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
if (text == System.Threading.Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencyDecimalSeparator) if (text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator)
return Calculator.CalculatorButtonType.Decimal; return Calculator.CalculatorButtonType.Decimal;
//check for the escape key //check for the escape key
@ -83,7 +84,7 @@ namespace Microsoft.Windows.Controls.Core.Utilities
content = "C"; content = "C";
break; break;
case Calculator.CalculatorButtonType.Decimal: case Calculator.CalculatorButtonType.Decimal:
content = "."; content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
break; break;
case Calculator.CalculatorButtonType.Divide: case Calculator.CalculatorButtonType.Divide:
content = "/"; content = "/";
@ -198,7 +199,7 @@ namespace Microsoft.Windows.Controls.Core.Utilities
public static decimal ParseDecimal(string text) public static decimal ParseDecimal(string text)
{ {
return Decimal.Parse(text, System.Threading.Thread.CurrentThread.CurrentCulture); return Decimal.Parse(text, CultureInfo.CurrentCulture);
} }
public static decimal Add(decimal firstNumber, decimal secondNumber) public static decimal Add(decimal firstNumber, decimal secondNumber)

Loading…
Cancel
Save