Fix deserializing decimal quantities regardless of local culture (#911)

Fixes parsing JSON for decimal quantities like Power on machines with cultures like Norwegian, where a comma is decimal separator is used. Related to #847, #868
angularsen · Apr 4, 2021 · fbd89e7 · fbd89e7
1 parent 6bd8b26
commit fbd89e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs b/UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs
@@ -239,7 +239,7 @@ private class TestConverter : UnitsNetBaseJsonConverter<string>
                 var result = ConvertIQuantity(value);
                 if (result is ExtendedValueUnit {ValueType: "decimal"} decimalResult)
                 {
-                    return (result.Unit, decimal.Parse(decimalResult.ValueString));
+                    return (result.Unit, decimal.Parse(decimalResult.ValueString, CultureInfo.InvariantCulture));
                 }
 
                 throw new ArgumentException("The quantity does not have a decimal value", nameof(value));
@@ -274,7 +274,7 @@ public IQuantity Test_ConvertDecimalValueUnit(string unit, decimal value) => Tes
 
                 if (result is ExtendedValueUnit {ValueType: "decimal"} decimalResult)
                 {
-                    return (result.Unit, decimal.Parse(decimalResult.ValueString));
+                    return (result.Unit, decimal.Parse(decimalResult.ValueString, CultureInfo.InvariantCulture));
                 }
 
                 return null;

diff --git a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs
@@ -82,7 +82,7 @@ protected IQuantity ConvertValueUnit(ValueUnit valueUnit)
 
             return valueUnit switch
             {
-                ExtendedValueUnit {ValueType: "decimal"} extendedValueUnit => Quantity.From(decimal.Parse(extendedValueUnit.ValueString), unit),
+                ExtendedValueUnit {ValueType: "decimal"} extendedValueUnit => Quantity.From(decimal.Parse(extendedValueUnit.ValueString, CultureInfo.InvariantCulture), unit),
                 _ => Quantity.From(valueUnit.Value, unit)
             };
         }