diff --git a/Logic/Support/Formatting.cs b/Logic/Support/Formatting.cs index c8071f26..e2cdc7e0 100644 --- a/Logic/Support/Formatting.cs +++ b/Logic/Support/Formatting.cs @@ -158,6 +158,19 @@ namespace Swarmops.Logic.Support culture = CultureInfo.CurrentCulture; } + // If current culture has decimal point, but decimal comma is entered, allow that + + if (culture.NumberFormat.CurrencyDecimalSeparator == ".") + { + // If decimal comma in decimal point position, replace with decimal point + + if (input.Length > 3 && input[input.Length - 3] == ',') + { + input = input.Substring(0, input.Length - 3) + "." + input.Substring(input.Length - 2, 2); + } + } + + // Try current or provided culture first success = Double.TryParse(input, @@ -171,17 +184,6 @@ namespace Swarmops.Logic.Support // Try invariant (US) culture as fallback - // If decimal comma in decimal point position, replace with decimal point - - if (input.Length > 3) - { - if (input[input.Length - 3] == ',') - { - input = input.Substring(0, input.Length - 3) + "." + input.Substring(input.Length - 2, 2); - } - } - - success = Double.TryParse(input, NumberStyles.AllowThousands | NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out outputHolder);