diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 67c2162c4b..f5ab03add7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,11 +27,11 @@ For a fairly complete summary of the unit definition JSON schema, see [Meter of ### Conversion functions Converting from unit A to B is achieved by first converting from unit A to the base unit, then from the base unit to unit B. To achieve this, each unit defines two conversion functions. -* Prefer multiplication for `FromUnitToBaseFunc` (`x*2.54e-2` for `Inch` to `Meter`) -* Prefer division for `FromBaseToUnitFunc` (`x/2.54e-2` for `Meter` to `Inch`) +* Prefer multiplication for `FromUnitToBaseFunc` (`{x}*2.54e-2` for `Inch` to `Meter`) +* Prefer division for `FromBaseToUnitFunc` (`{x}/2.54e-2` for `Meter` to `Inch`) * Prefer scientific notation `1e3` and `1e-5` instead of `1000` and `0.00001` -* Prefer a constant if the conversion factor is finite (`x*2.54e-2` for `Inch`) -* Prefer a calculation if the conversion factor is infinite (`(x/72.27)*2.54e-2` for `PrinterPoint`) +* Prefer a constant if the conversion factor is finite (`{x}*2.54e-2` for `Inch`) +* Prefer a calculation if the conversion factor is infinite (`({x}/72.27)*2.54e-2` for `PrinterPoint`) ### Units Generally we try to name the units as what is the most widely used. diff --git a/CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs b/CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs index 9a915bb586..4aa11797fc 100644 --- a/CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs +++ b/CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs @@ -208,7 +208,7 @@ private void GenerateConversionMethods() {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromUnitToBaseFunc.Replace("x", "_value"); + var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } @@ -230,7 +230,7 @@ private void GenerateConversionMethods() {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue"); + var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs index 998b5829dd..8694e214b9 100644 --- a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs @@ -954,7 +954,7 @@ IQuantity IQuantity.ToUnit(Enum unit) {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromUnitToBaseFunc.Replace("x", "_value"); + var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } @@ -987,7 +987,7 @@ IQuantity IQuantity.ToUnit(Enum unit) {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue"); + var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } diff --git a/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs index 100720d74a..534916baf3 100644 --- a/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs +++ b/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs @@ -639,7 +639,7 @@ public double As({_unitEnumName} unit) {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromUnitToBaseFunc.Replace("x", "_value"); + var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } @@ -661,7 +661,7 @@ public double As({_unitEnumName} unit) {{"); foreach (var unit in _quantity.Units) { - var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue"); + var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue"); Writer.WL($@" case {_unitEnumName}.{unit.SingularName}: return {func};"); } diff --git a/Common/UnitDefinitions/Acceleration.json b/Common/UnitDefinitions/Acceleration.json index 1cb4c0b3ad..ba08234065 100644 --- a/Common/UnitDefinitions/Acceleration.json +++ b/Common/UnitDefinitions/Acceleration.json @@ -14,8 +14,8 @@ "L": "Meter", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -35,8 +35,8 @@ "L": "Inch", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.0254", - "FromBaseToUnitFunc": "x/0.0254", + "FromUnitToBaseFunc": "{x}*0.0254", + "FromBaseToUnitFunc": "{x}/0.0254", "Localization": [ { "Culture": "en-US", @@ -55,8 +55,8 @@ "L": "Foot", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.304800", - "FromBaseToUnitFunc": "x/0.304800", + "FromUnitToBaseFunc": "{x}*0.304800", + "FromBaseToUnitFunc": "{x}/0.304800", "Localization": [ { "Culture": "en-US", @@ -75,8 +75,8 @@ "L": "NauticalMile", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.5144444444444", - "FromBaseToUnitFunc": "x/0.5144444444444", + "FromUnitToBaseFunc": "{x}*0.5144444444444", + "FromBaseToUnitFunc": "{x}/0.5144444444444", "Localization": [ { "Culture": "en-US", @@ -95,8 +95,8 @@ "L": "NauticalMile", "T": "Minute" }, - "FromUnitToBaseFunc": "x*0.5144444444444/60", - "FromBaseToUnitFunc": "x/0.5144444444444*60", + "FromUnitToBaseFunc": "{x}*0.5144444444444/60", + "FromBaseToUnitFunc": "{x}/0.5144444444444*60", "Localization": [ { "Culture": "en-US", @@ -115,8 +115,8 @@ "L": "NauticalMile", "T": "Hour" }, - "FromUnitToBaseFunc": "x*0.5144444444444/3600", - "FromBaseToUnitFunc": "x/0.5144444444444*3600", + "FromUnitToBaseFunc": "{x}*0.5144444444444/3600", + "FromBaseToUnitFunc": "{x}/0.5144444444444*3600", "Localization": [ { "Culture": "en-US", @@ -135,8 +135,8 @@ "L": "Meter", "T": "Second" }, - "FromUnitToBaseFunc": "x*9.80665", - "FromBaseToUnitFunc": "x/9.80665", + "FromUnitToBaseFunc": "{x}*9.80665", + "FromBaseToUnitFunc": "{x}/9.80665", "Prefixes": [ "Milli"], "Localization": [ { diff --git a/Common/UnitDefinitions/AmountOfSubstance.json b/Common/UnitDefinitions/AmountOfSubstance.json index 4f3502c9e6..0a6d15a039 100644 --- a/Common/UnitDefinitions/AmountOfSubstance.json +++ b/Common/UnitDefinitions/AmountOfSubstance.json @@ -9,8 +9,8 @@ { "SingularName": "Mole", "PluralName": "Moles", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "BaseUnits": { "N": "Mole" }, @@ -28,8 +28,8 @@ "BaseUnits": { "N": "PoundMole" }, - "FromUnitToBaseFunc": "x*453.59237", - "FromBaseToUnitFunc": "x/453.59237", + "FromUnitToBaseFunc": "{x}*453.59237", + "FromBaseToUnitFunc": "{x}/453.59237", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/AmplitudeRatio.json b/Common/UnitDefinitions/AmplitudeRatio.json index 6c99ecf788..6ceb62ae29 100644 --- a/Common/UnitDefinitions/AmplitudeRatio.json +++ b/Common/UnitDefinitions/AmplitudeRatio.json @@ -8,8 +8,8 @@ { "SingularName": "DecibelVolt", "PluralName": "DecibelVolts", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -20,8 +20,8 @@ { "SingularName": "DecibelMicrovolt", "PluralName": "DecibelMicrovolts", - "FromUnitToBaseFunc": "x - 120", - "FromBaseToUnitFunc": "x + 120", + "FromUnitToBaseFunc": "{x} - 120", + "FromBaseToUnitFunc": "{x} + 120", "Localization": [ { "Culture": "en-US", @@ -32,8 +32,8 @@ { "SingularName": "DecibelMillivolt", "PluralName": "DecibelMillivolts", - "FromUnitToBaseFunc": "x - 60", - "FromBaseToUnitFunc": "x + 60", + "FromUnitToBaseFunc": "{x} - 60", + "FromBaseToUnitFunc": "{x} + 60", "Localization": [ { "Culture": "en-US", @@ -44,8 +44,8 @@ { "SingularName": "DecibelUnloaded", "PluralName": "DecibelsUnloaded", - "FromUnitToBaseFunc": "x - 2.218487499", - "FromBaseToUnitFunc": "x + 2.218487499", + "FromUnitToBaseFunc": "{x} - 2.218487499", + "FromBaseToUnitFunc": "{x} + 2.218487499", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Angle.json b/Common/UnitDefinitions/Angle.json index 7efaf8ce80..171d7432b7 100644 --- a/Common/UnitDefinitions/Angle.json +++ b/Common/UnitDefinitions/Angle.json @@ -6,8 +6,8 @@ { "SingularName": "Radian", "PluralName": "Radians", - "FromUnitToBaseFunc": "x*180/Math.PI", - "FromBaseToUnitFunc": "x/180*Math.PI", + "FromUnitToBaseFunc": "{x}*180/Math.PI", + "FromBaseToUnitFunc": "{x}/180*Math.PI", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -24,8 +24,8 @@ "SingularName": "Degree", "PluralName": "Degrees", "Prefixes": [ "Nano", "Micro", "Milli" ], - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -40,8 +40,8 @@ { "SingularName": "Arcminute", "PluralName": "Arcminutes", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", @@ -52,8 +52,8 @@ { "SingularName": "Arcsecond", "PluralName": "Arcseconds", - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Localization": [ { "Culture": "en-US", @@ -64,8 +64,8 @@ { "SingularName": "Gradian", "PluralName": "Gradians", - "FromUnitToBaseFunc": "x*0.9", - "FromBaseToUnitFunc": "x/0.9", + "FromUnitToBaseFunc": "{x}*0.9", + "FromBaseToUnitFunc": "{x}/0.9", "Localization": [ { "Culture": "en-US", @@ -80,8 +80,8 @@ { "SingularName": "NatoMil", "PluralName": "NatoMils", - "FromUnitToBaseFunc": "x*9/160", - "FromBaseToUnitFunc": "x*160/9", + "FromUnitToBaseFunc": "{x}*9/160", + "FromBaseToUnitFunc": "{x}*160/9", "Localization": [ { "Culture": "en-US", @@ -92,8 +92,8 @@ { "SingularName": "Revolution", "PluralName": "Revolutions", - "FromUnitToBaseFunc": "x*360", - "FromBaseToUnitFunc": "x/360", + "FromUnitToBaseFunc": "{x}*360", + "FromBaseToUnitFunc": "{x}/360", "Localization": [ { "Culture": "en-US", @@ -108,8 +108,8 @@ { "SingularName": "Tilt", "PluralName": "Tilt", - "FromUnitToBaseFunc": "Math.Asin(x)*180/Math.PI", - "FromBaseToUnitFunc": "Math.Sin(x/180*Math.PI)", + "FromUnitToBaseFunc": "Math.Asin({x})*180/Math.PI", + "FromBaseToUnitFunc": "Math.Sin({x}/180*Math.PI)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ApparentEnergy.json b/Common/UnitDefinitions/ApparentEnergy.json index 6fe008ac20..76688e5530 100644 --- a/Common/UnitDefinitions/ApparentEnergy.json +++ b/Common/UnitDefinitions/ApparentEnergy.json @@ -11,8 +11,8 @@ { "SingularName": "VoltampereHour", "PluralName": "VoltampereHours", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ApparentPower.json b/Common/UnitDefinitions/ApparentPower.json index 66958d8f1a..63e4b68fa2 100644 --- a/Common/UnitDefinitions/ApparentPower.json +++ b/Common/UnitDefinitions/ApparentPower.json @@ -11,8 +11,8 @@ { "SingularName": "Voltampere", "PluralName": "Voltamperes", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega", "Giga" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Area.json b/Common/UnitDefinitions/Area.json index fed60e94ff..a4b29ecf3e 100644 --- a/Common/UnitDefinitions/Area.json +++ b/Common/UnitDefinitions/Area.json @@ -12,8 +12,8 @@ "BaseUnits": { "L": "Kilometer" }, - "FromUnitToBaseFunc": "x*1e6", - "FromBaseToUnitFunc": "x/1e6", + "FromUnitToBaseFunc": "{x}*1e6", + "FromBaseToUnitFunc": "{x}/1e6", "Localization": [ { "Culture": "en-US", @@ -35,8 +35,8 @@ "BaseUnits": { "L": "Meter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ "BaseUnits": { "L": "Decimeter" }, - "FromUnitToBaseFunc": "x*1e-2", - "FromBaseToUnitFunc": "x/1e-2", + "FromUnitToBaseFunc": "{x}*1e-2", + "FromBaseToUnitFunc": "{x}/1e-2", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ "BaseUnits": { "L": "Centimeter" }, - "FromUnitToBaseFunc": "x*1e-4", - "FromBaseToUnitFunc": "x/1e-4", + "FromUnitToBaseFunc": "{x}*1e-4", + "FromBaseToUnitFunc": "{x}/1e-4", "Localization": [ { "Culture": "en-US", @@ -104,8 +104,8 @@ "BaseUnits": { "L": "Millimeter" }, - "FromUnitToBaseFunc": "x*1e-6", - "FromBaseToUnitFunc": "x/1e-6", + "FromUnitToBaseFunc": "{x}*1e-6", + "FromBaseToUnitFunc": "{x}/1e-6", "Localization": [ { "Culture": "en-US", @@ -127,8 +127,8 @@ "BaseUnits": { "L": "Micrometer" }, - "FromUnitToBaseFunc": "x*1e-12", - "FromBaseToUnitFunc": "x/1e-12", + "FromUnitToBaseFunc": "{x}*1e-12", + "FromBaseToUnitFunc": "{x}/1e-12", "Localization": [ { "Culture": "en-US", @@ -150,8 +150,8 @@ "BaseUnits": { "L": "Mile" }, - "FromUnitToBaseFunc": "x*2.59e6", - "FromBaseToUnitFunc": "x/2.59e6", + "FromUnitToBaseFunc": "{x}*2.59e6", + "FromBaseToUnitFunc": "{x}/2.59e6", "Localization": [ { "Culture": "en-US", @@ -173,8 +173,8 @@ "BaseUnits": { "L": "Yard" }, - "FromUnitToBaseFunc": "x*0.836127", - "FromBaseToUnitFunc": "x/0.836127", + "FromUnitToBaseFunc": "{x}*0.836127", + "FromBaseToUnitFunc": "{x}/0.836127", "Localization": [ { "Culture": "en-US", @@ -196,8 +196,8 @@ "BaseUnits": { "L": "Foot" }, - "FromUnitToBaseFunc": "x*0.092903", - "FromBaseToUnitFunc": "x/0.092903", + "FromUnitToBaseFunc": "{x}*0.092903", + "FromBaseToUnitFunc": "{x}/0.092903", "Localization": [ { "Culture": "en-US", @@ -219,8 +219,8 @@ "BaseUnits": { "L": "UsSurveyFoot" }, - "FromUnitToBaseFunc": "x*0.09290341161", - "FromBaseToUnitFunc": "x/0.09290341161", + "FromUnitToBaseFunc": "{x}*0.09290341161", + "FromBaseToUnitFunc": "{x}/0.09290341161", "Localization": [ { "Culture": "en-US", @@ -238,8 +238,8 @@ "BaseUnits": { "L": "Inch" }, - "FromUnitToBaseFunc": "x*0.00064516", - "FromBaseToUnitFunc": "x/0.00064516", + "FromUnitToBaseFunc": "{x}*0.00064516", + "FromBaseToUnitFunc": "{x}/0.00064516", "Localization": [ { "Culture": "en-US", @@ -258,8 +258,8 @@ { "SingularName": "Acre", "PluralName": "Acres", - "FromUnitToBaseFunc": "x*4046.85642", - "FromBaseToUnitFunc": "x/4046.85642", + "FromUnitToBaseFunc": "{x}*4046.85642", + "FromBaseToUnitFunc": "{x}/4046.85642", "Localization": [ { "Culture": "en-US", @@ -278,8 +278,8 @@ { "SingularName": "Hectare", "PluralName": "Hectares", - "FromUnitToBaseFunc": "x*1e4", - "FromBaseToUnitFunc": "x/1e4", + "FromUnitToBaseFunc": "{x}*1e4", + "FromBaseToUnitFunc": "{x}/1e4", "Localization": [ { "Culture": "en-US", @@ -298,8 +298,8 @@ { "SingularName": "SquareNauticalMile", "PluralName": "SquareNauticalMiles", - "FromUnitToBaseFunc": "x*3429904", - "FromBaseToUnitFunc": "x/3429904", + "FromUnitToBaseFunc": "{x}*3429904", + "FromBaseToUnitFunc": "{x}/3429904", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/AreaDensity.json b/Common/UnitDefinitions/AreaDensity.json index bb4acc6f49..812fdda451 100644 --- a/Common/UnitDefinitions/AreaDensity.json +++ b/Common/UnitDefinitions/AreaDensity.json @@ -14,8 +14,8 @@ "L": "Meter", "M": "Kilogram" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/AreaMomentOfInertia.json b/Common/UnitDefinitions/AreaMomentOfInertia.json index 76b54cc681..488fcabd58 100644 --- a/Common/UnitDefinitions/AreaMomentOfInertia.json +++ b/Common/UnitDefinitions/AreaMomentOfInertia.json @@ -12,8 +12,8 @@ "BaseUnits": { "L": "Meter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -27,8 +27,8 @@ "BaseUnits": { "L": "Decimeter" }, - "FromUnitToBaseFunc": "x/1e4", - "FromBaseToUnitFunc": "x*1e4", + "FromUnitToBaseFunc": "{x}/1e4", + "FromBaseToUnitFunc": "{x}*1e4", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ "BaseUnits": { "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e8", - "FromBaseToUnitFunc": "x*1e8", + "FromUnitToBaseFunc": "{x}/1e8", + "FromBaseToUnitFunc": "{x}*1e8", "Localization": [ { "Culture": "en-US", @@ -57,8 +57,8 @@ "BaseUnits": { "L": "Millimeter" }, - "FromUnitToBaseFunc": "x/1e12", - "FromBaseToUnitFunc": "x*1e12", + "FromUnitToBaseFunc": "{x}/1e12", + "FromBaseToUnitFunc": "{x}*1e12", "Localization": [ { "Culture": "en-US", @@ -72,8 +72,8 @@ "BaseUnits": { "L": "Foot" }, - "FromUnitToBaseFunc": "x*Math.Pow(0.3048, 4)", - "FromBaseToUnitFunc": "x/Math.Pow(0.3048, 4)", + "FromUnitToBaseFunc": "{x}*Math.Pow(0.3048, 4)", + "FromBaseToUnitFunc": "{x}/Math.Pow(0.3048, 4)", "Localization": [ { "Culture": "en-US", @@ -87,8 +87,8 @@ "BaseUnits": { "L": "Inch" }, - "FromUnitToBaseFunc": "x*Math.Pow(2.54e-2, 4)", - "FromBaseToUnitFunc": "x/Math.Pow(2.54e-2, 4)", + "FromUnitToBaseFunc": "{x}*Math.Pow(2.54e-2, 4)", + "FromBaseToUnitFunc": "{x}/Math.Pow(2.54e-2, 4)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/BitRate.json b/Common/UnitDefinitions/BitRate.json index afa72e498d..ac84d868dc 100644 --- a/Common/UnitDefinitions/BitRate.json +++ b/Common/UnitDefinitions/BitRate.json @@ -9,8 +9,8 @@ { "SingularName": "BitPerSecond", "PluralName": "BitsPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera", "Peta", "Exa", "Kibi", "Mebi", "Gibi", "Tebi", "Pebi", "Exbi" ], "Localization": [ { @@ -22,8 +22,8 @@ { "SingularName": "BytePerSecond", "PluralName": "BytesPerSecond", - "FromUnitToBaseFunc": "x*8m", - "FromBaseToUnitFunc": "x/8m", + "FromUnitToBaseFunc": "{x}*8m", + "FromBaseToUnitFunc": "{x}/8m", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera", "Peta", "Exa", "Kibi", "Mebi", "Gibi", "Tebi", "Pebi", "Exbi" ], "Localization": [ { diff --git a/Common/UnitDefinitions/BrakeSpecificFuelConsumption.json b/Common/UnitDefinitions/BrakeSpecificFuelConsumption.json index d0924fd6d0..44e30cf2cd 100644 --- a/Common/UnitDefinitions/BrakeSpecificFuelConsumption.json +++ b/Common/UnitDefinitions/BrakeSpecificFuelConsumption.json @@ -10,8 +10,8 @@ { "SingularName": "GramPerKiloWattHour", "PluralName": "GramsPerKiloWattHour", - "FromUnitToBaseFunc": "x/3.6e9", - "FromBaseToUnitFunc": "x*3.6e9", + "FromUnitToBaseFunc": "{x}/3.6e9", + "FromBaseToUnitFunc": "{x}*3.6e9", "Localization": [ { "Culture": "en-US", @@ -22,8 +22,8 @@ { "SingularName": "KilogramPerJoule", "PluralName": "KilogramsPerJoule", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -34,8 +34,8 @@ { "SingularName": "PoundPerMechanicalHorsepowerHour", "PluralName": "PoundsPerMechanicalHorsepowerHour", - "FromUnitToBaseFunc": "x*1.689659410672e-7", - "FromBaseToUnitFunc": "x/1.689659410672e-7", + "FromUnitToBaseFunc": "{x}*1.689659410672e-7", + "FromBaseToUnitFunc": "{x}/1.689659410672e-7", "XmlDocSummary": "The pound per horse power hour uses mechanical horse power and the imperial pound", "Localization": [ { diff --git a/Common/UnitDefinitions/Capacitance.json b/Common/UnitDefinitions/Capacitance.json index f1634cf471..e2fa5517e1 100644 --- a/Common/UnitDefinitions/Capacitance.json +++ b/Common/UnitDefinitions/Capacitance.json @@ -19,8 +19,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/CoefficientOfThermalExpansion.json b/Common/UnitDefinitions/CoefficientOfThermalExpansion.json index ea8ff3ad97..516d5b44e9 100644 --- a/Common/UnitDefinitions/CoefficientOfThermalExpansion.json +++ b/Common/UnitDefinitions/CoefficientOfThermalExpansion.json @@ -12,8 +12,8 @@ "BaseUnits": { "Θ": "Kelvin" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -27,8 +27,8 @@ "BaseUnits": { "Θ": "DegreeCelsius" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ "BaseUnits": { "Θ": "DegreeFahrenheit" }, - "FromUnitToBaseFunc": "x*9/5", - "FromBaseToUnitFunc": "x*5/9", + "FromUnitToBaseFunc": "{x}*9/5", + "FromBaseToUnitFunc": "{x}*5/9", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Density.json b/Common/UnitDefinitions/Density.json index 16825fbd52..1e45176284 100644 --- a/Common/UnitDefinitions/Density.json +++ b/Common/UnitDefinitions/Density.json @@ -15,8 +15,8 @@ "L": "Millimeter", "M": "Gram" }, - "FromUnitToBaseFunc": "x/1e-6", - "FromBaseToUnitFunc": "x*1e-6", + "FromUnitToBaseFunc": "{x}/1e-6", + "FromBaseToUnitFunc": "{x}*1e-6", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -32,8 +32,8 @@ "L": "Centimeter", "M": "Gram" }, - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -49,8 +49,8 @@ "L": "Meter", "M": "Gram" }, - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Kilo", "Milli", "Micro" ], "Localization": [ { @@ -70,8 +70,8 @@ "L": "Inch", "M": "Pound" }, - "FromUnitToBaseFunc": "x/3.6127298147753e-5", - "FromBaseToUnitFunc": "x*3.6127298147753e-5", + "FromUnitToBaseFunc": "{x}/3.6127298147753e-5", + "FromBaseToUnitFunc": "{x}*3.6127298147753e-5", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -88,8 +88,8 @@ "L": "Foot", "M": "Pound" }, - "FromUnitToBaseFunc": "x/0.062427961", - "FromBaseToUnitFunc": "x*0.062427961", + "FromUnitToBaseFunc": "{x}/0.062427961", + "FromBaseToUnitFunc": "{x}*0.062427961", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -106,8 +106,8 @@ "L": "Millimeter", "M": "Tonne" }, - "FromUnitToBaseFunc": "x/1e-12", - "FromBaseToUnitFunc": "x*1e-12", + "FromUnitToBaseFunc": "{x}/1e-12", + "FromBaseToUnitFunc": "{x}*1e-12", "Localization": [ { "Culture": "en-US", @@ -122,8 +122,8 @@ "L": "Centimeter", "M": "Tonne" }, - "FromUnitToBaseFunc": "x/1e-9", - "FromBaseToUnitFunc": "x*1e-9", + "FromUnitToBaseFunc": "{x}/1e-9", + "FromBaseToUnitFunc": "{x}*1e-9", "Localization": [ { "Culture": "en-US", @@ -138,8 +138,8 @@ "L": "Meter", "M": "Tonne" }, - "FromUnitToBaseFunc": "x/0.001", - "FromBaseToUnitFunc": "x*0.001", + "FromUnitToBaseFunc": "{x}/0.001", + "FromBaseToUnitFunc": "{x}*0.001", "Localization": [ { "Culture": "en-US", @@ -154,8 +154,8 @@ "L": "Foot", "M": "Slug" }, - "FromUnitToBaseFunc": "x*515.378818", - "FromBaseToUnitFunc": "x*0.00194032033", + "FromUnitToBaseFunc": "{x}*515.378818", + "FromBaseToUnitFunc": "{x}*0.00194032033", "Localization": [ { "Culture": "en-US", @@ -166,8 +166,8 @@ { "SingularName": "GramPerLiter", "PluralName": "GramsPerLiter", - "FromUnitToBaseFunc": "x/1", - "FromBaseToUnitFunc": "x*1", + "FromUnitToBaseFunc": "{x}/1", + "FromBaseToUnitFunc": "{x}*1", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -179,8 +179,8 @@ { "SingularName": "GramPerDeciliter", "PluralName": "GramsPerDeciLiter", - "FromUnitToBaseFunc": "x/1e-1", - "FromBaseToUnitFunc": "x*1e-1", + "FromUnitToBaseFunc": "{x}/1e-1", + "FromBaseToUnitFunc": "{x}*1e-1", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -192,8 +192,8 @@ { "SingularName": "GramPerMilliliter", "PluralName": "GramsPerMilliliter", - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -205,8 +205,8 @@ { "SingularName": "PoundPerUSGallon", "PluralName": "PoundsPerUSGallon", - "FromUnitToBaseFunc": "x*1.19826427e2", - "FromBaseToUnitFunc": "x/1.19826427e2", + "FromUnitToBaseFunc": "{x}*1.19826427e2", + "FromBaseToUnitFunc": "{x}/1.19826427e2", "Localization": [ { "Culture": "en-US", @@ -217,8 +217,8 @@ { "SingularName": "PoundPerImperialGallon", "PluralName": "PoundsPerImperialGallon", - "FromUnitToBaseFunc": "x*9.9776398e1", - "FromBaseToUnitFunc": "x/9.9776398e1", + "FromUnitToBaseFunc": "{x}*9.9776398e1", + "FromBaseToUnitFunc": "{x}/9.9776398e1", "Localization": [ { "Culture": "en-US", @@ -233,8 +233,8 @@ "L": "Decimeter", "M": "Kilogram" }, - "FromUnitToBaseFunc": "x*1e3", - "FromBaseToUnitFunc": "x/1e3", + "FromUnitToBaseFunc": "{x}*1e3", + "FromBaseToUnitFunc": "{x}/1e3", "Localization": [ { "Culture": "en-US", @@ -249,8 +249,8 @@ "L": "Foot", "M": "Tonne" }, - "FromUnitToBaseFunc": "x*3.53146667214886e4", - "FromBaseToUnitFunc": "x/3.53146667214886e4", + "FromUnitToBaseFunc": "{x}*3.53146667214886e4", + "FromBaseToUnitFunc": "{x}/3.53146667214886e4", "Localization": [ { "Culture": "en-US", @@ -265,8 +265,8 @@ "L": "Inch", "M": "Tonne" }, - "FromUnitToBaseFunc": "x*6.10237440947323e7", - "FromBaseToUnitFunc": "x/6.10237440947323e7", + "FromUnitToBaseFunc": "{x}*6.10237440947323e7", + "FromBaseToUnitFunc": "{x}/6.10237440947323e7", "Localization": [ { "Culture": "en-US", @@ -281,8 +281,8 @@ "L": "Foot", "M": "Gram" }, - "FromUnitToBaseFunc": "x*0.0353146667214886", - "FromBaseToUnitFunc": "x/0.0353146667214886", + "FromUnitToBaseFunc": "{x}*0.0353146667214886", + "FromBaseToUnitFunc": "{x}/0.0353146667214886", "Localization": [ { "Culture": "en-US", @@ -297,8 +297,8 @@ "L": "Inch", "M": "Gram" }, - "FromUnitToBaseFunc": "x*61.0237440947323", - "FromBaseToUnitFunc": "x/61.0237440947323", + "FromUnitToBaseFunc": "{x}*61.0237440947323", + "FromBaseToUnitFunc": "{x}/61.0237440947323", "Localization": [ { "Culture": "en-US", @@ -313,8 +313,8 @@ "L": "Meter", "M": "Pound" }, - "FromUnitToBaseFunc": "x/2.204622621848775", - "FromBaseToUnitFunc": "x*2.204622621848775", + "FromUnitToBaseFunc": "{x}/2.204622621848775", + "FromBaseToUnitFunc": "{x}*2.204622621848775", "Localization": [ { "Culture": "en-US", @@ -329,8 +329,8 @@ "L": "Centimeter", "M": "Pound" }, - "FromUnitToBaseFunc": "x/2.204622621848775e-6", - "FromBaseToUnitFunc": "x*2.204622621848775e-6", + "FromUnitToBaseFunc": "{x}/2.204622621848775e-6", + "FromBaseToUnitFunc": "{x}*2.204622621848775e-6", "Localization": [ { "Culture": "en-US", @@ -345,8 +345,8 @@ "L": "Millimeter", "M": "Pound" }, - "FromUnitToBaseFunc": "x/2.204622621848775e-9", - "FromBaseToUnitFunc": "x*2.204622621848775e-9", + "FromUnitToBaseFunc": "{x}/2.204622621848775e-9", + "FromBaseToUnitFunc": "{x}*2.204622621848775e-9", "Localization": [ { "Culture": "en-US", @@ -361,8 +361,8 @@ "L": "Meter", "M": "Slug" }, - "FromUnitToBaseFunc": "x*14.5939", - "FromBaseToUnitFunc": "x/14.5939", + "FromUnitToBaseFunc": "{x}*14.5939", + "FromBaseToUnitFunc": "{x}/14.5939", "Localization": [ { "Culture": "en-US", @@ -377,8 +377,8 @@ "L": "Centimeter", "M": "Slug" }, - "FromUnitToBaseFunc": "x*14593903", - "FromBaseToUnitFunc": "x/14593903", + "FromUnitToBaseFunc": "{x}*14593903", + "FromBaseToUnitFunc": "{x}/14593903", "Localization": [ { "Culture": "en-US", @@ -393,8 +393,8 @@ "L": "Millimeter", "M": "Slug" }, - "FromUnitToBaseFunc": "x*14593903000", - "FromBaseToUnitFunc": "x/14593903000", + "FromUnitToBaseFunc": "{x}*14593903000", + "FromBaseToUnitFunc": "{x}/14593903000", "Localization": [ { "Culture": "en-US", @@ -409,8 +409,8 @@ "L": "Inch", "M": "Slug" }, - "FromUnitToBaseFunc": "x*890574.60201535", - "FromBaseToUnitFunc": "x/890574.60201535", + "FromUnitToBaseFunc": "{x}*890574.60201535", + "FromBaseToUnitFunc": "{x}/890574.60201535", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Duration.json b/Common/UnitDefinitions/Duration.json index ffdf7de196..1c8156528f 100644 --- a/Common/UnitDefinitions/Duration.json +++ b/Common/UnitDefinitions/Duration.json @@ -12,8 +12,8 @@ "BaseUnits": { "T": "Year365" }, - "FromUnitToBaseFunc": "x*365*24*3600", - "FromBaseToUnitFunc": "x/(365*24*3600)", + "FromUnitToBaseFunc": "{x}*365*24*3600", + "FromBaseToUnitFunc": "{x}/(365*24*3600)", "Localization": [ { "Culture": "en-US", @@ -31,8 +31,8 @@ "BaseUnits": { "T": "Month30" }, - "FromUnitToBaseFunc": "x*30*24*3600", - "FromBaseToUnitFunc": "x/(30*24*3600)", + "FromUnitToBaseFunc": "{x}*30*24*3600", + "FromBaseToUnitFunc": "{x}/(30*24*3600)", "Localization": [ { "Culture": "en-US", @@ -50,8 +50,8 @@ "BaseUnits": { "T": "Week" }, - "FromUnitToBaseFunc": "x*7*24*3600", - "FromBaseToUnitFunc": "x/(7*24*3600)", + "FromUnitToBaseFunc": "{x}*7*24*3600", + "FromBaseToUnitFunc": "{x}/(7*24*3600)", "Localization": [ { "Culture": "en-US", @@ -69,8 +69,8 @@ "BaseUnits": { "T": "Day" }, - "FromUnitToBaseFunc": "x*24*3600", - "FromBaseToUnitFunc": "x/(24*3600)", + "FromUnitToBaseFunc": "{x}*24*3600", + "FromBaseToUnitFunc": "{x}/(24*3600)", "Localization": [ { "Culture": "en-US", @@ -88,8 +88,8 @@ "BaseUnits": { "T": "Hour" }, - "FromUnitToBaseFunc": "x*3600", - "FromBaseToUnitFunc": "x/3600", + "FromUnitToBaseFunc": "{x}*3600", + "FromBaseToUnitFunc": "{x}/3600", "Localization": [ { "Culture": "en-US", @@ -107,8 +107,8 @@ "BaseUnits": { "T": "Minute" }, - "FromUnitToBaseFunc": "x*60", - "FromBaseToUnitFunc": "x/60", + "FromUnitToBaseFunc": "{x}*60", + "FromBaseToUnitFunc": "{x}/60", "Localization": [ { "Culture": "en-US", @@ -126,8 +126,8 @@ "BaseUnits": { "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli" ], "Localization": [ { @@ -146,8 +146,8 @@ "BaseUnits": { "T": "JulianYear" }, - "FromUnitToBaseFunc": "x*365.25*24*3600", - "FromBaseToUnitFunc": "x/(365.25*24*3600)", + "FromUnitToBaseFunc": "{x}*365.25*24*3600", + "FromBaseToUnitFunc": "{x}/(365.25*24*3600)", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/DynamicViscosity.json b/Common/UnitDefinitions/DynamicViscosity.json index a6a03e4d71..9548c81fcd 100644 --- a/Common/UnitDefinitions/DynamicViscosity.json +++ b/Common/UnitDefinitions/DynamicViscosity.json @@ -12,8 +12,8 @@ { "SingularName": "NewtonSecondPerMeterSquared", "PluralName": "NewtonSecondsPerMeterSquared", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -24,8 +24,8 @@ { "SingularName": "PascalSecond", "PluralName": "PascalSeconds", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli", "Micro" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "Poise", "PluralName": "Poise", - "FromUnitToBaseFunc": "x/10", - "FromBaseToUnitFunc": "x*10", + "FromUnitToBaseFunc": "{x}/10", + "FromBaseToUnitFunc": "{x}*10", "Prefixes": [ "Centi" ], "Localization": [ { @@ -50,8 +50,8 @@ { "SingularName": "Reyn", "PluralName": "Reyns", - "FromUnitToBaseFunc": "x * 6.8947572931683613e3", - "FromBaseToUnitFunc": "x / 6.8947572931683613e3", + "FromUnitToBaseFunc": "{x} * 6.8947572931683613e3", + "FromBaseToUnitFunc": "{x} / 6.8947572931683613e3", "Localization": [ { "Culture": "en-US", @@ -62,8 +62,8 @@ { "SingularName": "PoundForceSecondPerSquareInch", "PluralName": "PoundsForceSecondPerSquareInch", - "FromUnitToBaseFunc": "x * 6.8947572931683613e3", - "FromBaseToUnitFunc": "x / 6.8947572931683613e3", + "FromUnitToBaseFunc": "{x} * 6.8947572931683613e3", + "FromBaseToUnitFunc": "{x} / 6.8947572931683613e3", "Localization": [ { "Culture": "en-US", @@ -74,8 +74,8 @@ { "SingularName": "PoundForceSecondPerSquareFoot", "PluralName": "PoundsForceSecondPerSquareFoot", - "FromUnitToBaseFunc": "x * 4.7880258980335843e1", - "FromBaseToUnitFunc": "x / 4.7880258980335843e1", + "FromUnitToBaseFunc": "{x} * 4.7880258980335843e1", + "FromBaseToUnitFunc": "{x} / 4.7880258980335843e1", "Localization": [ { "Culture": "en-US", @@ -86,8 +86,8 @@ { "SingularName": "PoundPerFootSecond", "PluralName": "PoundsPerFootSecond", - "FromUnitToBaseFunc": "x * 1.4881639", - "FromBaseToUnitFunc": "x / 1.4881639", + "FromUnitToBaseFunc": "{x} * 1.4881639", + "FromBaseToUnitFunc": "{x} / 1.4881639", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricAdmittance.json b/Common/UnitDefinitions/ElectricAdmittance.json index 357c8015ba..4df1eace4f 100644 --- a/Common/UnitDefinitions/ElectricAdmittance.json +++ b/Common/UnitDefinitions/ElectricAdmittance.json @@ -12,8 +12,8 @@ { "SingularName": "Siemens", "PluralName": "Siemens", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricCharge.json b/Common/UnitDefinitions/ElectricCharge.json index e7a3c7999b..953c9a4ae9 100644 --- a/Common/UnitDefinitions/ElectricCharge.json +++ b/Common/UnitDefinitions/ElectricCharge.json @@ -11,8 +11,8 @@ { "SingularName": "Coulomb", "PluralName": "Coulombs", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -23,8 +23,8 @@ { "SingularName": "AmpereHour", "PluralName": "AmpereHours", - "FromUnitToBaseFunc": "x/2.77777777777e-4", - "FromBaseToUnitFunc": "x*2.77777777777e-4", + "FromUnitToBaseFunc": "{x}/2.77777777777e-4", + "FromBaseToUnitFunc": "{x}*2.77777777777e-4", "Prefixes": [ "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricChargeDensity.json b/Common/UnitDefinitions/ElectricChargeDensity.json index 164214135f..23a4823a53 100644 --- a/Common/UnitDefinitions/ElectricChargeDensity.json +++ b/Common/UnitDefinitions/ElectricChargeDensity.json @@ -17,8 +17,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricConductance.json b/Common/UnitDefinitions/ElectricConductance.json index 4c0ec9d9ad..005c3c0413 100644 --- a/Common/UnitDefinitions/ElectricConductance.json +++ b/Common/UnitDefinitions/ElectricConductance.json @@ -13,8 +13,8 @@ { "SingularName": "Siemens", "PluralName": "Siemens", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli", "Micro" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricConductivity.json b/Common/UnitDefinitions/ElectricConductivity.json index 7d0c4302cb..a7d4d398ee 100644 --- a/Common/UnitDefinitions/ElectricConductivity.json +++ b/Common/UnitDefinitions/ElectricConductivity.json @@ -19,8 +19,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -31,8 +31,8 @@ { "SingularName": "SiemensPerInch", "PluralName": "SiemensPerInch", - "FromUnitToBaseFunc": "x * 3.937007874015748e1", - "FromBaseToUnitFunc": "x / 3.937007874015748e1", + "FromUnitToBaseFunc": "{x} * 3.937007874015748e1", + "FromBaseToUnitFunc": "{x} / 3.937007874015748e1", "Localization": [ { "Culture": "en-US", @@ -43,8 +43,8 @@ { "SingularName": "SiemensPerFoot", "PluralName": "SiemensPerFoot", - "FromUnitToBaseFunc": "x * 3.2808398950131234", - "FromBaseToUnitFunc": "x / 3.2808398950131234", + "FromUnitToBaseFunc": "{x} * 3.2808398950131234", + "FromBaseToUnitFunc": "{x} / 3.2808398950131234", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricCurrent.json b/Common/UnitDefinitions/ElectricCurrent.json index a9e5c91187..8b455d9062 100644 --- a/Common/UnitDefinitions/ElectricCurrent.json +++ b/Common/UnitDefinitions/ElectricCurrent.json @@ -9,8 +9,8 @@ { "SingularName": "Ampere", "PluralName": "Amperes", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "BaseUnits": { "I": "Ampere" }, diff --git a/Common/UnitDefinitions/ElectricCurrentDensity.json b/Common/UnitDefinitions/ElectricCurrentDensity.json index 0c3c1b11e8..314134ab94 100644 --- a/Common/UnitDefinitions/ElectricCurrentDensity.json +++ b/Common/UnitDefinitions/ElectricCurrentDensity.json @@ -15,8 +15,8 @@ "L": "Meter", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -31,8 +31,8 @@ "L": "Inch", "I": "Ampere" }, - "FromUnitToBaseFunc": "x * 1.5500031000062000e3", - "FromBaseToUnitFunc": "x / 1.5500031000062000e3", + "FromUnitToBaseFunc": "{x} * 1.5500031000062000e3", + "FromBaseToUnitFunc": "{x} / 1.5500031000062000e3", "Localization": [ { "Culture": "en-US", @@ -47,8 +47,8 @@ "L": "Foot", "I": "Ampere" }, - "FromUnitToBaseFunc": "x * 1.0763910416709722e1", - "FromBaseToUnitFunc": "x / 1.0763910416709722e1", + "FromUnitToBaseFunc": "{x} * 1.0763910416709722e1", + "FromBaseToUnitFunc": "{x} / 1.0763910416709722e1", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricCurrentGradient.json b/Common/UnitDefinitions/ElectricCurrentGradient.json index 982039f8d2..6b49845979 100644 --- a/Common/UnitDefinitions/ElectricCurrentGradient.json +++ b/Common/UnitDefinitions/ElectricCurrentGradient.json @@ -10,8 +10,8 @@ { "SingularName": "AmperePerSecond", "PluralName": "AmperesPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -26,8 +26,8 @@ "T": "Millisecond", "I": "Ampere" }, - "FromUnitToBaseFunc": "x*1E3", - "FromBaseToUnitFunc": "x/1E3", + "FromUnitToBaseFunc": "{x}*1E3", + "FromBaseToUnitFunc": "{x}/1E3", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ "T": "Microsecond", "I": "Ampere" }, - "FromUnitToBaseFunc": "x*1E6", - "FromBaseToUnitFunc": "x/1E6", + "FromUnitToBaseFunc": "{x}*1E6", + "FromBaseToUnitFunc": "{x}/1E6", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ "T": "Nanosecond", "I": "Ampere" }, - "FromUnitToBaseFunc": "x*1E9", - "FromBaseToUnitFunc": "x/1E9", + "FromUnitToBaseFunc": "{x}*1E9", + "FromBaseToUnitFunc": "{x}/1E9", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricField.json b/Common/UnitDefinitions/ElectricField.json index 5a0f02d902..f9d3723ff7 100644 --- a/Common/UnitDefinitions/ElectricField.json +++ b/Common/UnitDefinitions/ElectricField.json @@ -19,8 +19,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ElectricInductance.json b/Common/UnitDefinitions/ElectricInductance.json index e1c405a349..531c7c4cab 100644 --- a/Common/UnitDefinitions/ElectricInductance.json +++ b/Common/UnitDefinitions/ElectricInductance.json @@ -13,8 +13,8 @@ { "SingularName": "Henry", "PluralName": "Henries", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricPotential.json b/Common/UnitDefinitions/ElectricPotential.json index 1ebb7755da..2a0fbb6b66 100644 --- a/Common/UnitDefinitions/ElectricPotential.json +++ b/Common/UnitDefinitions/ElectricPotential.json @@ -18,8 +18,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricPotentialAc.json b/Common/UnitDefinitions/ElectricPotentialAc.json index 8128b3f86d..2b1bdeefaa 100644 --- a/Common/UnitDefinitions/ElectricPotentialAc.json +++ b/Common/UnitDefinitions/ElectricPotentialAc.json @@ -6,8 +6,8 @@ { "SingularName": "VoltAc", "PluralName": "VoltsAc", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricPotentialChangeRate.json b/Common/UnitDefinitions/ElectricPotentialChangeRate.json index 1245353d5d..a106ed4e50 100644 --- a/Common/UnitDefinitions/ElectricPotentialChangeRate.json +++ b/Common/UnitDefinitions/ElectricPotentialChangeRate.json @@ -18,8 +18,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { @@ -37,8 +37,8 @@ "T": "Microsecond", "I": "Ampere" }, - "FromUnitToBaseFunc": "x*1E6", - "FromBaseToUnitFunc": "x/1E6", + "FromUnitToBaseFunc": "{x}*1E6", + "FromBaseToUnitFunc": "{x}/1E6", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { @@ -56,8 +56,8 @@ "T": "Minute", "I": "Ampere" }, - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { @@ -75,8 +75,8 @@ "T": "Hour", "I": "Ampere" }, - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricPotentialDc.json b/Common/UnitDefinitions/ElectricPotentialDc.json index 1f997605b2..b305e49e7e 100644 --- a/Common/UnitDefinitions/ElectricPotentialDc.json +++ b/Common/UnitDefinitions/ElectricPotentialDc.json @@ -6,8 +6,8 @@ { "SingularName": "VoltDc", "PluralName": "VoltsDc", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricResistance.json b/Common/UnitDefinitions/ElectricResistance.json index 30aab9f8a2..542d6490b2 100644 --- a/Common/UnitDefinitions/ElectricResistance.json +++ b/Common/UnitDefinitions/ElectricResistance.json @@ -12,8 +12,8 @@ { "SingularName": "Ohm", "PluralName": "Ohms", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo", "Mega", "Giga"], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricResistivity.json b/Common/UnitDefinitions/ElectricResistivity.json index 1342678174..14ea49cecd 100644 --- a/Common/UnitDefinitions/ElectricResistivity.json +++ b/Common/UnitDefinitions/ElectricResistivity.json @@ -13,8 +13,8 @@ { "SingularName": "OhmMeter", "PluralName": "OhmMeters", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "OhmCentimeter", "PluralName": "OhmsCentimeter", - "FromUnitToBaseFunc": "x/100", - "FromBaseToUnitFunc": "x*100", + "FromUnitToBaseFunc": "{x}/100", + "FromBaseToUnitFunc": "{x}*100", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ElectricSurfaceChargeDensity.json b/Common/UnitDefinitions/ElectricSurfaceChargeDensity.json index ffa0724aeb..ecb13e3335 100644 --- a/Common/UnitDefinitions/ElectricSurfaceChargeDensity.json +++ b/Common/UnitDefinitions/ElectricSurfaceChargeDensity.json @@ -17,8 +17,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -34,8 +34,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x * 1.0e4", - "FromBaseToUnitFunc": "x / 1.0e4", + "FromUnitToBaseFunc": "{x} * 1.0e4", + "FromBaseToUnitFunc": "{x} / 1.0e4", "Localization": [ { "Culture": "en-US", @@ -51,8 +51,8 @@ "T": "Second", "I": "Ampere" }, - "FromUnitToBaseFunc": "x * 1.5500031000062000e3", - "FromBaseToUnitFunc": "x / 1.5500031000062000e3", + "FromUnitToBaseFunc": "{x} * 1.5500031000062000e3", + "FromBaseToUnitFunc": "{x} / 1.5500031000062000e3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Energy.json b/Common/UnitDefinitions/Energy.json index 8cc55036ba..4cf77f33b0 100644 --- a/Common/UnitDefinitions/Energy.json +++ b/Common/UnitDefinitions/Energy.json @@ -16,8 +16,8 @@ "M": "Kilogram", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -29,8 +29,8 @@ { "SingularName": "Calorie", "PluralName": "Calories", - "FromUnitToBaseFunc": "x*4.184", - "FromBaseToUnitFunc": "x/4.184", + "FromUnitToBaseFunc": "{x}*4.184", + "FromBaseToUnitFunc": "{x}/4.184", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -42,8 +42,8 @@ { "SingularName": "BritishThermalUnit", "PluralName": "BritishThermalUnits", - "FromUnitToBaseFunc": "x*1055.05585262", - "FromBaseToUnitFunc": "x/1055.05585262", + "FromUnitToBaseFunc": "{x}*1055.05585262", + "FromBaseToUnitFunc": "{x}/1055.05585262", "Prefixes": [ "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -55,8 +55,8 @@ { "SingularName": "ElectronVolt", "PluralName": "ElectronVolts", - "FromUnitToBaseFunc": "x*1.602176565e-19", - "FromBaseToUnitFunc": "x/1.602176565e-19", + "FromUnitToBaseFunc": "{x}*1.602176565e-19", + "FromBaseToUnitFunc": "{x}/1.602176565e-19", "Prefixes": [ "Kilo", "Mega", @@ -77,8 +77,8 @@ { "SingularName": "FootPound", "PluralName": "FootPounds", - "FromUnitToBaseFunc": "x*1.355817948", - "FromBaseToUnitFunc": "x/1.355817948", + "FromUnitToBaseFunc": "{x}*1.355817948", + "FromBaseToUnitFunc": "{x}/1.355817948", "Localization": [ { "Culture": "en-US", @@ -89,8 +89,8 @@ { "SingularName": "Erg", "PluralName": "Ergs", - "FromUnitToBaseFunc": "x*1e-7", - "FromBaseToUnitFunc": "x/1e-7", + "FromUnitToBaseFunc": "{x}*1e-7", + "FromBaseToUnitFunc": "{x}/1e-7", "Localization": [ { "Culture": "en-US", @@ -101,8 +101,8 @@ { "SingularName": "WattHour", "PluralName": "WattHours", - "FromUnitToBaseFunc": "x*3600d", - "FromBaseToUnitFunc": "x/3600d", + "FromUnitToBaseFunc": "{x}*3600d", + "FromBaseToUnitFunc": "{x}/3600d", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -118,8 +118,8 @@ { "SingularName": "WattDay", "PluralName": "WattDays", - "FromUnitToBaseFunc": "x*24*3600d", - "FromBaseToUnitFunc": "x/(24*3600d)", + "FromUnitToBaseFunc": "{x}*24*3600d", + "FromBaseToUnitFunc": "{x}/(24*3600d)", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -135,8 +135,8 @@ { "SingularName": "ThermEc", "PluralName": "ThermsEc", - "FromUnitToBaseFunc": "x*1.05505585262e8", - "FromBaseToUnitFunc": "x/1.05505585262e8", + "FromUnitToBaseFunc": "{x}*1.05505585262e8", + "FromBaseToUnitFunc": "{x}/1.05505585262e8", "Prefixes": [ "Deca" ], "Localization": [ { @@ -154,8 +154,8 @@ { "SingularName": "ThermUs", "PluralName": "ThermsUs", - "FromUnitToBaseFunc": "x*1.054804e8", - "FromBaseToUnitFunc": "x/1.054804e8", + "FromUnitToBaseFunc": "{x}*1.054804e8", + "FromBaseToUnitFunc": "{x}/1.054804e8", "Prefixes": [ "Deca" ], "Localization": [ { @@ -173,8 +173,8 @@ { "SingularName": "ThermImperial", "PluralName": "ThermsImperial", - "FromUnitToBaseFunc": "x*1.05505585257348e8", - "FromBaseToUnitFunc": "x/1.05505585257348e8", + "FromUnitToBaseFunc": "{x}*1.05505585257348e8", + "FromBaseToUnitFunc": "{x}/1.05505585257348e8", "Prefixes": [ "Deca" ], "Localization": [ { @@ -192,8 +192,8 @@ { "SingularName": "HorsepowerHour", "PluralName": "HorsepowerHours", - "FromUnitToBaseFunc": "x*2.6845195377e6", - "FromBaseToUnitFunc": "x/2.6845195377e6", + "FromUnitToBaseFunc": "{x}*2.6845195377e6", + "FromBaseToUnitFunc": "{x}/2.6845195377e6", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Entropy.json b/Common/UnitDefinitions/Entropy.json index 715e8a5ddd..9accc2daae 100644 --- a/Common/UnitDefinitions/Entropy.json +++ b/Common/UnitDefinitions/Entropy.json @@ -12,8 +12,8 @@ { "SingularName": "JoulePerKelvin", "PluralName": "JoulesPerKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -25,8 +25,8 @@ { "SingularName": "CaloriePerKelvin", "PluralName": "CaloriesPerKelvin", - "FromUnitToBaseFunc": "x*4.184", - "FromBaseToUnitFunc": "x/4.184", + "FromUnitToBaseFunc": "{x}*4.184", + "FromBaseToUnitFunc": "{x}/4.184", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -38,8 +38,8 @@ { "SingularName": "JoulePerDegreeCelsius", "PluralName": "JoulesPerDegreeCelsius", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Force.json b/Common/UnitDefinitions/Force.json index b3ee6a66c9..6afb8f045f 100644 --- a/Common/UnitDefinitions/Force.json +++ b/Common/UnitDefinitions/Force.json @@ -16,8 +16,8 @@ "M": "Gram", "T": "Second" }, - "FromUnitToBaseFunc": "x/1e5", - "FromBaseToUnitFunc": "x*1e5", + "FromUnitToBaseFunc": "{x}/1e5", + "FromBaseToUnitFunc": "{x}*1e5", "Localization": [ { "Culture": "en-US", @@ -32,8 +32,8 @@ { "SingularName": "KilogramForce", "PluralName": "KilogramsForce", - "FromUnitToBaseFunc": "x*9.80665002864", - "FromBaseToUnitFunc": "x/9.80665002864", + "FromUnitToBaseFunc": "{x}*9.80665002864", + "FromBaseToUnitFunc": "{x}/9.80665002864", "Localization": [ { "Culture": "en-US", @@ -48,8 +48,8 @@ { "SingularName": "TonneForce", "PluralName": "TonnesForce", - "FromUnitToBaseFunc": "x*9.80665002864e3", - "FromBaseToUnitFunc": "x/9.80665002864e3", + "FromUnitToBaseFunc": "{x}*9.80665002864e3", + "FromBaseToUnitFunc": "{x}/9.80665002864e3", "Localization": [ { "Culture": "en-US", @@ -69,8 +69,8 @@ "M": "Kilogram", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -86,8 +86,8 @@ { "SingularName": "KiloPond", "PluralName": "KiloPonds", - "FromUnitToBaseFunc": "x*9.80665002864", - "FromBaseToUnitFunc": "x/9.80665002864", + "FromUnitToBaseFunc": "{x}*9.80665002864", + "FromBaseToUnitFunc": "{x}/9.80665002864", "Localization": [ { "Culture": "en-US", @@ -107,8 +107,8 @@ "M": "Pound", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.13825502798973041652092282466083", - "FromBaseToUnitFunc": "x/0.13825502798973041652092282466083", + "FromUnitToBaseFunc": "{x}*0.13825502798973041652092282466083", + "FromBaseToUnitFunc": "{x}/0.13825502798973041652092282466083", "Localization": [ { "Culture": "en-US", @@ -123,8 +123,8 @@ { "SingularName": "PoundForce", "PluralName": "PoundsForce", - "FromUnitToBaseFunc": "x*4.4482216152605095551842641431421", - "FromBaseToUnitFunc": "x/4.4482216152605095551842641431421", + "FromUnitToBaseFunc": "{x}*4.4482216152605095551842641431421", + "FromBaseToUnitFunc": "{x}/4.4482216152605095551842641431421", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -142,8 +142,8 @@ { "SingularName": "OunceForce", "PluralName": "OunceForce", - "FromUnitToBaseFunc": "x*2.780138509537812e-1", - "FromBaseToUnitFunc": "x/2.780138509537812e-1", + "FromUnitToBaseFunc": "{x}*2.780138509537812e-1", + "FromBaseToUnitFunc": "{x}/2.780138509537812e-1", "Localization": [ { "Culture": "en-US", @@ -154,8 +154,8 @@ { "SingularName": "ShortTonForce", "PluralName": "ShortTonsForce", - "FromUnitToBaseFunc": "x*8.896443230521e3", - "FromBaseToUnitFunc": "x/8.896443230521e3", + "FromUnitToBaseFunc": "{x}*8.896443230521e3", + "FromBaseToUnitFunc": "{x}/8.896443230521e3", "XmlDocSummary": "The short ton-force is a unit of force equal to 2,000 pounds-force (907.18474 kgf), that is most commonly used in the United States – known there simply as the ton or US ton.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Ton-force#Short_ton-force", "Localization": [ diff --git a/Common/UnitDefinitions/ForceChangeRate.json b/Common/UnitDefinitions/ForceChangeRate.json index c2722b5cb9..e5229cfa35 100644 --- a/Common/UnitDefinitions/ForceChangeRate.json +++ b/Common/UnitDefinitions/ForceChangeRate.json @@ -11,8 +11,8 @@ { "SingularName": "NewtonPerMinute", "PluralName": "NewtonsPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Prefixes": [ "Deca", "Kilo" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "NewtonPerSecond", "PluralName": "NewtonsPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "PoundForcePerMinute", "PluralName": "PoundsForcePerMinute", - "FromUnitToBaseFunc": "x*4.4482216152605095551842641431421/60", - "FromBaseToUnitFunc": "x/4.4482216152605095551842641431421*60", + "FromUnitToBaseFunc": "{x}*4.4482216152605095551842641431421/60", + "FromBaseToUnitFunc": "{x}/4.4482216152605095551842641431421*60", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -51,8 +51,8 @@ { "SingularName": "PoundForcePerSecond", "PluralName": "PoundsForcePerSecond", - "FromUnitToBaseFunc": "x*4.4482216152605095551842641431421", - "FromBaseToUnitFunc": "x/4.4482216152605095551842641431421", + "FromUnitToBaseFunc": "{x}*4.4482216152605095551842641431421", + "FromBaseToUnitFunc": "{x}/4.4482216152605095551842641431421", "Prefixes": [ "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ForcePerLength.json b/Common/UnitDefinitions/ForcePerLength.json index b9c4037d3c..bac63ced11 100644 --- a/Common/UnitDefinitions/ForcePerLength.json +++ b/Common/UnitDefinitions/ForcePerLength.json @@ -10,8 +10,8 @@ { "SingularName": "NewtonPerMeter", "PluralName": "NewtonsPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "NewtonPerCentimeter", "PluralName": "NewtonsPerCentimeter", - "FromUnitToBaseFunc": "x*1e2", - "FromBaseToUnitFunc": "x/1e2", + "FromUnitToBaseFunc": "{x}*1e2", + "FromBaseToUnitFunc": "{x}/1e2", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -36,8 +36,8 @@ { "SingularName": "NewtonPerMillimeter", "PluralName": "NewtonsPerMillimeter", - "FromUnitToBaseFunc": "x*1e3", - "FromBaseToUnitFunc": "x/1e3", + "FromUnitToBaseFunc": "{x}*1e3", + "FromBaseToUnitFunc": "{x}/1e3", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -49,8 +49,8 @@ { "SingularName": "KilogramForcePerMeter", "PluralName": "KilogramsForcePerMeter", - "FromUnitToBaseFunc": "x*9.80665002864", - "FromBaseToUnitFunc": "x/9.80665002864", + "FromUnitToBaseFunc": "{x}*9.80665002864", + "FromBaseToUnitFunc": "{x}/9.80665002864", "Localization": [ { "Culture": "en-US", @@ -65,8 +65,8 @@ { "SingularName": "KilogramForcePerCentimeter", "PluralName": "KilogramsForcePerCentimeter", - "FromUnitToBaseFunc": "x*980.665002864", - "FromBaseToUnitFunc": "x/980.665002864", + "FromUnitToBaseFunc": "{x}*980.665002864", + "FromBaseToUnitFunc": "{x}/980.665002864", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ { "SingularName": "KilogramForcePerMillimeter", "PluralName": "KilogramsForcePerMillimeter", - "FromUnitToBaseFunc": "x*9.80665002864e3", - "FromBaseToUnitFunc": "x/9.80665002864e3", + "FromUnitToBaseFunc": "{x}*9.80665002864e3", + "FromBaseToUnitFunc": "{x}/9.80665002864e3", "Localization": [ { "Culture": "en-US", @@ -97,8 +97,8 @@ { "SingularName": "TonneForcePerMeter", "PluralName": "TonnesForcePerMeter", - "FromUnitToBaseFunc": "x*9.80665002864e3", - "FromBaseToUnitFunc": "x/9.80665002864e3", + "FromUnitToBaseFunc": "{x}*9.80665002864e3", + "FromBaseToUnitFunc": "{x}/9.80665002864e3", "Localization": [ { "Culture": "en-US", @@ -113,8 +113,8 @@ { "SingularName": "TonneForcePerCentimeter", "PluralName": "TonnesForcePerCentimeter", - "FromUnitToBaseFunc": "x*9.80665002864e5", - "FromBaseToUnitFunc": "x/9.80665002864e5", + "FromUnitToBaseFunc": "{x}*9.80665002864e5", + "FromBaseToUnitFunc": "{x}/9.80665002864e5", "Localization": [ { "Culture": "en-US", @@ -129,8 +129,8 @@ { "SingularName": "TonneForcePerMillimeter", "PluralName": "TonnesForcePerMillimeter", - "FromUnitToBaseFunc": "x*9.80665002864e6", - "FromBaseToUnitFunc": "x/9.80665002864e6", + "FromUnitToBaseFunc": "{x}*9.80665002864e6", + "FromBaseToUnitFunc": "{x}/9.80665002864e6", "Localization": [ { "Culture": "en-US", @@ -145,8 +145,8 @@ { "SingularName": "PoundForcePerFoot", "PluralName": "PoundsForcePerFoot", - "FromUnitToBaseFunc": "x*14.59390292", - "FromBaseToUnitFunc": "x/14.59390292", + "FromUnitToBaseFunc": "{x}*14.59390292", + "FromBaseToUnitFunc": "{x}/14.59390292", "Localization": [ { "Culture": "en-US", @@ -157,8 +157,8 @@ { "SingularName": "PoundForcePerInch", "PluralName": "PoundsForcePerInch", - "FromUnitToBaseFunc": "x*1.75126835e2", - "FromBaseToUnitFunc": "x/1.75126835e2", + "FromUnitToBaseFunc": "{x}*1.75126835e2", + "FromBaseToUnitFunc": "{x}/1.75126835e2", "Localization": [ { "Culture": "en-US", @@ -169,8 +169,8 @@ { "SingularName": "PoundForcePerYard", "PluralName": "PoundsForcePerYard", - "FromUnitToBaseFunc": "x*4.864634307", - "FromBaseToUnitFunc": "x/4.864634307", + "FromUnitToBaseFunc": "{x}*4.864634307", + "FromBaseToUnitFunc": "{x}/4.864634307", "Localization": [ { "Culture": "en-US", @@ -181,8 +181,8 @@ { "SingularName": "KilopoundForcePerFoot", "PluralName": "KilopoundsForcePerFoot", - "FromUnitToBaseFunc": "x*14593.90292", - "FromBaseToUnitFunc": "x/14593.90292", + "FromUnitToBaseFunc": "{x}*14593.90292", + "FromBaseToUnitFunc": "{x}/14593.90292", "Localization": [ { "Culture": "en-US", @@ -193,8 +193,8 @@ { "SingularName": "KilopoundForcePerInch", "PluralName": "KilopoundsForcePerInch", - "FromUnitToBaseFunc": "x*1.75126835e5", - "FromBaseToUnitFunc": "x/1.75126835e5", + "FromUnitToBaseFunc": "{x}*1.75126835e5", + "FromBaseToUnitFunc": "{x}/1.75126835e5", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Frequency.json b/Common/UnitDefinitions/Frequency.json index 6c4d13698f..b92f849952 100644 --- a/Common/UnitDefinitions/Frequency.json +++ b/Common/UnitDefinitions/Frequency.json @@ -9,8 +9,8 @@ { "SingularName": "Hertz", "PluralName": "Hertz", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "RadianPerSecond", "PluralName": "RadiansPerSecond", - "FromUnitToBaseFunc": "x/6.2831853072", - "FromBaseToUnitFunc": "x*6.2831853072", + "FromUnitToBaseFunc": "{x}/6.2831853072", + "FromBaseToUnitFunc": "{x}*6.2831853072", "OmitExtensionMethod": true, "Localization": [ { @@ -43,8 +43,8 @@ { "SingularName": "CyclePerMinute", "PluralName": "CyclesPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", @@ -55,8 +55,8 @@ { "SingularName": "CyclePerHour", "PluralName": "CyclesPerHour", - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Localization": [ { "Culture": "en-US", @@ -67,8 +67,8 @@ { "SingularName": "BeatPerMinute", "PluralName": "BeatsPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", @@ -79,8 +79,8 @@ { "SingularName": "PerSecond", "PluralName": "PerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -95,8 +95,8 @@ { "SingularName": "BUnit", "PluralName": "BUnits", - "FromUnitToBaseFunc": "Math.Sqrt(x * 1e3)", - "FromBaseToUnitFunc": "x * x * 1e-3", + "FromUnitToBaseFunc": "Math.Sqrt({x} * 1e3)", + "FromBaseToUnitFunc": "{x} * {x} * 1e-3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/FuelEfficiency.json b/Common/UnitDefinitions/FuelEfficiency.json index 2da60218f7..c305168e17 100644 --- a/Common/UnitDefinitions/FuelEfficiency.json +++ b/Common/UnitDefinitions/FuelEfficiency.json @@ -6,8 +6,8 @@ "Units": [{ "SingularName": "LiterPer100Kilometers", "PluralName": "LitersPer100Kilometers", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [{ "Culture": "en-US", "Abbreviations": [ @@ -18,8 +18,8 @@ { "SingularName": "MilePerUsGallon", "PluralName": "MilesPerUsGallon", - "FromUnitToBaseFunc": "(100*3.785411784)/(1.609344*x)", - "FromBaseToUnitFunc": "(100*3.785411784)/(1.609344*x)", + "FromUnitToBaseFunc": "(100*3.785411784)/(1.609344*{x})", + "FromBaseToUnitFunc": "(100*3.785411784)/(1.609344*{x})", "Localization": [{ "Culture": "en-US", "Abbreviations": [ @@ -30,8 +30,8 @@ { "SingularName": "MilePerUkGallon", "PluralName": "MilesPerUkGallon", - "FromUnitToBaseFunc": "(100*4.54609188)/(1.609344*x)", - "FromBaseToUnitFunc": "(100*4.54609188)/(1.609344*x)", + "FromUnitToBaseFunc": "(100*4.54609188)/(1.609344*{x})", + "FromBaseToUnitFunc": "(100*4.54609188)/(1.609344*{x})", "Localization": [{ "Culture": "en-US", "Abbreviations": [ @@ -42,8 +42,8 @@ { "SingularName": "KilometerPerLiter", "PluralName": "KilometersPerLiters", - "FromUnitToBaseFunc": "100/x", - "FromBaseToUnitFunc": "100/x", + "FromUnitToBaseFunc": "100/{x}", + "FromBaseToUnitFunc": "100/{x}", "Localization": [{ "Culture": "en-US", "Abbreviations": [ diff --git a/Common/UnitDefinitions/HeatFlux.json b/Common/UnitDefinitions/HeatFlux.json index 00d7d389bd..09db7de519 100644 --- a/Common/UnitDefinitions/HeatFlux.json +++ b/Common/UnitDefinitions/HeatFlux.json @@ -14,8 +14,8 @@ "M": "Kilogram", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -27,8 +27,8 @@ { "SingularName": "WattPerSquareInch", "PluralName": "WattsPerSquareInch", - "FromUnitToBaseFunc": "x*1.5500031e3", - "FromBaseToUnitFunc": "x/1.5500031e3", + "FromUnitToBaseFunc": "{x}*1.5500031e3", + "FromBaseToUnitFunc": "{x}/1.5500031e3", "Localization": [ { "Culture": "en-US", @@ -39,8 +39,8 @@ { "SingularName": "WattPerSquareFoot", "PluralName": "WattsPerSquareFoot", - "FromUnitToBaseFunc": "x*1.07639e1", - "FromBaseToUnitFunc": "x/1.07639e1", + "FromUnitToBaseFunc": "{x}*1.07639e1", + "FromBaseToUnitFunc": "{x}/1.07639e1", "Localization": [ { "Culture": "en-US", @@ -51,8 +51,8 @@ { "SingularName": "BtuPerSecondSquareInch", "PluralName": "BtusPerSecondSquareInch", - "FromUnitToBaseFunc": "x*1.63533984e6", - "FromBaseToUnitFunc": "x/1.63533984e6", + "FromUnitToBaseFunc": "{x}*1.63533984e6", + "FromBaseToUnitFunc": "{x}/1.63533984e6", "Localization": [ { "Culture": "en-US", @@ -63,8 +63,8 @@ { "SingularName": "BtuPerSecondSquareFoot", "PluralName": "BtusPerSecondSquareFoot", - "FromUnitToBaseFunc": "x*1.13565267e4", - "FromBaseToUnitFunc": "x/1.13565267e4", + "FromUnitToBaseFunc": "{x}*1.13565267e4", + "FromBaseToUnitFunc": "{x}/1.13565267e4", "Localization": [ { "Culture": "en-US", @@ -75,8 +75,8 @@ { "SingularName": "BtuPerMinuteSquareFoot", "PluralName": "BtusPerMinuteSquareFoot", - "FromUnitToBaseFunc": "x*1.89275445e2", - "FromBaseToUnitFunc": "x/1.89275445e2", + "FromUnitToBaseFunc": "{x}*1.89275445e2", + "FromBaseToUnitFunc": "{x}/1.89275445e2", "Localization": [ { "Culture": "en-US", @@ -87,8 +87,8 @@ { "SingularName": "BtuPerHourSquareFoot", "PluralName": "BtusPerHourSquareFoot", - "FromUnitToBaseFunc": "x*3.15459075", - "FromBaseToUnitFunc": "x/3.15459075", + "FromUnitToBaseFunc": "{x}*3.15459075", + "FromBaseToUnitFunc": "{x}/3.15459075", "Localization": [ { "Culture": "en-US", @@ -99,8 +99,8 @@ { "SingularName": "CaloriePerSecondSquareCentimeter", "PluralName": "CaloriesPerSecondSquareCentimeter", - "FromUnitToBaseFunc": "x*4.1868e4", - "FromBaseToUnitFunc": "x/4.1868e4", + "FromUnitToBaseFunc": "{x}*4.1868e4", + "FromBaseToUnitFunc": "{x}/4.1868e4", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -112,8 +112,8 @@ { "SingularName": "KilocaloriePerHourSquareMeter", "PluralName": "KilocaloriesPerHourSquareMeter", - "FromUnitToBaseFunc": "x*1.163", - "FromBaseToUnitFunc": "x/1.163", + "FromUnitToBaseFunc": "{x}*1.163", + "FromBaseToUnitFunc": "{x}/1.163", "Localization": [ { "Culture": "en-US", @@ -124,8 +124,8 @@ { "SingularName": "PoundForcePerFootSecond", "PluralName": "PoundsForcePerFootSecond", - "FromUnitToBaseFunc": "x*1.459390293720636e1", - "FromBaseToUnitFunc": "x/1.459390293720636e1", + "FromUnitToBaseFunc": "{x}*1.459390293720636e1", + "FromBaseToUnitFunc": "{x}/1.459390293720636e1", "Localization": [ { "Culture": "en-US", @@ -136,8 +136,8 @@ { "SingularName": "PoundPerSecondCubed", "PluralName": "PoundsPerSecondCubed", - "FromUnitToBaseFunc": "x*4.5359237e-1", - "FromBaseToUnitFunc": "x/4.5359237e-1", + "FromUnitToBaseFunc": "{x}*4.5359237e-1", + "FromBaseToUnitFunc": "{x}/4.5359237e-1", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/HeatTransferCoefficient.json b/Common/UnitDefinitions/HeatTransferCoefficient.json index 108f1c7c51..d84d879954 100644 --- a/Common/UnitDefinitions/HeatTransferCoefficient.json +++ b/Common/UnitDefinitions/HeatTransferCoefficient.json @@ -11,8 +11,8 @@ { "SingularName": "WattPerSquareMeterKelvin", "PluralName": "WattsPerSquareMeterKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -23,8 +23,8 @@ { "SingularName": "WattPerSquareMeterCelsius", "PluralName": "WattsPerSquareMeterCelsius", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -35,8 +35,8 @@ { "SingularName": "BtuPerSquareFootDegreeFahrenheit", "PluralName": "BtusPerSquareFootDegreeFahrenheit", - "FromUnitToBaseFunc": "x * 5.6782633411134878", - "FromBaseToUnitFunc": "x / 5.6782633411134878", + "FromUnitToBaseFunc": "{x} * 5.6782633411134878", + "FromBaseToUnitFunc": "{x} / 5.6782633411134878", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Illuminance.json b/Common/UnitDefinitions/Illuminance.json index c8268f093f..6d05a654e6 100644 --- a/Common/UnitDefinitions/Illuminance.json +++ b/Common/UnitDefinitions/Illuminance.json @@ -11,8 +11,8 @@ { "SingularName": "Lux", "PluralName": "Lux", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Information.json b/Common/UnitDefinitions/Information.json index 465fea7e23..268e18df37 100644 --- a/Common/UnitDefinitions/Information.json +++ b/Common/UnitDefinitions/Information.json @@ -7,8 +7,8 @@ { "SingularName": "Byte", "PluralName": "Bytes", - "FromUnitToBaseFunc": "x*8m", - "FromBaseToUnitFunc": "x/8m", + "FromUnitToBaseFunc": "{x}*8m", + "FromBaseToUnitFunc": "{x}/8m", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera", "Peta", "Exa", "Kibi", "Mebi", "Gibi", "Tebi", "Pebi", "Exbi" ], "Localization": [ { @@ -20,8 +20,8 @@ { "SingularName": "Bit", "PluralName": "Bits", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera", "Peta", "Exa", "Kibi", "Mebi", "Gibi", "Tebi", "Pebi", "Exbi" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Irradiance.json b/Common/UnitDefinitions/Irradiance.json index 8f97326c4e..d5807d58e3 100644 --- a/Common/UnitDefinitions/Irradiance.json +++ b/Common/UnitDefinitions/Irradiance.json @@ -10,8 +10,8 @@ { "SingularName": "WattPerSquareMeter", "PluralName": "WattsPerSquareMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "WattPerSquareCentimeter", "PluralName": "WattsPerSquareCentimeter", - "FromUnitToBaseFunc": "x*10000", - "FromBaseToUnitFunc": "x*0.0001", + "FromUnitToBaseFunc": "{x}*10000", + "FromBaseToUnitFunc": "{x}*0.0001", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Irradiation.json b/Common/UnitDefinitions/Irradiation.json index 826586bd64..ef542498c5 100644 --- a/Common/UnitDefinitions/Irradiation.json +++ b/Common/UnitDefinitions/Irradiation.json @@ -11,8 +11,8 @@ { "SingularName": "JoulePerSquareMeter", "PluralName": "JoulesPerSquareMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "JoulePerSquareCentimeter", "PluralName": "JoulesPerSquareCentimeter", - "FromUnitToBaseFunc": "x*1e4", - "FromBaseToUnitFunc": "x/1e4", + "FromUnitToBaseFunc": "{x}*1e4", + "FromBaseToUnitFunc": "{x}/1e4", "Prefixes": [ "Milli" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "JoulePerSquareMillimeter", "PluralName": "JoulesPerSquareMillimeter", - "FromUnitToBaseFunc": "x*1e6", - "FromBaseToUnitFunc": "x/1e6", + "FromUnitToBaseFunc": "{x}*1e6", + "FromBaseToUnitFunc": "{x}/1e6", "Localization": [ { "Culture": "en-US", @@ -49,8 +49,8 @@ { "SingularName": "WattHourPerSquareMeter", "PluralName": "WattHoursPerSquareMeter", - "FromUnitToBaseFunc": "x*3600d", - "FromBaseToUnitFunc": "x/3600d", + "FromUnitToBaseFunc": "{x}*3600d", + "FromBaseToUnitFunc": "{x}/3600d", "Prefixes": [ "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/KinematicViscosity.json b/Common/UnitDefinitions/KinematicViscosity.json index 71499981eb..68a8e74ac3 100644 --- a/Common/UnitDefinitions/KinematicViscosity.json +++ b/Common/UnitDefinitions/KinematicViscosity.json @@ -11,8 +11,8 @@ { "SingularName": "SquareMeterPerSecond", "PluralName": "SquareMetersPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -27,8 +27,8 @@ { "SingularName": "Stokes", "PluralName": "Stokes", - "FromUnitToBaseFunc": "x/1e4", - "FromBaseToUnitFunc": "x*1e4", + "FromUnitToBaseFunc": "{x}/1e4", + "FromBaseToUnitFunc": "{x}*1e4", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -44,8 +44,8 @@ { "SingularName": "SquareFootPerSecond", "PluralName": "SquareFeetPerSecond", - "FromUnitToBaseFunc": "x/10.7639", - "FromBaseToUnitFunc": "x*10.7639", + "FromUnitToBaseFunc": "{x}/10.7639", + "FromBaseToUnitFunc": "{x}*10.7639", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/LapseRate.json b/Common/UnitDefinitions/LapseRate.json index c443b5e2bd..9cffb69e94 100644 --- a/Common/UnitDefinitions/LapseRate.json +++ b/Common/UnitDefinitions/LapseRate.json @@ -11,8 +11,8 @@ { "SingularName": "DegreeCelsiusPerKilometer", "PluralName": "DegreesCelciusPerKilometer", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Length.json b/Common/UnitDefinitions/Length.json index 7e17c888f6..05de79823d 100644 --- a/Common/UnitDefinitions/Length.json +++ b/Common/UnitDefinitions/Length.json @@ -12,8 +12,8 @@ "BaseUnits": { "L": "Meter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Hecto", "Kilo" ], "Localization": [ { @@ -36,8 +36,8 @@ "BaseUnits": { "L": "Mile" }, - "FromUnitToBaseFunc": "x*1609.34", - "FromBaseToUnitFunc": "x/1609.34", + "FromUnitToBaseFunc": "{x}*1609.34", + "FromBaseToUnitFunc": "{x}/1609.34", "Localization": [ { "Culture": "en-US", @@ -59,8 +59,8 @@ "BaseUnits": { "L": "Yard" }, - "FromUnitToBaseFunc": "x*0.9144", - "FromBaseToUnitFunc": "x/0.9144", + "FromUnitToBaseFunc": "{x}*0.9144", + "FromBaseToUnitFunc": "{x}/0.9144", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ "BaseUnits": { "L": "Foot" }, - "FromUnitToBaseFunc": "x*0.3048", - "FromBaseToUnitFunc": "x/0.3048", + "FromUnitToBaseFunc": "{x}*0.3048", + "FromBaseToUnitFunc": "{x}/0.3048", "Localization": [ { "Culture": "en-US", @@ -105,8 +105,8 @@ "BaseUnits": { "L": "UsSurveyFoot" }, - "FromUnitToBaseFunc": "x*1200/3937", - "FromBaseToUnitFunc": "x*3937/1200", + "FromUnitToBaseFunc": "{x}*1200/3937", + "FromBaseToUnitFunc": "{x}*3937/1200", "Localization": [ { "Culture": "en-US", @@ -120,8 +120,8 @@ "BaseUnits": { "L": "Inch" }, - "FromUnitToBaseFunc": "x*2.54e-2", - "FromBaseToUnitFunc": "x/2.54e-2", + "FromUnitToBaseFunc": "{x}*2.54e-2", + "FromBaseToUnitFunc": "{x}/2.54e-2", "Localization": [ { "Culture": "en-US", @@ -143,8 +143,8 @@ "BaseUnits": { "L": "Mil" }, - "FromUnitToBaseFunc": "x*2.54e-5", - "FromBaseToUnitFunc": "x/2.54e-5", + "FromUnitToBaseFunc": "{x}*2.54e-5", + "FromBaseToUnitFunc": "{x}/2.54e-5", "Localization": [ { "Culture": "en-US", @@ -166,8 +166,8 @@ "BaseUnits": { "L": "NauticalMile" }, - "FromUnitToBaseFunc": "x*1852", - "FromBaseToUnitFunc": "x/1852", + "FromUnitToBaseFunc": "{x}*1852", + "FromBaseToUnitFunc": "{x}/1852", "Localization": [ { "Culture": "en-US", @@ -189,8 +189,8 @@ "BaseUnits": { "L": "Fathom" }, - "FromUnitToBaseFunc": "x*1.8288", - "FromBaseToUnitFunc": "x/1.8288", + "FromUnitToBaseFunc": "{x}*1.8288", + "FromBaseToUnitFunc": "{x}/1.8288", "Localization": [ { "Culture": "en-US", @@ -204,8 +204,8 @@ "BaseUnits": { "L": "Shackle" }, - "FromUnitToBaseFunc": "x*27.432", - "FromBaseToUnitFunc": "x/27.432", + "FromUnitToBaseFunc": "{x}*27.432", + "FromBaseToUnitFunc": "{x}/27.432", "Localization": [ { "Culture": "en-US", @@ -219,8 +219,8 @@ "BaseUnits": { "L": "Microinch" }, - "FromUnitToBaseFunc": "x*2.54e-8", - "FromBaseToUnitFunc": "x/2.54e-8", + "FromUnitToBaseFunc": "{x}*2.54e-8", + "FromBaseToUnitFunc": "{x}/2.54e-8", "Localization": [ { "Culture": "en-US", @@ -242,8 +242,8 @@ "BaseUnits": { "L": "PrinterPoint" }, - "FromUnitToBaseFunc": "(x/72.27)*2.54e-2", - "FromBaseToUnitFunc": "(x/2.54e-2)*72.27", + "FromUnitToBaseFunc": "({x}/72.27)*2.54e-2", + "FromBaseToUnitFunc": "({x}/2.54e-2)*72.27", "Localization": [ { "Culture": "en-US", @@ -257,8 +257,8 @@ "BaseUnits": { "L": "DtpPoint" }, - "FromUnitToBaseFunc": "(x/72)*2.54e-2", - "FromBaseToUnitFunc": "(x/2.54e-2)*72", + "FromUnitToBaseFunc": "({x}/72)*2.54e-2", + "FromBaseToUnitFunc": "({x}/2.54e-2)*72", "Localization": [ { "Culture": "en-US", @@ -272,8 +272,8 @@ "BaseUnits": { "L": "PrinterPica" }, - "FromUnitToBaseFunc": "x/237.106301584", - "FromBaseToUnitFunc": "x*237.106301584", + "FromUnitToBaseFunc": "{x}/237.106301584", + "FromBaseToUnitFunc": "{x}*237.106301584", "Localization": [ { "Culture": "en-US", @@ -287,8 +287,8 @@ "BaseUnits": { "L": "DtpPica" }, - "FromUnitToBaseFunc": "x/236.220472441", - "FromBaseToUnitFunc": "x*236.220472441", + "FromUnitToBaseFunc": "{x}/236.220472441", + "FromBaseToUnitFunc": "{x}*236.220472441", "Localization": [ { "Culture": "en-US", @@ -302,8 +302,8 @@ "BaseUnits": { "L": "Twip" }, - "FromUnitToBaseFunc": "x/56692.913385826", - "FromBaseToUnitFunc": "x*56692.913385826", + "FromUnitToBaseFunc": "{x}/56692.913385826", + "FromBaseToUnitFunc": "{x}*56692.913385826", "Localization": [ { "Culture": "en-US", @@ -317,8 +317,8 @@ "BaseUnits": { "L": "Hand" }, - "FromUnitToBaseFunc": "x * 1.016e-1", - "FromBaseToUnitFunc": "x / 1.016e-1", + "FromUnitToBaseFunc": "{x} * 1.016e-1", + "FromBaseToUnitFunc": "{x} / 1.016e-1", "Localization": [ { "Culture": "en-US", @@ -329,8 +329,8 @@ { "SingularName": "AstronomicalUnit", "PluralName": "AstronomicalUnits", - "FromUnitToBaseFunc": "x * 1.4959787070e11", - "FromBaseToUnitFunc": "x / 1.4959787070e11", + "FromUnitToBaseFunc": "{x} * 1.4959787070e11", + "FromBaseToUnitFunc": "{x} / 1.4959787070e11", "XmlDocSummary": "One Astronomical Unit is the distance from the solar system Star, the sun, to planet Earth.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Astronomical_unit", "Localization": [ @@ -343,8 +343,8 @@ { "SingularName": "Parsec", "PluralName": "Parsecs", - "FromUnitToBaseFunc": "x * 3.08567758128e16", - "FromBaseToUnitFunc": "x / 3.08567758128e16", + "FromUnitToBaseFunc": "{x} * 3.08567758128e16", + "FromBaseToUnitFunc": "{x} / 3.08567758128e16", "XmlDocSummary": "A parsec is defined as the distance at which one astronomical unit (AU) subtends an angle of one arcsecond.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Parsec", "Prefixes": [ "Kilo", "Mega" ], @@ -358,8 +358,8 @@ { "SingularName": "LightYear", "PluralName": "LightYears", - "FromUnitToBaseFunc": "x * 9.46073047258e15", - "FromBaseToUnitFunc": "x / 9.46073047258e15", + "FromUnitToBaseFunc": "{x} * 9.46073047258e15", + "FromBaseToUnitFunc": "{x} / 9.46073047258e15", "XmlDocSummary": "A Light Year (ly) is the distance that light travel during an Earth year, ie 365 days.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Light-year", "Prefixes": [ "Kilo", "Mega" ], @@ -373,8 +373,8 @@ { "SingularName": "SolarRadius", "PluralName": "SolarRadiuses", - "FromUnitToBaseFunc": "x * 6.95510000E+08", - "FromBaseToUnitFunc": "x / 6.95510000E+08", + "FromUnitToBaseFunc": "{x} * 6.95510000E+08", + "FromBaseToUnitFunc": "{x} / 6.95510000E+08", "XmlDocSummary": "Solar radius is a ratio unit to the radius of the solar system star, the sun.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Stellar_classification", "Localization": [ @@ -390,8 +390,8 @@ "BaseUnits": { "L": "Chain" }, - "FromUnitToBaseFunc": "x*20.1168", - "FromBaseToUnitFunc": "x/20.1168", + "FromUnitToBaseFunc": "{x}*20.1168", + "FromBaseToUnitFunc": "{x}/20.1168", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Level.json b/Common/UnitDefinitions/Level.json index 6b601f1f84..b172ce58e1 100644 --- a/Common/UnitDefinitions/Level.json +++ b/Common/UnitDefinitions/Level.json @@ -8,8 +8,8 @@ { "SingularName": "Decibel", "PluralName": "Decibels", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -20,8 +20,8 @@ { "SingularName": "Neper", "PluralName": "Nepers", - "FromUnitToBaseFunc": "(1/0.115129254)*x", - "FromBaseToUnitFunc": "0.115129254*x", + "FromUnitToBaseFunc": "(1/0.115129254)*{x}", + "FromBaseToUnitFunc": "0.115129254*{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/LinearDensity.json b/Common/UnitDefinitions/LinearDensity.json index 9da3d68ca0..99c225e494 100644 --- a/Common/UnitDefinitions/LinearDensity.json +++ b/Common/UnitDefinitions/LinearDensity.json @@ -11,8 +11,8 @@ { "SingularName": "GramPerMillimeter", "PluralName": "GramsPerMillimeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Kilo" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "GramPerCentimeter", "PluralName": "GramsPerCentimeter", - "FromUnitToBaseFunc": "x*1e-1", - "FromBaseToUnitFunc": "x/1e-1", + "FromUnitToBaseFunc": "{x}*1e-1", + "FromBaseToUnitFunc": "{x}/1e-1", "Prefixes": [ "Micro", "Milli", "Kilo" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "GramPerMeter", "PluralName": "GramsPerMeter", - "FromUnitToBaseFunc": "x*1e-3", - "FromBaseToUnitFunc": "x/1e-3", + "FromUnitToBaseFunc": "{x}*1e-3", + "FromBaseToUnitFunc": "{x}/1e-3", "Prefixes": [ "Micro", "Milli", "Kilo" ], "Localization": [ { @@ -50,8 +50,8 @@ { "SingularName": "PoundPerInch", "PluralName": "PoundsPerInch", - "FromUnitToBaseFunc": "x/5.5997415e-2", - "FromBaseToUnitFunc": "x*5.5997415e-2", + "FromUnitToBaseFunc": "{x}/5.5997415e-2", + "FromBaseToUnitFunc": "{x}*5.5997415e-2", "Localization": [ { "Culture": "en-US", @@ -62,8 +62,8 @@ { "SingularName": "PoundPerFoot", "PluralName": "PoundsPerFoot", - "FromUnitToBaseFunc": "x*1.48816394", - "FromBaseToUnitFunc": "x/1.48816394", + "FromUnitToBaseFunc": "{x}*1.48816394", + "FromBaseToUnitFunc": "{x}/1.48816394", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/LinearPowerDensity.json b/Common/UnitDefinitions/LinearPowerDensity.json index f8fe4b768e..3bc06ca70c 100644 --- a/Common/UnitDefinitions/LinearPowerDensity.json +++ b/Common/UnitDefinitions/LinearPowerDensity.json @@ -12,8 +12,8 @@ { "SingularName": "WattPerMeter", "PluralName": "WattsPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -25,8 +25,8 @@ { "SingularName": "WattPerCentimeter", "PluralName": "WattsPerCentimeter", - "FromUnitToBaseFunc": "x*1e2", - "FromBaseToUnitFunc": "x/1e2", + "FromUnitToBaseFunc": "{x}*1e2", + "FromBaseToUnitFunc": "{x}/1e2", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -38,8 +38,8 @@ { "SingularName": "WattPerMillimeter", "PluralName": "WattsPerMillimeter", - "FromUnitToBaseFunc": "x*1e3", - "FromBaseToUnitFunc": "x/1e3", + "FromUnitToBaseFunc": "{x}*1e3", + "FromBaseToUnitFunc": "{x}/1e3", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -51,8 +51,8 @@ { "SingularName": "WattPerInch", "PluralName": "WattsPerInch", - "FromUnitToBaseFunc": "x*39.37007874", - "FromBaseToUnitFunc": "x/39.37007874", + "FromUnitToBaseFunc": "{x}*39.37007874", + "FromBaseToUnitFunc": "{x}/39.37007874", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -64,8 +64,8 @@ { "SingularName": "WattPerFoot", "PluralName": "WattsPerFoot", - "FromUnitToBaseFunc": "x*3.280839895", - "FromBaseToUnitFunc": "x/3.280839895", + "FromUnitToBaseFunc": "{x}*3.280839895", + "FromBaseToUnitFunc": "{x}/3.280839895", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Luminosity.json b/Common/UnitDefinitions/Luminosity.json index 11e3ee837b..a6e6512728 100644 --- a/Common/UnitDefinitions/Luminosity.json +++ b/Common/UnitDefinitions/Luminosity.json @@ -13,8 +13,8 @@ { "SingularName": "Watt", "PluralName": "Watts", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera", "Peta" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "SolarLuminosity", "PluralName": "SolarLuminosities", - "FromUnitToBaseFunc": "x * 3.846e26", - "FromBaseToUnitFunc": "x / 3.846e26", + "FromUnitToBaseFunc": "{x} * 3.846e26", + "FromBaseToUnitFunc": "{x} / 3.846e26", "XmlDocRemarks": "https://www.britannica.com/science/luminosity", "Localization": [ { diff --git a/Common/UnitDefinitions/LuminousFlux.json b/Common/UnitDefinitions/LuminousFlux.json index 8b5238d7fa..af9e070a27 100644 --- a/Common/UnitDefinitions/LuminousFlux.json +++ b/Common/UnitDefinitions/LuminousFlux.json @@ -10,8 +10,8 @@ { "SingularName": "Lumen", "PluralName": "Lumens", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/LuminousIntensity.json b/Common/UnitDefinitions/LuminousIntensity.json index 9a13ad312a..c7cd0f0241 100644 --- a/Common/UnitDefinitions/LuminousIntensity.json +++ b/Common/UnitDefinitions/LuminousIntensity.json @@ -13,8 +13,8 @@ "BaseUnits": { "J": "Candela" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/MagneticField.json b/Common/UnitDefinitions/MagneticField.json index d0992477f9..1e9a339d6d 100644 --- a/Common/UnitDefinitions/MagneticField.json +++ b/Common/UnitDefinitions/MagneticField.json @@ -12,8 +12,8 @@ { "SingularName": "Tesla", "PluralName": "Teslas", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli" ], "Localization": [ { @@ -25,8 +25,8 @@ { "SingularName": "Gauss", "PluralName": "Gausses", - "FromUnitToBaseFunc": "x/1e4", - "FromBaseToUnitFunc": "x*1e4", + "FromUnitToBaseFunc": "{x}/1e4", + "FromBaseToUnitFunc": "{x}*1e4", "Prefixes": [ "Milli" ], "Localization": [ { diff --git a/Common/UnitDefinitions/MagneticFlux.json b/Common/UnitDefinitions/MagneticFlux.json index 0748c24cdd..48c987fef3 100644 --- a/Common/UnitDefinitions/MagneticFlux.json +++ b/Common/UnitDefinitions/MagneticFlux.json @@ -13,8 +13,8 @@ { "SingularName": "Weber", "PluralName": "Webers", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Magnetization.json b/Common/UnitDefinitions/Magnetization.json index 2e15c7de36..2bfd605198 100644 --- a/Common/UnitDefinitions/Magnetization.json +++ b/Common/UnitDefinitions/Magnetization.json @@ -15,8 +15,8 @@ "L": "Meter", "I": "Ampere" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Mass.json b/Common/UnitDefinitions/Mass.json index bbda2f4f61..2a42de51b1 100644 --- a/Common/UnitDefinitions/Mass.json +++ b/Common/UnitDefinitions/Mass.json @@ -12,8 +12,8 @@ "BaseUnits": { "M": "Gram" }, - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -36,8 +36,8 @@ "BaseUnits": { "M": "Tonne" }, - "FromUnitToBaseFunc": "x*1e3", - "FromBaseToUnitFunc": "x/1e3", + "FromUnitToBaseFunc": "{x}*1e3", + "FromBaseToUnitFunc": "{x}/1e3", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -60,8 +60,8 @@ "BaseUnits": { "M": "ShortTon" }, - "FromUnitToBaseFunc": "x*9.0718474e2", - "FromBaseToUnitFunc": "x/9.0718474e2", + "FromUnitToBaseFunc": "{x}*9.0718474e2", + "FromBaseToUnitFunc": "{x}/9.0718474e2", "XmlDocSummary": "The short ton is a unit of mass equal to 2,000 pounds (907.18474 kg), that is most commonly used in the United States – known there simply as the ton.", "XmlDocRemarks": "http://en.wikipedia.org/wiki/Short_ton", "Localization": [ @@ -85,8 +85,8 @@ "BaseUnits": { "M": "LongTon" }, - "FromUnitToBaseFunc": "x*1.0160469088e3", - "FromBaseToUnitFunc": "x/1.0160469088e3", + "FromUnitToBaseFunc": "{x}*1.0160469088e3", + "FromBaseToUnitFunc": "{x}/1.0160469088e3", "XmlDocSummary": "Long ton (weight ton or Imperial ton) is a unit of mass equal to 2,240 pounds (1,016 kg) and is the name for the unit called the \"ton\" in the avoirdupois or Imperial system of measurements that was used in the United Kingdom and several other Commonwealth countries before metrication.", "XmlDocRemarks": "http://en.wikipedia.org/wiki/Long_ton", "Localization": [ @@ -110,8 +110,8 @@ "BaseUnits": { "M": "Pound" }, - "FromUnitToBaseFunc": "x*0.45359237", - "FromBaseToUnitFunc": "x/0.45359237", + "FromUnitToBaseFunc": "{x}*0.45359237", + "FromBaseToUnitFunc": "{x}/0.45359237", "XmlDocSummary": "The pound or pound-mass (abbreviations: lb, lbm) is a unit of mass used in the imperial, United States customary and other systems of measurement. A number of different definitions have been used, the most common today being the international avoirdupois pound which is legally defined as exactly 0.45359237 kilograms, and which is divided into 16 avoirdupois ounces.", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ @@ -135,8 +135,8 @@ "BaseUnits": { "M": "Ounce" }, - "FromUnitToBaseFunc": "x/35.2739619", - "FromBaseToUnitFunc": "x*35.2739619", + "FromUnitToBaseFunc": "{x}/35.2739619", + "FromBaseToUnitFunc": "{x}*35.2739619", "XmlDocSummary": "An ounce (abbreviated oz) is usually the international avoirdupois ounce as used in the United States customary and British imperial systems, which is equal to one-sixteenth of a pound or approximately 28 grams. The abbreviation 'oz' derives from the Italian word onza (now spelled oncia).", "XmlDocRemarks": "http://en.wikipedia.org/wiki/Ounce", "Localization": [ @@ -156,8 +156,8 @@ "BaseUnits": { "M": "Slug" }, - "FromUnitToBaseFunc": "x/6.852176556196105e-2", - "FromBaseToUnitFunc": "x*6.852176556196105e-2", + "FromUnitToBaseFunc": "{x}/6.852176556196105e-2", + "FromBaseToUnitFunc": "{x}*6.852176556196105e-2", "XmlDocSummary": "The slug (abbreviation slug) is a unit of mass that is accelerated by 1 ft/s² when a force of one pound (lbf) is exerted on it.", "XmlDocRemarks": "http://en.wikipedia.org/wiki/Slug_(unit)", "Localization": [ @@ -173,8 +173,8 @@ "BaseUnits": { "M": "Stone" }, - "FromUnitToBaseFunc": "x/0.1574731728702698", - "FromBaseToUnitFunc": "x*0.1574731728702698", + "FromUnitToBaseFunc": "{x}/0.1574731728702698", + "FromBaseToUnitFunc": "{x}*0.1574731728702698", "XmlDocSummary": "The stone (abbreviation st) is a unit of mass equal to 14 pounds avoirdupois (about 6.35 kilograms) used in Great Britain and Ireland for measuring human body weight.", "XmlDocRemarks": "http://en.wikipedia.org/wiki/Stone_(unit)", "Localization": [ @@ -190,8 +190,8 @@ "BaseUnits": { "M": "ShortHundredweight" }, - "FromUnitToBaseFunc": "x/0.022046226218487758", - "FromBaseToUnitFunc": "x*0.022046226218487758", + "FromUnitToBaseFunc": "{x}/0.022046226218487758", + "FromBaseToUnitFunc": "{x}*0.022046226218487758", "XmlDocSummary": "The short hundredweight (abbreviation cwt) is a unit of mass equal to 100 pounds in US and Canada. In British English, the short hundredweight is referred to as the \"cental\".", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Hundredweight", "Localization": [ @@ -207,8 +207,8 @@ "BaseUnits": { "M": "LongHundredweight" }, - "FromUnitToBaseFunc": "x/0.01968413055222121", - "FromBaseToUnitFunc": "x*0.01968413055222121", + "FromUnitToBaseFunc": "{x}/0.01968413055222121", + "FromBaseToUnitFunc": "{x}*0.01968413055222121", "XmlDocSummary": "The long or imperial hundredweight (abbreviation cwt) is a unit of mass equal to 112 pounds in US and Canada.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Hundredweight", "Localization": [ @@ -224,8 +224,8 @@ "BaseUnits": { "M": "Grain" }, - "FromUnitToBaseFunc": "x/15432.358352941431", - "FromBaseToUnitFunc": "x*15432.358352941431", + "FromUnitToBaseFunc": "{x}/15432.358352941431", + "FromBaseToUnitFunc": "{x}*15432.358352941431", "XmlDocSummary": "A grain is a unit of measurement of mass, and in the troy weight, avoirdupois, and Apothecaries' system, equal to exactly 64.79891 milligrams.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Grain_(unit)", "Localization": [ @@ -241,8 +241,8 @@ "BaseUnits": { "M": "SolarMass" }, - "FromUnitToBaseFunc": "x * 1.98947e30", - "FromBaseToUnitFunc": "x / 1.98947e30", + "FromUnitToBaseFunc": "{x} * 1.98947e30", + "FromBaseToUnitFunc": "{x} / 1.98947e30", "XmlDocSummary": "Solar mass is a ratio unit to the mass of the solar system star, the sun.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Solar_mass", "Localization": [ @@ -258,8 +258,8 @@ "BaseUnits": { "M": "EarthMass" }, - "FromUnitToBaseFunc": "x * 5.9722E+24", - "FromBaseToUnitFunc": "x / 5.9722E+24", + "FromUnitToBaseFunc": "{x} * 5.9722E+24", + "FromBaseToUnitFunc": "{x} / 5.9722E+24", "XmlDocSummary": "Earth mass is a ratio unit to the mass of planet Earth.", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Earth_mass", "Localization": [ diff --git a/Common/UnitDefinitions/MassConcentration.json b/Common/UnitDefinitions/MassConcentration.json index 8e1951cd1c..5aa59138d6 100644 --- a/Common/UnitDefinitions/MassConcentration.json +++ b/Common/UnitDefinitions/MassConcentration.json @@ -15,8 +15,8 @@ "M": "Gram", "L": "Millimeter" }, - "FromUnitToBaseFunc": "x/1e-6", - "FromBaseToUnitFunc": "x*1e-6", + "FromUnitToBaseFunc": "{x}/1e-6", + "FromBaseToUnitFunc": "{x}*1e-6", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -32,8 +32,8 @@ "M": "Gram", "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -49,8 +49,8 @@ "M": "Gram", "L": "Meter" }, - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Kilo", "Milli", "Micro" ], "Localization": [ { @@ -70,8 +70,8 @@ "M": "Gram", "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e-6", - "FromBaseToUnitFunc": "x*1e-6", + "FromUnitToBaseFunc": "{x}/1e-6", + "FromBaseToUnitFunc": "{x}*1e-6", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -87,8 +87,8 @@ "M": "Gram", "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -100,8 +100,8 @@ { "SingularName": "GramPerDeciliter", "PluralName": "GramsPerDeciliter", - "FromUnitToBaseFunc": "x/1e-1", - "FromBaseToUnitFunc": "x*1e-1", + "FromUnitToBaseFunc": "{x}/1e-1", + "FromBaseToUnitFunc": "{x}*1e-1", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -117,8 +117,8 @@ "M": "Gram", "L": "Decimeter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -134,8 +134,8 @@ "M": "Tonne", "L": "Millimeter" }, - "FromUnitToBaseFunc": "x/1e-12", - "FromBaseToUnitFunc": "x*1e-12", + "FromUnitToBaseFunc": "{x}/1e-12", + "FromBaseToUnitFunc": "{x}*1e-12", "Localization": [ { "Culture": "en-US", @@ -150,8 +150,8 @@ "M": "Tonne", "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e-9", - "FromBaseToUnitFunc": "x*1e-9", + "FromUnitToBaseFunc": "{x}/1e-9", + "FromBaseToUnitFunc": "{x}*1e-9", "Localization": [ { "Culture": "en-US", @@ -166,8 +166,8 @@ "M": "Tonne", "L": "Meter" }, - "FromUnitToBaseFunc": "x/0.001", - "FromBaseToUnitFunc": "x*0.001", + "FromUnitToBaseFunc": "{x}/0.001", + "FromBaseToUnitFunc": "{x}*0.001", "Localization": [ { "Culture": "en-US", @@ -182,8 +182,8 @@ "M": "Pound", "L": "Inch" }, - "FromUnitToBaseFunc": "x/3.6127298147753e-5", - "FromBaseToUnitFunc": "x*3.6127298147753e-5", + "FromUnitToBaseFunc": "{x}/3.6127298147753e-5", + "FromBaseToUnitFunc": "{x}*3.6127298147753e-5", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -200,8 +200,8 @@ "M": "Pound", "L": "Foot" }, - "FromUnitToBaseFunc": "x/0.062427961", - "FromBaseToUnitFunc": "x*0.062427961", + "FromUnitToBaseFunc": "{x}/0.062427961", + "FromBaseToUnitFunc": "{x}*0.062427961", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -218,8 +218,8 @@ "M": "Slug", "L": "Foot" }, - "FromUnitToBaseFunc": "x*515.378818", - "FromBaseToUnitFunc": "x*0.00194032033", + "FromUnitToBaseFunc": "{x}*515.378818", + "FromBaseToUnitFunc": "{x}*0.00194032033", "Localization": [ { "Culture": "en-US", @@ -230,8 +230,8 @@ { "SingularName": "PoundPerUSGallon", "PluralName": "PoundsPerUSGallon", - "FromUnitToBaseFunc": "x*1.19826427e2", - "FromBaseToUnitFunc": "x/1.19826427e2", + "FromUnitToBaseFunc": "{x}*1.19826427e2", + "FromBaseToUnitFunc": "{x}/1.19826427e2", "Localization": [ { "Culture": "en-US", @@ -242,8 +242,8 @@ { "SingularName": "OuncePerUSGallon", "PluralName": "OuncesPerUSGallon", - "FromUnitToBaseFunc": " x/0.1335264711843", - "FromBaseToUnitFunc": "x*0.1335264711843", + "FromUnitToBaseFunc": " {x}/0.1335264711843", + "FromBaseToUnitFunc": "{x}*0.1335264711843", "Localization": [ { "Culture": "en-US", @@ -254,8 +254,8 @@ { "SingularName": "OuncePerImperialGallon", "PluralName": "OuncesPerImperialGallon", - "FromUnitToBaseFunc": " x/0.1603586720609", - "FromBaseToUnitFunc": "x*0.1603586720609", + "FromUnitToBaseFunc": " {x}/0.1603586720609", + "FromBaseToUnitFunc": "{x}*0.1603586720609", "Localization": [ { "Culture": "en-US", @@ -266,8 +266,8 @@ { "SingularName": "PoundPerImperialGallon", "PluralName": "PoundsPerImperialGallon", - "FromUnitToBaseFunc": "x*9.9776398e1", - "FromBaseToUnitFunc": "x/9.9776398e1", + "FromUnitToBaseFunc": "{x}*9.9776398e1", + "FromBaseToUnitFunc": "{x}/9.9776398e1", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/MassFlow.json b/Common/UnitDefinitions/MassFlow.json index d37466a9d2..e6fa944d0a 100644 --- a/Common/UnitDefinitions/MassFlow.json +++ b/Common/UnitDefinitions/MassFlow.json @@ -10,8 +10,8 @@ { "SingularName": "GramPerSecond", "PluralName": "GramsPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "GramPerDay", "PluralName": "GramsPerDay", - "FromUnitToBaseFunc": "x/86400", - "FromBaseToUnitFunc": "x*86400", + "FromUnitToBaseFunc": "{x}/86400", + "FromBaseToUnitFunc": "{x}*86400", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo", "Mega" ], "Localization": [ { @@ -36,8 +36,8 @@ { "SingularName": "GramPerHour", "PluralName": "GramsPerHour", - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Localization": [ { "Culture": "en-US", @@ -48,8 +48,8 @@ { "SingularName": "KilogramPerHour", "PluralName": "KilogramsPerHour", - "FromUnitToBaseFunc": "x/3.6", - "FromBaseToUnitFunc": "x*3.6", + "FromUnitToBaseFunc": "{x}/3.6", + "FromBaseToUnitFunc": "{x}*3.6", "Localization": [ { "Culture": "en-US", @@ -64,8 +64,8 @@ { "SingularName": "KilogramPerMinute", "PluralName": "KilogramsPerMinute", - "FromUnitToBaseFunc": "x/0.06", - "FromBaseToUnitFunc": "x*0.06", + "FromUnitToBaseFunc": "{x}/0.06", + "FromBaseToUnitFunc": "{x}*0.06", "Localization": [ { "Culture": "en-US", @@ -80,8 +80,8 @@ { "SingularName": "TonnePerHour", "PluralName": "TonnesPerHour", - "FromUnitToBaseFunc": "1000*x/3.6", - "FromBaseToUnitFunc": "x*3.6/1000", + "FromUnitToBaseFunc": "1000*{x}/3.6", + "FromBaseToUnitFunc": "{x}*3.6/1000", "Localization": [ { "Culture": "en-US", @@ -92,8 +92,8 @@ { "SingularName": "PoundPerDay", "PluralName": "PoundsPerDay", - "FromUnitToBaseFunc": "x/190.47936", - "FromBaseToUnitFunc": "x*190.47936", + "FromUnitToBaseFunc": "{x}/190.47936", + "FromBaseToUnitFunc": "{x}*190.47936", "Prefixes": [ "Mega" ], "Localization": [ { @@ -105,8 +105,8 @@ { "SingularName": "PoundPerHour", "PluralName": "PoundsPerHour", - "FromUnitToBaseFunc": "x/7.93664", - "FromBaseToUnitFunc": "x*7.93664", + "FromUnitToBaseFunc": "{x}/7.93664", + "FromBaseToUnitFunc": "{x}*7.93664", "Prefixes": [ "Mega" ], "Localization": [ { @@ -118,8 +118,8 @@ { "SingularName": "PoundPerMinute", "PluralName": "PoundsPerMinute", - "FromUnitToBaseFunc": "x/0.132277", - "FromBaseToUnitFunc": "x*0.132277", + "FromUnitToBaseFunc": "{x}/0.132277", + "FromBaseToUnitFunc": "{x}*0.132277", "Prefixes": [ "Mega" ], "Localization": [ { @@ -131,8 +131,8 @@ { "SingularName": "PoundPerSecond", "PluralName": "PoundsPerSecond", - "FromUnitToBaseFunc": "x * 453.59237", - "FromBaseToUnitFunc": "x / 453.59237", + "FromUnitToBaseFunc": "{x} * 453.59237", + "FromBaseToUnitFunc": "{x} / 453.59237", "Prefixes": [ "Mega" ], "Localization": [ { @@ -144,8 +144,8 @@ { "SingularName": "TonnePerDay", "PluralName": "TonnesPerDay", - "FromUnitToBaseFunc": "x/0.0864000", - "FromBaseToUnitFunc": "x*0.0864000", + "FromUnitToBaseFunc": "{x}/0.0864000", + "FromBaseToUnitFunc": "{x}*0.0864000", "Localization": [ { "Culture": "en-US", @@ -156,8 +156,8 @@ { "SingularName": "ShortTonPerHour", "PluralName": "ShortTonsPerHour", - "FromUnitToBaseFunc": "x*251.9957611", - "FromBaseToUnitFunc": "x/251.9957611", + "FromUnitToBaseFunc": "{x}*251.9957611", + "FromBaseToUnitFunc": "{x}/251.9957611", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/MassFlux.json b/Common/UnitDefinitions/MassFlux.json index 45492311a3..10f87a9add 100644 --- a/Common/UnitDefinitions/MassFlux.json +++ b/Common/UnitDefinitions/MassFlux.json @@ -11,8 +11,8 @@ { "SingularName": "GramPerSecondPerSquareMeter", "PluralName": "GramsPerSecondPerSquareMeter", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "GramPerSecondPerSquareCentimeter", "PluralName": "GramsPerSecondPerSquareCentimeter", - "FromUnitToBaseFunc": "x/1e-1", - "FromBaseToUnitFunc": "x*1e-1", + "FromUnitToBaseFunc": "{x}/1e-1", + "FromBaseToUnitFunc": "{x}*1e-1", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "GramPerSecondPerSquareMillimeter", "PluralName": "GramsPerSecondPerSquareMillimeter", - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -50,8 +50,8 @@ { "SingularName": "GramPerHourPerSquareMeter", "PluralName": "GramsPerHourPerSquareMeter", - "FromUnitToBaseFunc": "x/3.6e6", - "FromBaseToUnitFunc": "x*3.6e6", + "FromUnitToBaseFunc": "{x}/3.6e6", + "FromBaseToUnitFunc": "{x}*3.6e6", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -63,8 +63,8 @@ { "SingularName": "GramPerHourPerSquareCentimeter", "PluralName": "GramsPerHourPerSquareCentimeter", - "FromUnitToBaseFunc": "x/3.6e2", - "FromBaseToUnitFunc": "x*3.6e2", + "FromUnitToBaseFunc": "{x}/3.6e2", + "FromBaseToUnitFunc": "{x}*3.6e2", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -76,8 +76,8 @@ { "SingularName": "GramPerHourPerSquareMillimeter", "PluralName": "GramsPerHourPerSquareMillimeter", - "FromUnitToBaseFunc": "x/3.6e0", - "FromBaseToUnitFunc": "x*3.6e0", + "FromUnitToBaseFunc": "{x}/3.6e0", + "FromBaseToUnitFunc": "{x}*3.6e0", "Prefixes": [ "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/MassFraction.json b/Common/UnitDefinitions/MassFraction.json index fdfc016073..3a6fbdf90d 100644 --- a/Common/UnitDefinitions/MassFraction.json +++ b/Common/UnitDefinitions/MassFraction.json @@ -7,8 +7,8 @@ { "SingularName": "DecimalFraction", "PluralName": "DecimalFractions", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -19,8 +19,8 @@ { "SingularName": "GramPerGram", "PluralName": "GramsPerGram", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -32,8 +32,8 @@ { "SingularName": "GramPerKilogram", "PluralName": "GramsPerKilogram", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -45,8 +45,8 @@ { "SingularName": "Percent", "PluralName": "Percent", - "FromUnitToBaseFunc": "x/1e2", - "FromBaseToUnitFunc": "x*1e2", + "FromUnitToBaseFunc": "{x}/1e2", + "FromBaseToUnitFunc": "{x}*1e2", "Localization": [ { "Culture": "en-US", @@ -57,8 +57,8 @@ { "SingularName": "PartPerThousand", "PluralName": "PartsPerThousand", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Localization": [ { "Culture": "en-US", @@ -69,8 +69,8 @@ { "SingularName": "PartPerMillion", "PluralName": "PartsPerMillion", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ { "SingularName": "PartPerBillion", "PluralName": "PartsPerBillion", - "FromUnitToBaseFunc": "x/1e9", - "FromBaseToUnitFunc": "x*1e9", + "FromUnitToBaseFunc": "{x}/1e9", + "FromBaseToUnitFunc": "{x}*1e9", "Localization": [ { "Culture": "en-US", @@ -93,8 +93,8 @@ { "SingularName": "PartPerTrillion", "PluralName": "PartsPerTrillion", - "FromUnitToBaseFunc": "x/1e12", - "FromBaseToUnitFunc": "x*1e12", + "FromUnitToBaseFunc": "{x}/1e12", + "FromBaseToUnitFunc": "{x}*1e12", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/MassMomentOfInertia.json b/Common/UnitDefinitions/MassMomentOfInertia.json index e3916595d5..66888cdaae 100644 --- a/Common/UnitDefinitions/MassMomentOfInertia.json +++ b/Common/UnitDefinitions/MassMomentOfInertia.json @@ -10,8 +10,8 @@ { "SingularName": "GramSquareMeter", "PluralName": "GramSquareMeters", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Milli", "Kilo" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "GramSquareDecimeter", "PluralName": "GramSquareDecimeters", - "FromUnitToBaseFunc": "x/1e5", - "FromBaseToUnitFunc": "x*1e5", + "FromUnitToBaseFunc": "{x}/1e5", + "FromBaseToUnitFunc": "{x}*1e5", "Prefixes": [ "Milli", "Kilo" ], "Localization": [ { @@ -36,8 +36,8 @@ { "SingularName": "GramSquareCentimeter", "PluralName": "GramSquareCentimeters", - "FromUnitToBaseFunc": "x/1e7", - "FromBaseToUnitFunc": "x*1e7", + "FromUnitToBaseFunc": "{x}/1e7", + "FromBaseToUnitFunc": "{x}*1e7", "Prefixes": [ "Milli", "Kilo" ], "Localization": [ { @@ -49,8 +49,8 @@ { "SingularName": "GramSquareMillimeter", "PluralName": "GramSquareMillimeters", - "FromUnitToBaseFunc": "x/1e9", - "FromBaseToUnitFunc": "x*1e9", + "FromUnitToBaseFunc": "{x}/1e9", + "FromBaseToUnitFunc": "{x}*1e9", "Prefixes": [ "Milli", "Kilo" ], "Localization": [ { @@ -62,8 +62,8 @@ { "SingularName": "TonneSquareMeter", "PluralName": "TonneSquareMeters", - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -75,8 +75,8 @@ { "SingularName": "TonneSquareDecimeter", "PluralName": "TonneSquareDecimeters", - "FromUnitToBaseFunc": "x/1e-1", - "FromBaseToUnitFunc": "x*1e-1", + "FromUnitToBaseFunc": "{x}/1e-1", + "FromBaseToUnitFunc": "{x}*1e-1", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -88,8 +88,8 @@ { "SingularName": "TonneSquareCentimeter", "PluralName": "TonneSquareCentimeters", - "FromUnitToBaseFunc": "x/1e1", - "FromBaseToUnitFunc": "x*1e1", + "FromUnitToBaseFunc": "{x}/1e1", + "FromBaseToUnitFunc": "{x}*1e1", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -101,8 +101,8 @@ { "SingularName": "TonneSquareMilimeter", "PluralName": "TonneSquareMilimeters", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -114,8 +114,8 @@ { "SingularName": "PoundSquareFoot", "PluralName": "PoundSquareFeet", - "FromUnitToBaseFunc": "x*4.21401101e-2", - "FromBaseToUnitFunc": "x/4.21401101e-2", + "FromUnitToBaseFunc": "{x}*4.21401101e-2", + "FromBaseToUnitFunc": "{x}/4.21401101e-2", "Localization": [ { "Culture": "en-US", @@ -126,8 +126,8 @@ { "SingularName": "PoundSquareInch", "PluralName": "PoundSquareInches", - "FromUnitToBaseFunc": "x*2.9263965e-4", - "FromBaseToUnitFunc": "x/2.9263965e-4", + "FromUnitToBaseFunc": "{x}*2.9263965e-4", + "FromBaseToUnitFunc": "{x}/2.9263965e-4", "Localization": [ { "Culture": "en-US", @@ -138,8 +138,8 @@ { "SingularName": "SlugSquareFoot", "PluralName": "SlugSquareFeet", - "FromUnitToBaseFunc": "x*1.3558179619", - "FromBaseToUnitFunc": "x/1.3558179619", + "FromUnitToBaseFunc": "{x}*1.3558179619", + "FromBaseToUnitFunc": "{x}/1.3558179619", "Localization": [ { "Culture": "en-US", @@ -150,8 +150,8 @@ { "SingularName": "SlugSquareInch", "PluralName": "SlugSquareInches", - "FromUnitToBaseFunc": "x*9.41540242e-3", - "FromBaseToUnitFunc": "x/9.41540242e-3", + "FromUnitToBaseFunc": "{x}*9.41540242e-3", + "FromBaseToUnitFunc": "{x}/9.41540242e-3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/MolarEnergy.json b/Common/UnitDefinitions/MolarEnergy.json index 3012cef97e..d71f0d75d9 100644 --- a/Common/UnitDefinitions/MolarEnergy.json +++ b/Common/UnitDefinitions/MolarEnergy.json @@ -12,8 +12,8 @@ { "SingularName": "JoulePerMole", "PluralName": "JoulesPerMole", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/MolarEntropy.json b/Common/UnitDefinitions/MolarEntropy.json index 5771bc43a3..701c21639c 100644 --- a/Common/UnitDefinitions/MolarEntropy.json +++ b/Common/UnitDefinitions/MolarEntropy.json @@ -13,8 +13,8 @@ { "SingularName": "JoulePerMoleKelvin", "PluralName": "JoulesPerMoleKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/MolarMass.json b/Common/UnitDefinitions/MolarMass.json index 55dad2b8e6..c2546641cc 100644 --- a/Common/UnitDefinitions/MolarMass.json +++ b/Common/UnitDefinitions/MolarMass.json @@ -10,8 +10,8 @@ { "SingularName": "GramPerMole", "PluralName": "GramsPerMole", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -27,8 +27,8 @@ { "SingularName": "PoundPerMole", "PluralName": "PoundsPerMole", - "FromUnitToBaseFunc": "x*0.45359237", - "FromBaseToUnitFunc": "x/0.45359237", + "FromUnitToBaseFunc": "{x}*0.45359237", + "FromBaseToUnitFunc": "{x}/0.45359237", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Molarity.json b/Common/UnitDefinitions/Molarity.json index 60e1689ba8..0c35b47a72 100644 --- a/Common/UnitDefinitions/Molarity.json +++ b/Common/UnitDefinitions/Molarity.json @@ -15,8 +15,8 @@ "L": "Meter", "N": "Mole" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [], "Localization": [ { @@ -32,8 +32,8 @@ "L": "Decimeter", "N": "Mole" }, - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Permeability.json b/Common/UnitDefinitions/Permeability.json index 8b2db18f37..111039cbb9 100644 --- a/Common/UnitDefinitions/Permeability.json +++ b/Common/UnitDefinitions/Permeability.json @@ -13,8 +13,8 @@ { "SingularName": "HenryPerMeter", "PluralName": "HenriesPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Permittivity.json b/Common/UnitDefinitions/Permittivity.json index 337b5624ad..f34db2eb89 100644 --- a/Common/UnitDefinitions/Permittivity.json +++ b/Common/UnitDefinitions/Permittivity.json @@ -13,8 +13,8 @@ { "SingularName": "FaradPerMeter", "PluralName": "FaradsPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Power.json b/Common/UnitDefinitions/Power.json index 32081d4e6a..b50ede0a71 100644 --- a/Common/UnitDefinitions/Power.json +++ b/Common/UnitDefinitions/Power.json @@ -12,8 +12,8 @@ { "SingularName": "Watt", "PluralName": "Watts", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera", "Peta" ], "Localization": [ { @@ -25,8 +25,8 @@ { "SingularName": "MechanicalHorsepower", "PluralName": "MechanicalHorsepower", - "FromUnitToBaseFunc": "x*745.69m", - "FromBaseToUnitFunc": "x/745.69m", + "FromUnitToBaseFunc": "{x}*745.69m", + "FromBaseToUnitFunc": "{x}/745.69m", "Localization": [ { "Culture": "en-US", @@ -37,8 +37,8 @@ { "SingularName": "MetricHorsepower", "PluralName": "MetricHorsepower", - "FromUnitToBaseFunc": "x*735.49875m", - "FromBaseToUnitFunc": "x/735.49875m", + "FromUnitToBaseFunc": "{x}*735.49875m", + "FromBaseToUnitFunc": "{x}/735.49875m", "Localization": [ { "Culture": "en-US", @@ -49,8 +49,8 @@ { "SingularName": "ElectricalHorsepower", "PluralName": "ElectricalHorsepower", - "FromUnitToBaseFunc": "x*746m", - "FromBaseToUnitFunc": "x/746m", + "FromUnitToBaseFunc": "{x}*746m", + "FromBaseToUnitFunc": "{x}/746m", "Localization": [ { "Culture": "en-US", @@ -61,8 +61,8 @@ { "SingularName": "BoilerHorsepower", "PluralName": "BoilerHorsepower", - "FromUnitToBaseFunc": "x*9812.5m", - "FromBaseToUnitFunc": "x/9812.5m", + "FromUnitToBaseFunc": "{x}*9812.5m", + "FromBaseToUnitFunc": "{x}/9812.5m", "Localization": [ { "Culture": "en-US", @@ -73,8 +73,8 @@ { "SingularName": "HydraulicHorsepower", "PluralName": "HydraulicHorsepower", - "FromUnitToBaseFunc": "x*745.69988145m", - "FromBaseToUnitFunc": "x/745.69988145m", + "FromUnitToBaseFunc": "{x}*745.69988145m", + "FromBaseToUnitFunc": "{x}/745.69988145m", "Localization": [ { "Culture": "en-US", @@ -85,8 +85,8 @@ { "SingularName": "BritishThermalUnitPerHour", "PluralName": "BritishThermalUnitsPerHour", - "FromUnitToBaseFunc": "x*0.293071m", - "FromBaseToUnitFunc": "x/0.293071m", + "FromUnitToBaseFunc": "{x}*0.293071m", + "FromBaseToUnitFunc": "{x}/0.293071m", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -98,8 +98,8 @@ { "SingularName": "JoulePerHour", "PluralName": "JoulesPerHour", - "FromUnitToBaseFunc": "x/3600m", - "FromBaseToUnitFunc": "x*3600m", + "FromUnitToBaseFunc": "{x}/3600m", + "FromBaseToUnitFunc": "{x}*3600m", "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ], "Localization": [ { diff --git a/Common/UnitDefinitions/PowerDensity.json b/Common/UnitDefinitions/PowerDensity.json index 5fa791ba0d..aff022cf35 100644 --- a/Common/UnitDefinitions/PowerDensity.json +++ b/Common/UnitDefinitions/PowerDensity.json @@ -16,8 +16,8 @@ "M": "Kilogram", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -29,8 +29,8 @@ { "SingularName": "WattPerCubicInch", "PluralName": "WattsPerCubicInch", - "FromUnitToBaseFunc": "x*6.102374409473228e4", - "FromBaseToUnitFunc": "x/6.102374409473228e4", + "FromUnitToBaseFunc": "{x}*6.102374409473228e4", + "FromBaseToUnitFunc": "{x}/6.102374409473228e4", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -42,8 +42,8 @@ { "SingularName": "WattPerCubicFoot", "PluralName": "WattsPerCubicFoot", - "FromUnitToBaseFunc": "x*3.531466672148859e1", - "FromBaseToUnitFunc": "x/3.531466672148859e1", + "FromUnitToBaseFunc": "{x}*3.531466672148859e1", + "FromBaseToUnitFunc": "{x}/3.531466672148859e1", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -55,8 +55,8 @@ { "SingularName": "WattPerLiter", "PluralName": "WattsPerLiter", - "FromUnitToBaseFunc": "x*1.0e3", - "FromBaseToUnitFunc": "x/1.0e3", + "FromUnitToBaseFunc": "{x}*1.0e3", + "FromBaseToUnitFunc": "{x}/1.0e3", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Deci", "Deca", "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { diff --git a/Common/UnitDefinitions/PowerRatio.json b/Common/UnitDefinitions/PowerRatio.json index 1c143a1dfd..84869fac2e 100644 --- a/Common/UnitDefinitions/PowerRatio.json +++ b/Common/UnitDefinitions/PowerRatio.json @@ -8,8 +8,8 @@ { "SingularName": "DecibelWatt", "PluralName": "DecibelWatts", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -20,8 +20,8 @@ { "SingularName": "DecibelMilliwatt", "PluralName": "DecibelMilliwatts", - "FromUnitToBaseFunc": "x - 30", - "FromBaseToUnitFunc": "x + 30", + "FromUnitToBaseFunc": "{x} - 30", + "FromBaseToUnitFunc": "{x} + 30", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Pressure.json b/Common/UnitDefinitions/Pressure.json index fe497438cc..b6cb98542f 100644 --- a/Common/UnitDefinitions/Pressure.json +++ b/Common/UnitDefinitions/Pressure.json @@ -16,8 +16,8 @@ "M": "Kilogram", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Micro", "Milli", "Deca", "Hecto", "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -33,8 +33,8 @@ { "SingularName": "Atmosphere", "PluralName": "Atmospheres", - "FromUnitToBaseFunc": "x*1.01325*1e5", - "FromBaseToUnitFunc": "x/(1.01325*1e5)", + "FromUnitToBaseFunc": "{x}*1.01325*1e5", + "FromBaseToUnitFunc": "{x}/(1.01325*1e5)", "Localization": [ { "Culture": "en-US", @@ -49,8 +49,8 @@ { "SingularName": "Bar", "PluralName": "Bars", - "FromUnitToBaseFunc": "x*1e5", - "FromBaseToUnitFunc": "x/1e5", + "FromUnitToBaseFunc": "{x}*1e5", + "FromBaseToUnitFunc": "{x}/1e5", "Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega" ], "Localization": [ { @@ -66,8 +66,8 @@ { "SingularName": "KilogramForcePerSquareMeter", "PluralName": "KilogramsForcePerSquareMeter", - "FromUnitToBaseFunc": "x*9.80665019960652", - "FromBaseToUnitFunc": "x*0.101971619222242", + "FromUnitToBaseFunc": "{x}*9.80665019960652", + "FromBaseToUnitFunc": "{x}*0.101971619222242", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ { "SingularName": "KilogramForcePerSquareCentimeter", "PluralName": "KilogramsForcePerSquareCentimeter", - "FromUnitToBaseFunc": "x*9.80665e4", - "FromBaseToUnitFunc": "x/9.80665e4", + "FromUnitToBaseFunc": "{x}*9.80665e4", + "FromBaseToUnitFunc": "{x}/9.80665e4", "Localization": [ { "Culture": "en-US", @@ -98,8 +98,8 @@ { "SingularName": "KilogramForcePerSquareMillimeter", "PluralName": "KilogramsForcePerSquareMillimeter", - "FromUnitToBaseFunc": "x*9.80665e6", - "FromBaseToUnitFunc": "x/9.80665e6", + "FromUnitToBaseFunc": "{x}*9.80665e6", + "FromBaseToUnitFunc": "{x}/9.80665e6", "Localization": [ { "Culture": "en-US", @@ -114,8 +114,8 @@ { "SingularName": "NewtonPerSquareMeter", "PluralName": "NewtonsPerSquareMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -131,8 +131,8 @@ { "SingularName": "NewtonPerSquareCentimeter", "PluralName": "NewtonsPerSquareCentimeter", - "FromUnitToBaseFunc": "x*1e4", - "FromBaseToUnitFunc": "x/1e4", + "FromUnitToBaseFunc": "{x}*1e4", + "FromBaseToUnitFunc": "{x}/1e4", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -148,8 +148,8 @@ { "SingularName": "NewtonPerSquareMillimeter", "PluralName": "NewtonsPerSquareMillimeter", - "FromUnitToBaseFunc": "x*1e6", - "FromBaseToUnitFunc": "x/1e6", + "FromUnitToBaseFunc": "{x}*1e6", + "FromBaseToUnitFunc": "{x}/1e6", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -165,8 +165,8 @@ { "SingularName": "TechnicalAtmosphere", "PluralName": "TechnicalAtmospheres", - "FromUnitToBaseFunc": "x*9.80680592331*1e4", - "FromBaseToUnitFunc": "x/(9.80680592331*1e4)", + "FromUnitToBaseFunc": "{x}*9.80680592331*1e4", + "FromBaseToUnitFunc": "{x}/(9.80680592331*1e4)", "Localization": [ { "Culture": "en-US", @@ -181,8 +181,8 @@ { "SingularName": "Torr", "PluralName": "Torrs", - "FromUnitToBaseFunc": "x*1.3332266752*1e2", - "FromBaseToUnitFunc": "x/(1.3332266752*1e2)", + "FromUnitToBaseFunc": "{x}*1.3332266752*1e2", + "FromBaseToUnitFunc": "{x}/(1.3332266752*1e2)", "Localization": [ { "Culture": "en-US", @@ -197,8 +197,8 @@ { "SingularName": "PoundForcePerSquareInch", "PluralName": "PoundsForcePerSquareInch", - "FromUnitToBaseFunc": "x*6.894757293168361e3", - "FromBaseToUnitFunc": "x/6.894757293168361e3", + "FromUnitToBaseFunc": "{x}*6.894757293168361e3", + "FromBaseToUnitFunc": "{x}/6.894757293168361e3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -216,8 +216,8 @@ { "SingularName": "PoundForcePerSquareFoot", "PluralName": "PoundsForcePerSquareFoot", - "FromUnitToBaseFunc": "x*4.788025898033584e1", - "FromBaseToUnitFunc": "x/4.788025898033584e1", + "FromUnitToBaseFunc": "{x}*4.788025898033584e1", + "FromBaseToUnitFunc": "{x}/4.788025898033584e1", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -230,8 +230,8 @@ { "SingularName": "TonneForcePerSquareMillimeter", "PluralName": "TonnesForcePerSquareMillimeter", - "FromUnitToBaseFunc": "x*9.80665e9", - "FromBaseToUnitFunc": "x/9.80665e9", + "FromUnitToBaseFunc": "{x}*9.80665e9", + "FromBaseToUnitFunc": "{x}/9.80665e9", "Localization": [ { "Culture": "en-US", @@ -242,8 +242,8 @@ { "SingularName": "TonneForcePerSquareMeter", "PluralName": "TonnesForcePerSquareMeter", - "FromUnitToBaseFunc": "x*9.80665e3", - "FromBaseToUnitFunc": "x/9.80665e3", + "FromUnitToBaseFunc": "{x}*9.80665e3", + "FromBaseToUnitFunc": "{x}/9.80665e3", "Localization": [ { "Culture": "en-US", @@ -254,8 +254,8 @@ { "SingularName": "MeterOfHead", "PluralName": "MetersOfHead", - "FromUnitToBaseFunc": "x*9804.139432", - "FromBaseToUnitFunc": "x*0.0001019977334", + "FromUnitToBaseFunc": "{x}*9804.139432", + "FromBaseToUnitFunc": "{x}*0.0001019977334", "Localization": [ { "Culture": "en-US", @@ -266,8 +266,8 @@ { "SingularName": "TonneForcePerSquareCentimeter", "PluralName": "TonnesForcePerSquareCentimeter", - "FromUnitToBaseFunc": "x*9.80665e7", - "FromBaseToUnitFunc": "x/9.80665e7", + "FromUnitToBaseFunc": "{x}*9.80665e7", + "FromBaseToUnitFunc": "{x}/9.80665e7", "Localization": [ { "Culture": "en-US", @@ -278,8 +278,8 @@ { "SingularName": "FootOfHead", "PluralName": "FeetOfHead", - "FromUnitToBaseFunc": "x*2989.0669", - "FromBaseToUnitFunc": "x*0.000334552565551", + "FromUnitToBaseFunc": "{x}*2989.0669", + "FromBaseToUnitFunc": "{x}*0.000334552565551", "Localization": [ { "Culture": "en-US", @@ -290,8 +290,8 @@ { "SingularName": "MillimeterOfMercury", "PluralName": "MillimetersOfMercury", - "FromUnitToBaseFunc": "x/7.50061561302643e-3", - "FromBaseToUnitFunc": "x*7.50061561302643e-3", + "FromUnitToBaseFunc": "{x}/7.50061561302643e-3", + "FromBaseToUnitFunc": "{x}*7.50061561302643e-3", "Localization": [ { "Culture": "en-US", @@ -306,8 +306,8 @@ { "SingularName": "InchOfMercury", "PluralName": "InchesOfMercury", - "FromUnitToBaseFunc": "x/2.95299830714159e-4", - "FromBaseToUnitFunc": "x*2.95299830714159e-4", + "FromUnitToBaseFunc": "{x}/2.95299830714159e-4", + "FromBaseToUnitFunc": "{x}*2.95299830714159e-4", "Localization": [ { "Culture": "en-US", @@ -318,8 +318,8 @@ { "SingularName": "DynePerSquareCentimeter", "PluralName": "DynesPerSquareCentimeter", - "FromUnitToBaseFunc": "x*1.0e-1", - "FromBaseToUnitFunc": "x/1.0e-1", + "FromUnitToBaseFunc": "{x}*1.0e-1", + "FromBaseToUnitFunc": "{x}/1.0e-1", "Localization": [ { "Culture": "en-US", @@ -330,8 +330,8 @@ { "SingularName": "PoundPerInchSecondSquared", "PluralName": "PoundsPerInchSecondSquared", - "FromUnitToBaseFunc": "x*1.785796732283465e1", - "FromBaseToUnitFunc": "x/1.785796732283465e1", + "FromUnitToBaseFunc": "{x}*1.785796732283465e1", + "FromBaseToUnitFunc": "{x}/1.785796732283465e1", "Localization": [ { "Culture": "en-US", @@ -342,8 +342,8 @@ { "SingularName": "MillimeterOfWaterColumn", "PluralName": "MillimeterOfWaterColumn", - "FromUnitToBaseFunc": "x*9.806650000000272e0", - "FromBaseToUnitFunc": "x/9.806650000000272e0", + "FromUnitToBaseFunc": "{x}*9.806650000000272e0", + "FromBaseToUnitFunc": "{x}/9.806650000000272e0", "Localization": [ { "Culture": "en-US", @@ -354,8 +354,8 @@ { "SingularName": "InchOfWaterColumn", "PluralName": "InchesOfWaterColumn", - "FromUnitToBaseFunc": "x*249.08890833333", - "FromBaseToUnitFunc": "x/249.08890833333", + "FromUnitToBaseFunc": "{x}*249.08890833333", + "FromBaseToUnitFunc": "{x}/249.08890833333", "Localization": [ { "Culture": "en-US", @@ -366,8 +366,8 @@ { "SingularName": "MeterOfElevation", "PluralName": "MetersOfElevation", - "FromUnitToBaseFunc": "Math.Pow(1.0 - (x / 44307.69396), 5.2553026003237266401799415610351) * 101325.0", - "FromBaseToUnitFunc": "(1.0 - Math.Pow(x / 101325.0, 0.190284)) * 44307.69396", + "FromUnitToBaseFunc": "Math.Pow(1.0 - ({x} / 44307.69396), 5.2553026003237266401799415610351) * 101325.0", + "FromBaseToUnitFunc": "(1.0 - Math.Pow({x} / 101325.0, 0.190284)) * 44307.69396", "Localization": [ { "Culture": "en-US", @@ -378,8 +378,8 @@ { "SingularName": "FootOfElevation", "PluralName": "FeetOfElevation", - "FromUnitToBaseFunc": "Math.Pow(1.0 - (x / 145366.45), 5.2553026003237266401799415610351) * 101325.0", - "FromBaseToUnitFunc": "(1.0 - Math.Pow(x / 101325.0, 0.190284)) * 145366.45", + "FromUnitToBaseFunc": "Math.Pow(1.0 - ({x} / 145366.45), 5.2553026003237266401799415610351) * 101325.0", + "FromBaseToUnitFunc": "(1.0 - Math.Pow({x} / 101325.0, 0.190284)) * 145366.45", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/PressureChangeRate.json b/Common/UnitDefinitions/PressureChangeRate.json index 8ee5ec4d4c..c60d93dca4 100644 --- a/Common/UnitDefinitions/PressureChangeRate.json +++ b/Common/UnitDefinitions/PressureChangeRate.json @@ -11,8 +11,8 @@ { "SingularName": "PascalPerSecond", "PluralName": "PascalsPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -28,8 +28,8 @@ { "SingularName": "PascalPerMinute", "PluralName": "PascalsPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -45,8 +45,8 @@ { "SingularName": "MillimeterOfMercuryPerSecond", "PluralName": "MillimetersOfMercuryPerSecond", - "FromUnitToBaseFunc": "x*133.322", - "FromBaseToUnitFunc": "x/133.322", + "FromUnitToBaseFunc": "{x}*133.322", + "FromBaseToUnitFunc": "{x}/133.322", "Localization": [ { "Culture": "en-US", @@ -61,8 +61,8 @@ { "SingularName": "AtmospherePerSecond", "PluralName": "AtmospheresPerSecond", - "FromUnitToBaseFunc": "x * 1.01325*1e5", - "FromBaseToUnitFunc": "x / (1.01325*1e5)", + "FromUnitToBaseFunc": "{x} * 1.01325*1e5", + "FromBaseToUnitFunc": "{x} / (1.01325*1e5)", "Localization": [ { "Culture": "en-US", @@ -77,8 +77,8 @@ { "SingularName": "PoundForcePerSquareInchPerSecond", "PluralName": "PoundsForcePerSquareInchPerSecond", - "FromUnitToBaseFunc": "x*6.894757293168361e3", - "FromBaseToUnitFunc": "x/6.894757293168361e3", + "FromUnitToBaseFunc": "{x}*6.894757293168361e3", + "FromBaseToUnitFunc": "{x}/6.894757293168361e3", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -96,8 +96,8 @@ { "SingularName": "PoundForcePerSquareInchPerMinute", "PluralName": "PoundsForcePerSquareInchPerMinute", - "FromUnitToBaseFunc": "x*6.894757293168361e3/60", - "FromBaseToUnitFunc": "x/6.894757293168361e3*60", + "FromUnitToBaseFunc": "{x}*6.894757293168361e3/60", + "FromBaseToUnitFunc": "{x}/6.894757293168361e3*60", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/Ratio.json b/Common/UnitDefinitions/Ratio.json index 3254d3e8f8..ce0b75c461 100644 --- a/Common/UnitDefinitions/Ratio.json +++ b/Common/UnitDefinitions/Ratio.json @@ -6,8 +6,8 @@ { "SingularName": "DecimalFraction", "PluralName": "DecimalFractions", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -18,8 +18,8 @@ { "SingularName": "Percent", "PluralName": "Percent", - "FromUnitToBaseFunc": "x/1e2", - "FromBaseToUnitFunc": "x*1e2", + "FromUnitToBaseFunc": "{x}/1e2", + "FromBaseToUnitFunc": "{x}*1e2", "Localization": [ { "Culture": "en-US", @@ -30,8 +30,8 @@ { "SingularName": "PartPerThousand", "PluralName": "PartsPerThousand", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ { "SingularName": "PartPerMillion", "PluralName": "PartsPerMillion", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -54,8 +54,8 @@ { "SingularName": "PartPerBillion", "PluralName": "PartsPerBillion", - "FromUnitToBaseFunc": "x/1e9", - "FromBaseToUnitFunc": "x*1e9", + "FromUnitToBaseFunc": "{x}/1e9", + "FromBaseToUnitFunc": "{x}*1e9", "Localization": [ { "Culture": "en-US", @@ -66,8 +66,8 @@ { "SingularName": "PartPerTrillion", "PluralName": "PartsPerTrillion", - "FromUnitToBaseFunc": "x/1e12", - "FromBaseToUnitFunc": "x*1e12", + "FromUnitToBaseFunc": "{x}/1e12", + "FromBaseToUnitFunc": "{x}*1e12", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RatioChangeRate.json b/Common/UnitDefinitions/RatioChangeRate.json index 20f246c6f2..7731a1bc9f 100644 --- a/Common/UnitDefinitions/RatioChangeRate.json +++ b/Common/UnitDefinitions/RatioChangeRate.json @@ -7,8 +7,8 @@ { "SingularName": "PercentPerSecond", "PluralName": "PercentsPerSecond", - "FromUnitToBaseFunc": "x/1e2", - "FromBaseToUnitFunc": "x*1e2", + "FromUnitToBaseFunc": "{x}/1e2", + "FromBaseToUnitFunc": "{x}*1e2", "Localization": [ { "Culture": "en-US", @@ -19,8 +19,8 @@ { "SingularName": "DecimalFractionPerSecond", "PluralName": "DecimalFractionsPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ReactiveEnergy.json b/Common/UnitDefinitions/ReactiveEnergy.json index bb07b95432..0c34565899 100644 --- a/Common/UnitDefinitions/ReactiveEnergy.json +++ b/Common/UnitDefinitions/ReactiveEnergy.json @@ -11,8 +11,8 @@ { "SingularName": "VoltampereReactiveHour", "PluralName": "VoltampereReactiveHours", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ReactivePower.json b/Common/UnitDefinitions/ReactivePower.json index 16ed7d341d..48d36a1099 100644 --- a/Common/UnitDefinitions/ReactivePower.json +++ b/Common/UnitDefinitions/ReactivePower.json @@ -11,8 +11,8 @@ { "SingularName": "VoltampereReactive", "PluralName": "VoltamperesReactive", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega", "Giga" ], "Localization": [ { diff --git a/Common/UnitDefinitions/ReciprocalArea.json b/Common/UnitDefinitions/ReciprocalArea.json index 99be49adfe..58cf98637e 100644 --- a/Common/UnitDefinitions/ReciprocalArea.json +++ b/Common/UnitDefinitions/ReciprocalArea.json @@ -10,8 +10,8 @@ { "SingularName": "InverseSquareMeter", "PluralName": "InverseSquareMeters", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -22,8 +22,8 @@ { "SingularName": "InverseSquareKilometer", "PluralName": "InverseSquareKilometers", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -34,8 +34,8 @@ { "SingularName": "InverseSquareDecimeter", "PluralName": "InverseSquareDecimeters", - "FromUnitToBaseFunc": "x/1e-2", - "FromBaseToUnitFunc": "x*1e-2", + "FromUnitToBaseFunc": "{x}/1e-2", + "FromBaseToUnitFunc": "{x}*1e-2", "Localization": [ { "Culture": "en-US", @@ -46,8 +46,8 @@ { "SingularName": "InverseSquareCentimeter", "PluralName": "InverseSquareCentimeters", - "FromUnitToBaseFunc": "x/1e-4", - "FromBaseToUnitFunc": "x*1e-4", + "FromUnitToBaseFunc": "{x}/1e-4", + "FromBaseToUnitFunc": "{x}*1e-4", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ { "SingularName": "InverseSquareMillimeter", "PluralName": "InverseSquareMillimeters", - "FromUnitToBaseFunc": "x/1e-6", - "FromBaseToUnitFunc": "x*1e-6", + "FromUnitToBaseFunc": "{x}/1e-6", + "FromBaseToUnitFunc": "{x}*1e-6", "Localization": [ { "Culture": "en-US", @@ -70,8 +70,8 @@ { "SingularName": "InverseSquareMicrometer", "PluralName": "InverseSquareMicrometers", - "FromUnitToBaseFunc": "x/1e-12", - "FromBaseToUnitFunc": "x*1e-12", + "FromUnitToBaseFunc": "{x}/1e-12", + "FromBaseToUnitFunc": "{x}*1e-12", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ { "SingularName": "InverseSquareMile", "PluralName": "InverseSquareMiles", - "FromUnitToBaseFunc": "x/2.59e6", - "FromBaseToUnitFunc": "x*2.59e6", + "FromUnitToBaseFunc": "{x}/2.59e6", + "FromBaseToUnitFunc": "{x}*2.59e6", "Localization": [ { "Culture": "en-US", @@ -94,8 +94,8 @@ { "SingularName": "InverseSquareYard", "PluralName": "InverseSquareYards", - "FromUnitToBaseFunc": "x/0.836127", - "FromBaseToUnitFunc": "x*0.836127", + "FromUnitToBaseFunc": "{x}/0.836127", + "FromBaseToUnitFunc": "{x}*0.836127", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "InverseSquareFoot", "PluralName": "InverseSquareFeet", - "FromUnitToBaseFunc": "x/0.092903", - "FromBaseToUnitFunc": "x*0.092903", + "FromUnitToBaseFunc": "{x}/0.092903", + "FromBaseToUnitFunc": "{x}*0.092903", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ { "SingularName": "InverseUsSurveySquareFoot", "PluralName": "InverseUsSurveySquareFeet", - "FromUnitToBaseFunc": "x/0.09290341161", - "FromBaseToUnitFunc": "x*0.09290341161", + "FromUnitToBaseFunc": "{x}/0.09290341161", + "FromBaseToUnitFunc": "{x}*0.09290341161", "Localization": [ { "Culture": "en-US", @@ -130,8 +130,8 @@ { "SingularName": "InverseSquareInch", "PluralName": "InverseSquareInches", - "FromUnitToBaseFunc": "x/0.00064516", - "FromBaseToUnitFunc": "x*0.00064516", + "FromUnitToBaseFunc": "{x}/0.00064516", + "FromBaseToUnitFunc": "{x}*0.00064516", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ReciprocalLength.json b/Common/UnitDefinitions/ReciprocalLength.json index 175cbfd729..a4c286fd35 100644 --- a/Common/UnitDefinitions/ReciprocalLength.json +++ b/Common/UnitDefinitions/ReciprocalLength.json @@ -10,8 +10,8 @@ { "SingularName": "InverseMeter", "PluralName": "InverseMeters", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -22,8 +22,8 @@ { "SingularName": "InverseCentimeter", "PluralName": "InverseCentimeters", - "FromUnitToBaseFunc": "x*1e2", - "FromBaseToUnitFunc": "x/1e2", + "FromUnitToBaseFunc": "{x}*1e2", + "FromBaseToUnitFunc": "{x}/1e2", "Localization": [ { "Culture": "en-US", @@ -34,8 +34,8 @@ { "SingularName": "InverseMillimeter", "PluralName": "InverseMillimeters", - "FromUnitToBaseFunc": "x*1e3", - "FromBaseToUnitFunc": "x/1e3", + "FromUnitToBaseFunc": "{x}*1e3", + "FromBaseToUnitFunc": "{x}/1e3", "Localization": [ { "Culture": "en-US", @@ -46,8 +46,8 @@ { "SingularName": "InverseMile", "PluralName": "InverseMiles", - "FromUnitToBaseFunc": "x/1609.34", - "FromBaseToUnitFunc": "x*1609.34", + "FromUnitToBaseFunc": "{x}/1609.34", + "FromBaseToUnitFunc": "{x}*1609.34", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ { "SingularName": "InverseYard", "PluralName": "InverseYards", - "FromUnitToBaseFunc": "x/0.9144", - "FromBaseToUnitFunc": "x*0.9144", + "FromUnitToBaseFunc": "{x}/0.9144", + "FromBaseToUnitFunc": "{x}*0.9144", "Localization": [ { "Culture": "en-US", @@ -70,8 +70,8 @@ { "SingularName": "InverseFoot", "PluralName": "InverseFeet", - "FromUnitToBaseFunc": "x/0.3048", - "FromBaseToUnitFunc": "x*0.3048", + "FromUnitToBaseFunc": "{x}/0.3048", + "FromBaseToUnitFunc": "{x}*0.3048", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ { "SingularName": "InverseUsSurveyFoot", "PluralName": "InverseUsSurveyFeet", - "FromUnitToBaseFunc": "x*3937/1200", - "FromBaseToUnitFunc": "x*1200/3937", + "FromUnitToBaseFunc": "{x}*3937/1200", + "FromBaseToUnitFunc": "{x}*1200/3937", "Localization": [ { "Culture": "en-US", @@ -94,8 +94,8 @@ { "SingularName": "InverseInch", "PluralName": "InverseInches", - "FromUnitToBaseFunc": "x/2.54e-2", - "FromBaseToUnitFunc": "x*2.54e-2", + "FromUnitToBaseFunc": "{x}/2.54e-2", + "FromBaseToUnitFunc": "{x}*2.54e-2", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "InverseMil", "PluralName": "InverseMils", - "FromUnitToBaseFunc": "x/2.54e-5", - "FromBaseToUnitFunc": "x*2.54e-5", + "FromUnitToBaseFunc": "{x}/2.54e-5", + "FromBaseToUnitFunc": "{x}*2.54e-5", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ { "SingularName": "InverseMicroinch", "PluralName": "InverseMicroinches", - "FromUnitToBaseFunc": "x/2.54e-8", - "FromBaseToUnitFunc": "x*2.54e-8", + "FromUnitToBaseFunc": "{x}/2.54e-8", + "FromBaseToUnitFunc": "{x}*2.54e-8", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RelativeHumidity.json b/Common/UnitDefinitions/RelativeHumidity.json index 8b977ba00a..57a5951359 100644 --- a/Common/UnitDefinitions/RelativeHumidity.json +++ b/Common/UnitDefinitions/RelativeHumidity.json @@ -6,8 +6,8 @@ { "SingularName": "Percent", "PluralName": "Percent", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RotationalAcceleration.json b/Common/UnitDefinitions/RotationalAcceleration.json index a73705d3e4..45537d7097 100644 --- a/Common/UnitDefinitions/RotationalAcceleration.json +++ b/Common/UnitDefinitions/RotationalAcceleration.json @@ -9,8 +9,8 @@ { "SingularName": "RadianPerSecondSquared", "PluralName": "RadiansPerSecondSquared", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -21,8 +21,8 @@ { "SingularName": "DegreePerSecondSquared", "PluralName": "DegreesPerSecondSquared", - "FromUnitToBaseFunc": "(Math.PI/180)*x", - "FromBaseToUnitFunc": "(180/Math.PI)*x", + "FromUnitToBaseFunc": "(Math.PI/180)*{x}", + "FromBaseToUnitFunc": "(180/Math.PI)*{x}", "Localization": [ { "Culture": "en-US", @@ -33,8 +33,8 @@ { "SingularName": "RevolutionPerMinutePerSecond", "PluralName": "RevolutionsPerMinutePerSecond", - "FromUnitToBaseFunc": "((2*Math.PI)/60)*x", - "FromBaseToUnitFunc": "(60/(2*Math.PI))*x", + "FromUnitToBaseFunc": "((2*Math.PI)/60)*{x}", + "FromBaseToUnitFunc": "(60/(2*Math.PI))*{x}", "Localization": [ { "Culture": "en-US", @@ -45,8 +45,8 @@ { "SingularName": "RevolutionPerSecondSquared", "PluralName": "RevolutionsPerSecondSquared", - "FromUnitToBaseFunc": "(2*Math.PI)*x", - "FromBaseToUnitFunc": "(1/(2*Math.PI))*x", + "FromUnitToBaseFunc": "(2*Math.PI)*{x}", + "FromBaseToUnitFunc": "(1/(2*Math.PI))*{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RotationalSpeed.json b/Common/UnitDefinitions/RotationalSpeed.json index dfb22c16c4..e098927c3a 100644 --- a/Common/UnitDefinitions/RotationalSpeed.json +++ b/Common/UnitDefinitions/RotationalSpeed.json @@ -9,8 +9,8 @@ { "SingularName": "RadianPerSecond", "PluralName": "RadiansPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "DegreePerSecond", "PluralName": "DegreesPerSecond", - "FromUnitToBaseFunc": "(Math.PI/180)*x", - "FromBaseToUnitFunc": "(180/Math.PI)*x", + "FromUnitToBaseFunc": "(Math.PI/180)*{x}", + "FromBaseToUnitFunc": "(180/Math.PI)*{x}", "Prefixes": [ "Nano", "Micro", "Milli" ], "Localization": [ { @@ -43,8 +43,8 @@ { "SingularName": "DegreePerMinute", "PluralName": "DegreesPerMinute", - "FromUnitToBaseFunc": "(Math.PI/(180*60))*x", - "FromBaseToUnitFunc": "(180*60/Math.PI)*x", + "FromUnitToBaseFunc": "(Math.PI/(180*60))*{x}", + "FromBaseToUnitFunc": "(180*60/Math.PI)*{x}", "Localization": [ { "Culture": "en-US", @@ -55,8 +55,8 @@ { "SingularName": "RevolutionPerSecond", "PluralName": "RevolutionsPerSecond", - "FromUnitToBaseFunc": "x*6.2831853072", - "FromBaseToUnitFunc": "x/6.2831853072", + "FromUnitToBaseFunc": "{x}*6.2831853072", + "FromBaseToUnitFunc": "{x}/6.2831853072", "Localization": [ { "Culture": "en-US", @@ -71,8 +71,8 @@ { "SingularName": "RevolutionPerMinute", "PluralName": "RevolutionsPerMinute", - "FromUnitToBaseFunc": "(x*6.2831853072)/60", - "FromBaseToUnitFunc": "(x/6.2831853072)*60", + "FromUnitToBaseFunc": "({x}*6.2831853072)/60", + "FromBaseToUnitFunc": "({x}/6.2831853072)*60", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RotationalStiffness.json b/Common/UnitDefinitions/RotationalStiffness.json index 8f0d7fa6b2..9151f600ca 100644 --- a/Common/UnitDefinitions/RotationalStiffness.json +++ b/Common/UnitDefinitions/RotationalStiffness.json @@ -11,8 +11,8 @@ { "SingularName": "NewtonMeterPerRadian", "PluralName": "NewtonMetersPerRadian", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "PoundForceFootPerDegrees", "PluralName": "PoundForceFeetPerDegrees", - "FromUnitToBaseFunc": "x*77.6826", - "FromBaseToUnitFunc": "x/77.6826", + "FromUnitToBaseFunc": "{x}*77.6826", + "FromBaseToUnitFunc": "{x}/77.6826", "Localization": [ { "Culture": "en-US", @@ -36,8 +36,8 @@ { "SingularName": "KilopoundForceFootPerDegrees", "PluralName": "KilopoundForceFeetPerDegrees", - "FromUnitToBaseFunc": "x*77682.6", - "FromBaseToUnitFunc": "x/77682.6", + "FromUnitToBaseFunc": "{x}*77682.6", + "FromBaseToUnitFunc": "{x}/77682.6", "Localization": [ { "Culture": "en-US", @@ -48,8 +48,8 @@ { "SingularName": "NewtonMillimeterPerDegree", "PluralName": "NewtonMillimetersPerDegree", - "FromUnitToBaseFunc": "x*180/Math.PI*0.001", - "FromBaseToUnitFunc": "x/180*Math.PI*1000", + "FromUnitToBaseFunc": "{x}*180/Math.PI*0.001", + "FromBaseToUnitFunc": "{x}/180*Math.PI*1000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -61,8 +61,8 @@ { "SingularName": "NewtonMeterPerDegree", "PluralName": "NewtonMetersPerDegree", - "FromUnitToBaseFunc": "x*(180/Math.PI)", - "FromBaseToUnitFunc": "x/(180/Math.PI)", + "FromUnitToBaseFunc": "{x}*(180/Math.PI)", + "FromBaseToUnitFunc": "{x}/(180/Math.PI)", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -74,8 +74,8 @@ { "SingularName": "NewtonMillimeterPerRadian", "PluralName": "NewtonMillimetersPerRadian", - "FromUnitToBaseFunc": "x*0.001", - "FromBaseToUnitFunc": "x*1000", + "FromUnitToBaseFunc": "{x}*0.001", + "FromBaseToUnitFunc": "{x}*1000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Kilo", "Mega" ], "Localization": [ { @@ -87,8 +87,8 @@ { "SingularName": "PoundForceFeetPerRadian", "PluralName": "PoundForceFeetPerRadian", - "FromUnitToBaseFunc": "x*1.3558179483314", - "FromBaseToUnitFunc": "x/1.3558179483314", + "FromUnitToBaseFunc": "{x}*1.3558179483314", + "FromBaseToUnitFunc": "{x}/1.3558179483314", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/RotationalStiffnessPerLength.json b/Common/UnitDefinitions/RotationalStiffnessPerLength.json index f4030876d7..145751d5c9 100644 --- a/Common/UnitDefinitions/RotationalStiffnessPerLength.json +++ b/Common/UnitDefinitions/RotationalStiffnessPerLength.json @@ -11,8 +11,8 @@ { "SingularName": "NewtonMeterPerRadianPerMeter", "PluralName": "NewtonMetersPerRadianPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "PoundForceFootPerDegreesPerFoot", "PluralName": "PoundForceFeetPerDegreesPerFeet", - "FromUnitToBaseFunc": "x*254.864324570", - "FromBaseToUnitFunc": "x/254.864324570", + "FromUnitToBaseFunc": "{x}*254.864324570", + "FromBaseToUnitFunc": "{x}/254.864324570", "Localization": [ { "Culture": "en-US", @@ -36,8 +36,8 @@ { "SingularName": "KilopoundForceFootPerDegreesPerFoot", "PluralName": "KilopoundForceFeetPerDegreesPerFeet", - "FromUnitToBaseFunc": "x*254864.324570", - "FromBaseToUnitFunc": "x/254864.324570", + "FromUnitToBaseFunc": "{x}*254864.324570", + "FromBaseToUnitFunc": "{x}/254864.324570", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Scalar.json b/Common/UnitDefinitions/Scalar.json index d9a8d6aa90..1e954a5470 100644 --- a/Common/UnitDefinitions/Scalar.json +++ b/Common/UnitDefinitions/Scalar.json @@ -6,8 +6,8 @@ { "SingularName": "Amount", "PluralName": "Amount", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/SolidAngle.json b/Common/UnitDefinitions/SolidAngle.json index 6f37c56698..a4cc4d7ac6 100644 --- a/Common/UnitDefinitions/SolidAngle.json +++ b/Common/UnitDefinitions/SolidAngle.json @@ -7,8 +7,8 @@ { "SingularName": "Steradian", "PluralName": "Steradians", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/SpecificEnergy.json b/Common/UnitDefinitions/SpecificEnergy.json index d93d929737..56f0fbbbc4 100644 --- a/Common/UnitDefinitions/SpecificEnergy.json +++ b/Common/UnitDefinitions/SpecificEnergy.json @@ -11,8 +11,8 @@ { "SingularName": "JoulePerKilogram", "PluralName": "JoulesPerKilogram", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "CaloriePerGram", "PluralName": "CaloriesPerGram", - "FromUnitToBaseFunc": "x*4.184e3", - "FromBaseToUnitFunc": "x/4.184e3", + "FromUnitToBaseFunc": "{x}*4.184e3", + "FromBaseToUnitFunc": "{x}/4.184e3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "WattHourPerKilogram", "PluralName": "WattHoursPerKilogram", - "FromUnitToBaseFunc": "x*3.6e3", - "FromBaseToUnitFunc": "x/3.6e3", + "FromUnitToBaseFunc": "{x}*3.6e3", + "FromBaseToUnitFunc": "{x}/3.6e3", "Prefixes": [ "Kilo", "Mega", "Giga" ], "Localization": [ { @@ -50,8 +50,8 @@ { "SingularName": "WattDayPerKilogram", "PluralName": "WattDaysPerKilogram", - "FromUnitToBaseFunc": "x*(24*3.6e3)", - "FromBaseToUnitFunc": "x/(24*3.6e3)", + "FromUnitToBaseFunc": "{x}*(24*3.6e3)", + "FromBaseToUnitFunc": "{x}/(24*3.6e3)", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -63,8 +63,8 @@ { "SingularName": "WattDayPerTonne", "PluralName": "WattDaysPerTonne", - "FromUnitToBaseFunc": "x*((24*3.6e3)/1e3)", - "FromBaseToUnitFunc": "x/((24*3.6e3)/1e3)", + "FromUnitToBaseFunc": "{x}*((24*3.6e3)/1e3)", + "FromBaseToUnitFunc": "{x}/((24*3.6e3)/1e3)", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -76,8 +76,8 @@ { "SingularName": "WattDayPerShortTon", "PluralName": "WattDaysPerShortTon", - "FromUnitToBaseFunc": "x*((24*3.6e3)/9.0718474e2)", - "FromBaseToUnitFunc": "x/((24*3.6e3)/9.0718474e2)", + "FromUnitToBaseFunc": "{x}*((24*3.6e3)/9.0718474e2)", + "FromBaseToUnitFunc": "{x}/((24*3.6e3)/9.0718474e2)", "Prefixes": [ "Kilo", "Mega", "Giga", "Tera" ], "Localization": [ { @@ -89,8 +89,8 @@ { "SingularName": "BtuPerPound", "PluralName": "BtuPerPound", - "FromUnitToBaseFunc": "x*2326.000075362", - "FromBaseToUnitFunc": "x/2326.000075362", + "FromUnitToBaseFunc": "{x}*2326.000075362", + "FromBaseToUnitFunc": "{x}/2326.000075362", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/SpecificEntropy.json b/Common/UnitDefinitions/SpecificEntropy.json index 81e11abffd..5fcae6c006 100644 --- a/Common/UnitDefinitions/SpecificEntropy.json +++ b/Common/UnitDefinitions/SpecificEntropy.json @@ -11,8 +11,8 @@ { "SingularName": "JoulePerKilogramKelvin", "PluralName": "JoulesPerKilogramKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "JoulePerKilogramDegreeCelsius", "PluralName": "JoulesPerKilogramDegreeCelsius", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "CaloriePerGramKelvin", "PluralName": "CaloriesPerGramKelvin", - "FromUnitToBaseFunc": "x*4.184e3", - "FromBaseToUnitFunc": "x/4.184e3", + "FromUnitToBaseFunc": "{x}*4.184e3", + "FromBaseToUnitFunc": "{x}/4.184e3", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -50,8 +50,8 @@ { "SingularName": "BtuPerPoundFahrenheit", "PluralName": "BtusPerPoundFahrenheit", - "FromUnitToBaseFunc": "x * 4.1868e3", - "FromBaseToUnitFunc": "x / 4.1868e3", + "FromUnitToBaseFunc": "{x} * 4.1868e3", + "FromBaseToUnitFunc": "{x} / 4.1868e3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/SpecificFuelConsumption.json b/Common/UnitDefinitions/SpecificFuelConsumption.json index 3174720cc0..4a73c391ef 100644 --- a/Common/UnitDefinitions/SpecificFuelConsumption.json +++ b/Common/UnitDefinitions/SpecificFuelConsumption.json @@ -7,8 +7,8 @@ { "SingularName": "PoundMassPerPoundForceHour", "PluralName": "PoundsMassPerPoundForceHour", - "FromUnitToBaseFunc": "x*28.33", - "FromBaseToUnitFunc": "x/28.33", + "FromUnitToBaseFunc": "{x}*28.33", + "FromBaseToUnitFunc": "{x}/28.33", "Localization": [ { "Culture": "en-US", @@ -19,8 +19,8 @@ { "SingularName": "KilogramPerKilogramForceHour", "PluralName": "KilogramsPerKilogramForceHour", - "FromUnitToBaseFunc": "x*28.33", - "FromBaseToUnitFunc": "x/28.33", + "FromUnitToBaseFunc": "{x}*28.33", + "FromBaseToUnitFunc": "{x}/28.33", "Localization": [ { "Culture": "en-US", @@ -31,8 +31,8 @@ { "SingularName": "GramPerKiloNewtonSecond", "PluralName": "GramsPerKiloNewtonSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo" ], "Localization": [ { diff --git a/Common/UnitDefinitions/SpecificVolume.json b/Common/UnitDefinitions/SpecificVolume.json index fbcc235a92..ddd7372021 100644 --- a/Common/UnitDefinitions/SpecificVolume.json +++ b/Common/UnitDefinitions/SpecificVolume.json @@ -10,8 +10,8 @@ { "SingularName": "CubicMeterPerKilogram", "PluralName": "CubicMetersPerKilogram", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "CubicFootPerPound", "PluralName": "CubicFeetPerPound", - "FromUnitToBaseFunc": "x/16.01846353", - "FromBaseToUnitFunc": "x*16.01846353", + "FromUnitToBaseFunc": "{x}/16.01846353", + "FromBaseToUnitFunc": "{x}*16.01846353", "Prefixes": [], "Localization": [ { diff --git a/Common/UnitDefinitions/SpecificWeight.json b/Common/UnitDefinitions/SpecificWeight.json index 5ffecf2923..a29ce5fa3b 100644 --- a/Common/UnitDefinitions/SpecificWeight.json +++ b/Common/UnitDefinitions/SpecificWeight.json @@ -12,8 +12,8 @@ { "SingularName": "NewtonPerCubicMillimeter", "PluralName": "NewtonsPerCubicMillimeter", - "FromUnitToBaseFunc": "x*1000000000", - "FromBaseToUnitFunc": "x*0.000000001", + "FromUnitToBaseFunc": "{x}*1000000000", + "FromBaseToUnitFunc": "{x}*0.000000001", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -25,8 +25,8 @@ { "SingularName": "NewtonPerCubicCentimeter", "PluralName": "NewtonsPerCubicCentimeter", - "FromUnitToBaseFunc": "x*1000000", - "FromBaseToUnitFunc": "x*0.000001", + "FromUnitToBaseFunc": "{x}*1000000", + "FromBaseToUnitFunc": "{x}*0.000001", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -38,8 +38,8 @@ { "SingularName": "NewtonPerCubicMeter", "PluralName": "NewtonsPerCubicMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -51,8 +51,8 @@ { "SingularName": "KilogramForcePerCubicMillimeter", "PluralName": "KilogramsForcePerCubicMillimeter", - "FromUnitToBaseFunc": "x*9.80665e9", - "FromBaseToUnitFunc": "x/9.80665e9", + "FromUnitToBaseFunc": "{x}*9.80665e9", + "FromBaseToUnitFunc": "{x}/9.80665e9", "Localization": [ { "Culture": "en-US", @@ -63,8 +63,8 @@ { "SingularName": "KilogramForcePerCubicCentimeter", "PluralName": "KilogramsForcePerCubicCentimeter", - "FromUnitToBaseFunc": "x*9.80665e6", - "FromBaseToUnitFunc": "x/9.80665e6", + "FromUnitToBaseFunc": "{x}*9.80665e6", + "FromBaseToUnitFunc": "{x}/9.80665e6", "Localization": [ { "Culture": "en-US", @@ -75,8 +75,8 @@ { "SingularName": "KilogramForcePerCubicMeter", "PluralName": "KilogramsForcePerCubicMeter", - "FromUnitToBaseFunc": "x*9.80665", - "FromBaseToUnitFunc": "x/9.80665", + "FromUnitToBaseFunc": "{x}*9.80665", + "FromBaseToUnitFunc": "{x}/9.80665", "Localization": [ { "Culture": "en-US", @@ -87,8 +87,8 @@ { "SingularName": "PoundForcePerCubicInch", "PluralName": "PoundsForcePerCubicInch", - "FromUnitToBaseFunc": "x*2.714471375263134e5", - "FromBaseToUnitFunc": "x/2.714471375263134e5", + "FromUnitToBaseFunc": "{x}*2.714471375263134e5", + "FromBaseToUnitFunc": "{x}/2.714471375263134e5", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -101,8 +101,8 @@ { "SingularName": "PoundForcePerCubicFoot", "PluralName": "PoundsForcePerCubicFoot", - "FromUnitToBaseFunc": "x*1.570874638462462e2", - "FromBaseToUnitFunc": "x/1.570874638462462e2", + "FromUnitToBaseFunc": "{x}*1.570874638462462e2", + "FromBaseToUnitFunc": "{x}/1.570874638462462e2", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -115,8 +115,8 @@ { "SingularName": "TonneForcePerCubicMillimeter", "PluralName": "TonnesForcePerCubicMillimeter", - "FromUnitToBaseFunc": "x*9.80665e12", - "FromBaseToUnitFunc": "x/9.80665e12", + "FromUnitToBaseFunc": "{x}*9.80665e12", + "FromBaseToUnitFunc": "{x}/9.80665e12", "Localization": [ { "Culture": "en-US", @@ -127,8 +127,8 @@ { "SingularName": "TonneForcePerCubicCentimeter", "PluralName": "TonnesForcePerCubicCentimeter", - "FromUnitToBaseFunc": "x*9.80665e9", - "FromBaseToUnitFunc": "x/9.80665e9", + "FromUnitToBaseFunc": "{x}*9.80665e9", + "FromBaseToUnitFunc": "{x}/9.80665e9", "Localization": [ { "Culture": "en-US", @@ -139,8 +139,8 @@ { "SingularName": "TonneForcePerCubicMeter", "PluralName": "TonnesForcePerCubicMeter", - "FromUnitToBaseFunc": "x*9.80665e3", - "FromBaseToUnitFunc": "x/9.80665e3", + "FromUnitToBaseFunc": "{x}*9.80665e3", + "FromBaseToUnitFunc": "{x}/9.80665e3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Speed.json b/Common/UnitDefinitions/Speed.json index c055010980..d0455b5ae7 100644 --- a/Common/UnitDefinitions/Speed.json +++ b/Common/UnitDefinitions/Speed.json @@ -14,8 +14,8 @@ "L": "Meter", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -35,8 +35,8 @@ "L": "Meter", "T": "Minute" }, - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -56,8 +56,8 @@ "L": "Meter", "T": "Hour" }, - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Prefixes": [ "Milli", "Centi", "Kilo" ], "Localization": [ { @@ -77,8 +77,8 @@ "L": "Foot", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.3048", - "FromBaseToUnitFunc": "x/0.3048", + "FromUnitToBaseFunc": "{x}*0.3048", + "FromBaseToUnitFunc": "{x}/0.3048", "Localization": [ { "Culture": "en-US", @@ -97,8 +97,8 @@ "L": "Foot", "T": "Minute" }, - "FromUnitToBaseFunc": "x*0.3048/60", - "FromBaseToUnitFunc": "x/0.3048*60", + "FromUnitToBaseFunc": "{x}*0.3048/60", + "FromBaseToUnitFunc": "{x}/0.3048*60", "Localization": [ { "Culture": "en-US", @@ -117,8 +117,8 @@ "L": "Foot", "T": "Hour" }, - "FromUnitToBaseFunc": "x*0.3048/3600", - "FromBaseToUnitFunc": "x/0.3048*3600", + "FromUnitToBaseFunc": "{x}*0.3048/3600", + "FromBaseToUnitFunc": "{x}/0.3048*3600", "Localization": [ { "Culture": "en-US", @@ -137,8 +137,8 @@ "L": "UsSurveyFoot", "T": "Second" }, - "FromUnitToBaseFunc": "x*1200/3937", - "FromBaseToUnitFunc": "x*3937/1200", + "FromUnitToBaseFunc": "{x}*1200/3937", + "FromBaseToUnitFunc": "{x}*3937/1200", "Localization": [ { "Culture": "en-US", @@ -153,8 +153,8 @@ "L": "UsSurveyFoot", "T": "Minute" }, - "FromUnitToBaseFunc": "(x*1200/3937)/60", - "FromBaseToUnitFunc": "(x*3937/1200)*60", + "FromUnitToBaseFunc": "({x}*1200/3937)/60", + "FromBaseToUnitFunc": "({x}*3937/1200)*60", "Localization": [ { "Culture": "en-US", @@ -169,8 +169,8 @@ "L": "UsSurveyFoot", "T": "Hour" }, - "FromUnitToBaseFunc": "(x*1200/3937)/3600", - "FromBaseToUnitFunc": "(x*3937/1200)*3600", + "FromUnitToBaseFunc": "({x}*1200/3937)/3600", + "FromBaseToUnitFunc": "({x}*3937/1200)*3600", "Localization": [ { "Culture": "en-US", @@ -185,8 +185,8 @@ "L": "Inch", "T": "Second" }, - "FromUnitToBaseFunc": "x*2.54e-2", - "FromBaseToUnitFunc": "x/2.54e-2", + "FromUnitToBaseFunc": "{x}*2.54e-2", + "FromBaseToUnitFunc": "{x}/2.54e-2", "Localization": [ { "Culture": "en-US", @@ -201,8 +201,8 @@ "L": "Inch", "T": "Minute" }, - "FromUnitToBaseFunc": "(x/60)*2.54e-2", - "FromBaseToUnitFunc": "(x/2.54e-2)*60", + "FromUnitToBaseFunc": "({x}/60)*2.54e-2", + "FromBaseToUnitFunc": "({x}/2.54e-2)*60", "Localization": [ { "Culture": "en-US", @@ -217,8 +217,8 @@ "L": "Inch", "T": "Hour" }, - "FromUnitToBaseFunc": "(x/3600)*2.54e-2", - "FromBaseToUnitFunc": "(x/2.54e-2)*3600", + "FromUnitToBaseFunc": "({x}/3600)*2.54e-2", + "FromBaseToUnitFunc": "({x}/2.54e-2)*3600", "Localization": [ { "Culture": "en-US", @@ -233,8 +233,8 @@ "L": "Yard", "T": "Second" }, - "FromUnitToBaseFunc": "x*0.9144", - "FromBaseToUnitFunc": "x/0.9144", + "FromUnitToBaseFunc": "{x}*0.9144", + "FromBaseToUnitFunc": "{x}/0.9144", "Localization": [ { "Culture": "en-US", @@ -249,8 +249,8 @@ "L": "Yard", "T": "Minute" }, - "FromUnitToBaseFunc": "x*0.9144/60", - "FromBaseToUnitFunc": "x/0.9144*60", + "FromUnitToBaseFunc": "{x}*0.9144/60", + "FromBaseToUnitFunc": "{x}/0.9144*60", "Localization": [ { "Culture": "en-US", @@ -265,8 +265,8 @@ "L": "Yard", "T": "Hour" }, - "FromUnitToBaseFunc": "x*0.9144/3600", - "FromBaseToUnitFunc": "x/0.9144*3600", + "FromUnitToBaseFunc": "{x}*0.9144/3600", + "FromBaseToUnitFunc": "{x}/0.9144*3600", "Localization": [ { "Culture": "en-US", @@ -281,8 +281,8 @@ "L": "NauticalMile", "T": "Hour" }, - "FromUnitToBaseFunc": "x*0.514444", - "FromBaseToUnitFunc": "x/0.514444", + "FromUnitToBaseFunc": "{x}*0.514444", + "FromBaseToUnitFunc": "{x}/0.514444", "Localization": [ { "Culture": "en-US", @@ -301,8 +301,8 @@ "L": "Mile", "T": "Hour" }, - "FromUnitToBaseFunc": "x*0.44704", - "FromBaseToUnitFunc": "x/0.44704", + "FromUnitToBaseFunc": "{x}*0.44704", + "FromBaseToUnitFunc": "{x}/0.44704", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/StandardVolumeFlow.json b/Common/UnitDefinitions/StandardVolumeFlow.json index bb214e2a09..21fbe5e95a 100644 --- a/Common/UnitDefinitions/StandardVolumeFlow.json +++ b/Common/UnitDefinitions/StandardVolumeFlow.json @@ -10,8 +10,8 @@ { "SingularName": "StandardCubicMeterPerSecond", "PluralName": "StandardCubicMetersPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -22,8 +22,8 @@ { "SingularName": "StandardCubicMeterPerMinute", "PluralName": "StandardCubicMetersPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", @@ -34,8 +34,8 @@ { "SingularName": "StandardCubicMeterPerHour", "PluralName": "StandardCubicMetersPerHour", - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Localization": [ { "Culture": "en-US", @@ -46,8 +46,8 @@ { "SingularName": "StandardCubicMeterPerDay", "PluralName": "StandardCubicMetersPerDay", - "FromUnitToBaseFunc": "x/86400", - "FromBaseToUnitFunc": "x*86400", + "FromUnitToBaseFunc": "{x}/86400", + "FromBaseToUnitFunc": "{x}*86400", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ { "SingularName": "StandardCubicCentimeterPerMinute", "PluralName": "StandardCubicCentimetersPerMinute", - "FromUnitToBaseFunc": "x/6e7", - "FromBaseToUnitFunc": "x*6e7", + "FromUnitToBaseFunc": "{x}/6e7", + "FromBaseToUnitFunc": "{x}*6e7", "Localization": [ { "Culture": "en-US", @@ -70,8 +70,8 @@ { "SingularName": "StandardLiterPerMinute", "PluralName": "StandardLitersPerMinute", - "FromUnitToBaseFunc": "x/60000", - "FromBaseToUnitFunc": "x*60000", + "FromUnitToBaseFunc": "{x}/60000", + "FromBaseToUnitFunc": "{x}*60000", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ { "SingularName": "StandardCubicFootPerSecond", "PluralName": "StandardCubicFeetPerSecond", - "FromUnitToBaseFunc": "x/35.314666721", - "FromBaseToUnitFunc": "x*35.314666721", + "FromUnitToBaseFunc": "{x}/35.314666721", + "FromBaseToUnitFunc": "{x}*35.314666721", "Localization": [ { "Culture": "en-US", @@ -94,8 +94,8 @@ { "SingularName": "StandardCubicFootPerMinute", "PluralName": "StandardCubicFeetPerMinute", - "FromUnitToBaseFunc": "x/2118.88000326", - "FromBaseToUnitFunc": "x*2118.88000326", + "FromUnitToBaseFunc": "{x}/2118.88000326", + "FromBaseToUnitFunc": "{x}*2118.88000326", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "StandardCubicFootPerHour", "PluralName": "StandardCubicFeetPerHour", - "FromUnitToBaseFunc": "x*7.8657907199999087346816086183876e-6", - "FromBaseToUnitFunc": "x/7.8657907199999087346816086183876e-6", + "FromUnitToBaseFunc": "{x}*7.8657907199999087346816086183876e-6", + "FromBaseToUnitFunc": "{x}/7.8657907199999087346816086183876e-6", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Temperature.json b/Common/UnitDefinitions/Temperature.json index 9b8422f891..1ba304654e 100644 --- a/Common/UnitDefinitions/Temperature.json +++ b/Common/UnitDefinitions/Temperature.json @@ -13,8 +13,8 @@ "BaseUnits": { "Θ": "Kelvin" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -28,8 +28,8 @@ "BaseUnits": { "Θ": "DegreeCelsius" }, - "FromUnitToBaseFunc": "x + 273.15", - "FromBaseToUnitFunc": "x - 273.15", + "FromUnitToBaseFunc": "{x} + 273.15", + "FromBaseToUnitFunc": "{x} - 273.15", "Localization": [ { "Culture": "en-US", @@ -43,8 +43,8 @@ "BaseUnits": { "Θ": "DegreeCelsius" }, - "FromUnitToBaseFunc": "x / 1000 + 273.15", - "FromBaseToUnitFunc": "(x - 273.15) * 1000", + "FromUnitToBaseFunc": "{x} / 1000 + 273.15", + "FromBaseToUnitFunc": "({x} - 273.15) * 1000", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ "BaseUnits": { "Θ": "DegreeDelisle" }, - "FromUnitToBaseFunc": "x*-2/3 + 373.15", - "FromBaseToUnitFunc": "(x - 373.15)*-3/2", + "FromUnitToBaseFunc": "{x}*-2/3 + 373.15", + "FromBaseToUnitFunc": "({x} - 373.15)*-3/2", "Localization": [ { "Culture": "en-US", @@ -73,8 +73,8 @@ "BaseUnits": { "Θ": "DegreeFahrenheit" }, - "FromUnitToBaseFunc": "x*5/9 + 459.67*5/9", - "FromBaseToUnitFunc": "(x - 459.67*5/9)*9/5", + "FromUnitToBaseFunc": "{x}*5/9 + 459.67*5/9", + "FromBaseToUnitFunc": "({x} - 459.67*5/9)*9/5", "Localization": [ { "Culture": "en-US", @@ -88,8 +88,8 @@ "BaseUnits": { "Θ": "DegreeNewton" }, - "FromUnitToBaseFunc": "x*100/33 + 273.15", - "FromBaseToUnitFunc": "(x - 273.15)*33/100", + "FromUnitToBaseFunc": "{x}*100/33 + 273.15", + "FromBaseToUnitFunc": "({x} - 273.15)*33/100", "Localization": [ { "Culture": "en-US", @@ -103,8 +103,8 @@ "BaseUnits": { "Θ": "DegreeRankine" }, - "FromUnitToBaseFunc": "x*5/9", - "FromBaseToUnitFunc": "x*9/5", + "FromUnitToBaseFunc": "{x}*5/9", + "FromBaseToUnitFunc": "{x}*9/5", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ "BaseUnits": { "Θ": "DegreeReaumur" }, - "FromUnitToBaseFunc": "x*5/4 + 273.15", - "FromBaseToUnitFunc": "(x - 273.15)*4/5", + "FromUnitToBaseFunc": "{x}*5/4 + 273.15", + "FromBaseToUnitFunc": "({x} - 273.15)*4/5", "Localization": [ { "Culture": "en-US", @@ -133,8 +133,8 @@ "BaseUnits": { "Θ": "DegreeRoemer" }, - "FromUnitToBaseFunc": "x*40/21 + 273.15 - 7.5*40d/21", - "FromBaseToUnitFunc": "(x - (273.15 - 7.5*40d/21))*21/40", + "FromUnitToBaseFunc": "{x}*40/21 + 273.15 - 7.5*40d/21", + "FromBaseToUnitFunc": "({x} - (273.15 - 7.5*40d/21))*21/40", "Localization": [ { "Culture": "en-US", @@ -145,8 +145,8 @@ { "SingularName": "SolarTemperature", "PluralName": "SolarTemperatures", - "FromUnitToBaseFunc": "x * 5778", - "FromBaseToUnitFunc": "x / 5778", + "FromUnitToBaseFunc": "{x} * 5778", + "FromBaseToUnitFunc": "{x} / 5778", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/TemperatureChangeRate.json b/Common/UnitDefinitions/TemperatureChangeRate.json index 0f4b70cde6..5005fb79f0 100644 --- a/Common/UnitDefinitions/TemperatureChangeRate.json +++ b/Common/UnitDefinitions/TemperatureChangeRate.json @@ -10,8 +10,8 @@ { "SingularName": "DegreeCelsiusPerSecond", "PluralName": "DegreesCelsiusPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo" ], "Localization": [ { @@ -23,8 +23,8 @@ { "SingularName": "DegreeCelsiusPerMinute", "PluralName": "DegreesCelsiusPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/TemperatureDelta.json b/Common/UnitDefinitions/TemperatureDelta.json index 764065c0ed..ef4c8c00bc 100644 --- a/Common/UnitDefinitions/TemperatureDelta.json +++ b/Common/UnitDefinitions/TemperatureDelta.json @@ -9,8 +9,8 @@ { "SingularName": "Kelvin", "PluralName": "Kelvins", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -21,8 +21,8 @@ { "SingularName": "DegreeCelsius", "PluralName": "DegreesCelsius", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Milli" ], "Localization": [ { @@ -35,8 +35,8 @@ { "SingularName": "DegreeDelisle", "PluralName": "DegreesDelisle", - "FromUnitToBaseFunc": "x*-2/3", - "FromBaseToUnitFunc": "x*-3/2", + "FromUnitToBaseFunc": "{x}*-2/3", + "FromBaseToUnitFunc": "{x}*-3/2", "Localization": [ { "Culture": "en-US", @@ -47,8 +47,8 @@ { "SingularName": "DegreeFahrenheit", "PluralName": "DegreesFahrenheit", - "FromUnitToBaseFunc": "x*5/9", - "FromBaseToUnitFunc": "x*9/5", + "FromUnitToBaseFunc": "{x}*5/9", + "FromBaseToUnitFunc": "{x}*9/5", "Localization": [ { "Culture": "en-US", @@ -59,8 +59,8 @@ { "SingularName": "DegreeNewton", "PluralName": "DegreesNewton", - "FromUnitToBaseFunc": "x*100/33", - "FromBaseToUnitFunc": "x*33/100", + "FromUnitToBaseFunc": "{x}*100/33", + "FromBaseToUnitFunc": "{x}*33/100", "Localization": [ { "Culture": "en-US", @@ -71,8 +71,8 @@ { "SingularName": "DegreeRankine", "PluralName": "DegreesRankine", - "FromUnitToBaseFunc": "x*5/9", - "FromBaseToUnitFunc": "x*9/5", + "FromUnitToBaseFunc": "{x}*5/9", + "FromBaseToUnitFunc": "{x}*9/5", "Localization": [ { "Culture": "en-US", @@ -83,8 +83,8 @@ { "SingularName": "DegreeReaumur", "PluralName": "DegreesReaumur", - "FromUnitToBaseFunc": "x*5/4", - "FromBaseToUnitFunc": "x*4/5", + "FromUnitToBaseFunc": "{x}*5/4", + "FromBaseToUnitFunc": "{x}*4/5", "Localization": [ { "Culture": "en-US", @@ -95,8 +95,8 @@ { "SingularName": "DegreeRoemer", "PluralName": "DegreesRoemer", - "FromUnitToBaseFunc": "x*40/21", - "FromBaseToUnitFunc": "x*21/40", + "FromUnitToBaseFunc": "{x}*40/21", + "FromBaseToUnitFunc": "{x}*21/40", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/TemperatureGradient.json b/Common/UnitDefinitions/TemperatureGradient.json index fd3f89d3ee..efd786e04a 100644 --- a/Common/UnitDefinitions/TemperatureGradient.json +++ b/Common/UnitDefinitions/TemperatureGradient.json @@ -14,8 +14,8 @@ "L": "Meter", "Θ": "Kelvin" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -30,8 +30,8 @@ "L": "Meter", "Θ": "DegreeCelsius" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -46,8 +46,8 @@ "L": "Foot", "Θ": "DegreeFahrenheit" }, - "FromUnitToBaseFunc": "(x / 0.3048) * 5/9", - "FromBaseToUnitFunc": "(x * 0.3048) * 9/5", + "FromUnitToBaseFunc": "({x} / 0.3048) * 5/9", + "FromBaseToUnitFunc": "({x} * 0.3048) * 9/5", "Localization": [ { "Culture": "en-US", @@ -62,8 +62,8 @@ "L": "Kilometer", "Θ": "DegreeCelsius" }, - "FromUnitToBaseFunc": "x / 1e3", - "FromBaseToUnitFunc": "x * 1e3", + "FromUnitToBaseFunc": "{x} / 1e3", + "FromBaseToUnitFunc": "{x} * 1e3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ThermalConductivity.json b/Common/UnitDefinitions/ThermalConductivity.json index 89a5011fe7..ace6dc3a06 100644 --- a/Common/UnitDefinitions/ThermalConductivity.json +++ b/Common/UnitDefinitions/ThermalConductivity.json @@ -13,8 +13,8 @@ { "SingularName": "WattPerMeterKelvin", "PluralName": "WattsPerMeterKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -25,8 +25,8 @@ { "SingularName": "BtuPerHourFootFahrenheit", "PluralName": "BtusPerHourFootFahrenheit", - "FromUnitToBaseFunc": "x*1.73073467", - "FromBaseToUnitFunc": "x/1.73073467", + "FromUnitToBaseFunc": "{x}*1.73073467", + "FromBaseToUnitFunc": "{x}/1.73073467", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/ThermalResistance.json b/Common/UnitDefinitions/ThermalResistance.json index 1668b1716b..ce81beb26e 100644 --- a/Common/UnitDefinitions/ThermalResistance.json +++ b/Common/UnitDefinitions/ThermalResistance.json @@ -11,8 +11,8 @@ { "SingularName": "SquareMeterKelvinPerKilowatt", "PluralName": "SquareMeterKelvinsPerKilowatt", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -23,8 +23,8 @@ { "SingularName": "SquareMeterKelvinPerWatt", "PluralName": "SquareMeterKelvinsPerWatt", - "FromUnitToBaseFunc": "x*1000", - "FromBaseToUnitFunc": "x/1000", + "FromUnitToBaseFunc": "{x}*1000", + "FromBaseToUnitFunc": "{x}/1000", "Localization": [ { "Culture": "en-US", @@ -35,8 +35,8 @@ { "SingularName": "SquareMeterDegreeCelsiusPerWatt", "PluralName": "SquareMeterDegreesCelsiusPerWatt", - "FromUnitToBaseFunc": "x*1000.088056074108", - "FromBaseToUnitFunc": "x/1000.088056074108", + "FromUnitToBaseFunc": "{x}*1000.088056074108", + "FromBaseToUnitFunc": "{x}/1000.088056074108", "Localization": [ { "Culture": "en-US", @@ -47,8 +47,8 @@ { "SingularName": "SquareCentimeterKelvinPerWatt", "PluralName": "SquareCentimeterKelvinsPerWatt", - "FromUnitToBaseFunc": "x*0.0999964777570357", - "FromBaseToUnitFunc": "x/0.0999964777570357", + "FromUnitToBaseFunc": "{x}*0.0999964777570357", + "FromBaseToUnitFunc": "{x}/0.0999964777570357", "Localization": [ { "Culture": "en-US", @@ -59,8 +59,8 @@ { "SingularName": "SquareCentimeterHourDegreeCelsiusPerKilocalorie", "PluralName": "SquareCentimeterHourDegreesCelsiusPerKilocalorie", - "FromUnitToBaseFunc": "x*0.0859779507590433", - "FromBaseToUnitFunc": "x/0.0859779507590433", + "FromUnitToBaseFunc": "{x}*0.0859779507590433", + "FromBaseToUnitFunc": "{x}/0.0859779507590433", "Localization": [ { "Culture": "en-US", @@ -71,8 +71,8 @@ { "SingularName": "HourSquareFeetDegreeFahrenheitPerBtu", "PluralName": "HourSquareFeetDegreesFahrenheitPerBtu", - "FromUnitToBaseFunc": "x*176.1121482159839", - "FromBaseToUnitFunc": "x/176.1121482159839", + "FromUnitToBaseFunc": "{x}*176.1121482159839", + "FromBaseToUnitFunc": "{x}/176.1121482159839", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Torque.json b/Common/UnitDefinitions/Torque.json index 59b43c1aa2..59eca95446 100644 --- a/Common/UnitDefinitions/Torque.json +++ b/Common/UnitDefinitions/Torque.json @@ -11,8 +11,8 @@ { "SingularName": "NewtonMillimeter", "PluralName": "NewtonMillimeters", - "FromUnitToBaseFunc": "x*0.001", - "FromBaseToUnitFunc": "x*1000", + "FromUnitToBaseFunc": "{x}*0.001", + "FromBaseToUnitFunc": "{x}*1000", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "NewtonCentimeter", "PluralName": "NewtonCentimeters", - "FromUnitToBaseFunc": "x*0.01", - "FromBaseToUnitFunc": "x*100", + "FromUnitToBaseFunc": "{x}*0.01", + "FromBaseToUnitFunc": "{x}*100", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "NewtonMeter", "PluralName": "NewtonMeters", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -54,8 +54,8 @@ { "SingularName": "PoundalFoot", "PluralName": "PoundalFeet", - "FromUnitToBaseFunc": "x*4.21401100938048e-2", - "FromBaseToUnitFunc": "x/4.21401100938048e-2", + "FromUnitToBaseFunc": "{x}*4.21401100938048e-2", + "FromBaseToUnitFunc": "{x}/4.21401100938048e-2", "Localization": [ { "Culture": "en-US", @@ -66,8 +66,8 @@ { "SingularName": "PoundForceInch", "PluralName": "PoundForceInches", - "FromUnitToBaseFunc": "x*1.129848290276167e-1", - "FromBaseToUnitFunc": "x/1.129848290276167e-1", + "FromUnitToBaseFunc": "{x}*1.129848290276167e-1", + "FromBaseToUnitFunc": "{x}/1.129848290276167e-1", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -80,8 +80,8 @@ { "SingularName": "PoundForceFoot", "PluralName": "PoundForceFeet", - "FromUnitToBaseFunc": "x*1.3558179483314", - "FromBaseToUnitFunc": "x/1.3558179483314", + "FromUnitToBaseFunc": "{x}*1.3558179483314", + "FromBaseToUnitFunc": "{x}/1.3558179483314", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -94,8 +94,8 @@ { "SingularName": "GramForceMillimeter", "PluralName": "GramForceMillimeters", - "FromUnitToBaseFunc": "x*9.80665e-6", - "FromBaseToUnitFunc": "x/9.80665e-6", + "FromUnitToBaseFunc": "{x}*9.80665e-6", + "FromBaseToUnitFunc": "{x}/9.80665e-6", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "GramForceCentimeter", "PluralName": "GramForceCentimeters", - "FromUnitToBaseFunc": "x*9.80665e-5", - "FromBaseToUnitFunc": "x/9.80665e-5", + "FromUnitToBaseFunc": "{x}*9.80665e-5", + "FromBaseToUnitFunc": "{x}/9.80665e-5", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ { "SingularName": "GramForceMeter", "PluralName": "GramForceMeters", - "FromUnitToBaseFunc": "x*9.80665e-3", - "FromBaseToUnitFunc": "x/9.80665e-3", + "FromUnitToBaseFunc": "{x}*9.80665e-3", + "FromBaseToUnitFunc": "{x}/9.80665e-3", "Localization": [ { "Culture": "en-US", @@ -130,8 +130,8 @@ { "SingularName": "KilogramForceMillimeter", "PluralName": "KilogramForceMillimeters", - "FromUnitToBaseFunc": "x*9.80665e-3", - "FromBaseToUnitFunc": "x/9.80665e-3", + "FromUnitToBaseFunc": "{x}*9.80665e-3", + "FromBaseToUnitFunc": "{x}/9.80665e-3", "Localization": [ { "Culture": "en-US", @@ -142,8 +142,8 @@ { "SingularName": "KilogramForceCentimeter", "PluralName": "KilogramForceCentimeters", - "FromUnitToBaseFunc": "x*9.80665e-2", - "FromBaseToUnitFunc": "x/9.80665e-2", + "FromUnitToBaseFunc": "{x}*9.80665e-2", + "FromBaseToUnitFunc": "{x}/9.80665e-2", "Localization": [ { "Culture": "en-US", @@ -154,8 +154,8 @@ { "SingularName": "KilogramForceMeter", "PluralName": "KilogramForceMeters", - "FromUnitToBaseFunc": "x*9.80665", - "FromBaseToUnitFunc": "x/9.80665", + "FromUnitToBaseFunc": "{x}*9.80665", + "FromBaseToUnitFunc": "{x}/9.80665", "Localization": [ { "Culture": "en-US", @@ -166,8 +166,8 @@ { "SingularName": "TonneForceMillimeter", "PluralName": "TonneForceMillimeters", - "FromUnitToBaseFunc": "x*9.80665", - "FromBaseToUnitFunc": "x/9.80665", + "FromUnitToBaseFunc": "{x}*9.80665", + "FromBaseToUnitFunc": "{x}/9.80665", "Localization": [ { "Culture": "en-US", @@ -178,8 +178,8 @@ { "SingularName": "TonneForceCentimeter", "PluralName": "TonneForceCentimeters", - "FromUnitToBaseFunc": "x*9.80665e1", - "FromBaseToUnitFunc": "x/9.80665e1", + "FromUnitToBaseFunc": "{x}*9.80665e1", + "FromBaseToUnitFunc": "{x}/9.80665e1", "Localization": [ { "Culture": "en-US", @@ -190,8 +190,8 @@ { "SingularName": "TonneForceMeter", "PluralName": "TonneForceMeters", - "FromUnitToBaseFunc": "x*9.80665e3", - "FromBaseToUnitFunc": "x/9.80665e3", + "FromUnitToBaseFunc": "{x}*9.80665e3", + "FromBaseToUnitFunc": "{x}/9.80665e3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/TorquePerLength.json b/Common/UnitDefinitions/TorquePerLength.json index 19da6fc1cd..873dd58fbf 100644 --- a/Common/UnitDefinitions/TorquePerLength.json +++ b/Common/UnitDefinitions/TorquePerLength.json @@ -11,8 +11,8 @@ { "SingularName": "NewtonMillimeterPerMeter", "PluralName": "NewtonMillimetersPerMeter", - "FromUnitToBaseFunc": "x*0.001", - "FromBaseToUnitFunc": "x*1000", + "FromUnitToBaseFunc": "{x}*0.001", + "FromBaseToUnitFunc": "{x}*1000", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -24,8 +24,8 @@ { "SingularName": "NewtonCentimeterPerMeter", "PluralName": "NewtonCentimetersPerMeter", - "FromUnitToBaseFunc": "x*0.01", - "FromBaseToUnitFunc": "x*100", + "FromUnitToBaseFunc": "{x}*0.01", + "FromBaseToUnitFunc": "{x}*100", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -37,8 +37,8 @@ { "SingularName": "NewtonMeterPerMeter", "PluralName": "NewtonMetersPerMeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -54,8 +54,8 @@ { "SingularName": "PoundForceInchPerFoot", "PluralName": "PoundForceInchesPerFoot", - "FromUnitToBaseFunc": "x*0.370685147638", - "FromBaseToUnitFunc": "x/0.370685147638", + "FromUnitToBaseFunc": "{x}*0.370685147638", + "FromBaseToUnitFunc": "{x}/0.370685147638", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -68,8 +68,8 @@ { "SingularName": "PoundForceFootPerFoot", "PluralName": "PoundForceFeetPerFoot", - "FromUnitToBaseFunc": "x*4.44822161526", - "FromBaseToUnitFunc": "x/4.44822161526", + "FromUnitToBaseFunc": "{x}*4.44822161526", + "FromBaseToUnitFunc": "{x}/4.44822161526", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -82,8 +82,8 @@ { "SingularName": "KilogramForceMillimeterPerMeter", "PluralName": "KilogramForceMillimetersPerMeter", - "FromUnitToBaseFunc": "x*0.00980665019960652", - "FromBaseToUnitFunc": "x*101.971619222242", + "FromUnitToBaseFunc": "{x}*0.00980665019960652", + "FromBaseToUnitFunc": "{x}*101.971619222242", "Localization": [ { "Culture": "en-US", @@ -94,8 +94,8 @@ { "SingularName": "KilogramForceCentimeterPerMeter", "PluralName": "KilogramForceCentimetersPerMeter", - "FromUnitToBaseFunc": "x*0.0980665019960652", - "FromBaseToUnitFunc": "x*10.1971619222242", + "FromUnitToBaseFunc": "{x}*0.0980665019960652", + "FromBaseToUnitFunc": "{x}*10.1971619222242", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "KilogramForceMeterPerMeter", "PluralName": "KilogramForceMetersPerMeter", - "FromUnitToBaseFunc": "x*9.80665019960652", - "FromBaseToUnitFunc": "x*0.101971619222242", + "FromUnitToBaseFunc": "{x}*9.80665019960652", + "FromBaseToUnitFunc": "{x}*0.101971619222242", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ { "SingularName": "TonneForceMillimeterPerMeter", "PluralName": "TonneForceMillimetersPerMeter", - "FromUnitToBaseFunc": "x*9.80665019960652", - "FromBaseToUnitFunc": "x*0.101971619222242", + "FromUnitToBaseFunc": "{x}*9.80665019960652", + "FromBaseToUnitFunc": "{x}*0.101971619222242", "Localization": [ { "Culture": "en-US", @@ -130,8 +130,8 @@ { "SingularName": "TonneForceCentimeterPerMeter", "PluralName": "TonneForceCentimetersPerMeter", - "FromUnitToBaseFunc": "x*98.0665019960652", - "FromBaseToUnitFunc": "x*0.0101971619222242", + "FromUnitToBaseFunc": "{x}*98.0665019960652", + "FromBaseToUnitFunc": "{x}*0.0101971619222242", "Localization": [ { "Culture": "en-US", @@ -142,8 +142,8 @@ { "SingularName": "TonneForceMeterPerMeter", "PluralName": "TonneForceMetersPerMeter", - "FromUnitToBaseFunc": "x*9806.65019960653", - "FromBaseToUnitFunc": "x*0.000101971619222242", + "FromUnitToBaseFunc": "{x}*9806.65019960653", + "FromBaseToUnitFunc": "{x}*0.000101971619222242", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/Turbidity.json b/Common/UnitDefinitions/Turbidity.json index 6098ac3046..3ad79b6a35 100644 --- a/Common/UnitDefinitions/Turbidity.json +++ b/Common/UnitDefinitions/Turbidity.json @@ -7,8 +7,8 @@ { "SingularName": "NTU", "PluralName": "NTU", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VitaminA.json b/Common/UnitDefinitions/VitaminA.json index 42e78ce791..852a90c551 100644 --- a/Common/UnitDefinitions/VitaminA.json +++ b/Common/UnitDefinitions/VitaminA.json @@ -6,8 +6,8 @@ { "SingularName": "InternationalUnit", "PluralName": "InternationalUnits", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [], "Localization": [ { diff --git a/Common/UnitDefinitions/Volume.json b/Common/UnitDefinitions/Volume.json index a6082eccde..711bde39d9 100644 --- a/Common/UnitDefinitions/Volume.json +++ b/Common/UnitDefinitions/Volume.json @@ -9,8 +9,8 @@ { "SingularName": "Liter", "PluralName": "Liters", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Hecto", "Kilo", "Mega" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "CubicMeter", "PluralName": "CubicMeters", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Hecto", "Kilo" ], "BaseUnits": { "L": "Meter" @@ -46,8 +46,8 @@ { "SingularName": "CubicKilometer", "PluralName": "CubicKilometers", - "FromUnitToBaseFunc": "x*1e9", - "FromBaseToUnitFunc": "x/1e9", + "FromUnitToBaseFunc": "{x}*1e9", + "FromBaseToUnitFunc": "{x}/1e9", "Localization": [ { "Culture": "en-US", @@ -65,8 +65,8 @@ "BaseUnits": { "L": "Hectometer" }, - "FromUnitToBaseFunc": "x*1e6", - "FromBaseToUnitFunc": "x/1e6", + "FromUnitToBaseFunc": "{x}*1e6", + "FromBaseToUnitFunc": "{x}/1e6", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ { "SingularName": "CubicDecimeter", "PluralName": "CubicDecimeters", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Localization": [ { "Culture": "en-US", @@ -97,8 +97,8 @@ { "SingularName": "CubicCentimeter", "PluralName": "CubicCentimeters", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -113,8 +113,8 @@ { "SingularName": "CubicMillimeter", "PluralName": "CubicMillimeters", - "FromUnitToBaseFunc": "x/1e9", - "FromBaseToUnitFunc": "x*1e9", + "FromUnitToBaseFunc": "{x}/1e9", + "FromBaseToUnitFunc": "{x}*1e9", "Localization": [ { "Culture": "en-US", @@ -129,8 +129,8 @@ { "SingularName": "CubicMicrometer", "PluralName": "CubicMicrometers", - "FromUnitToBaseFunc": "x/1e18", - "FromBaseToUnitFunc": "x*1e18", + "FromUnitToBaseFunc": "{x}/1e18", + "FromBaseToUnitFunc": "{x}*1e18", "Localization": [ { "Culture": "en-US", @@ -145,8 +145,8 @@ { "SingularName": "CubicMile", "PluralName": "CubicMiles", - "FromUnitToBaseFunc": "x*4.16818182544058e9", - "FromBaseToUnitFunc": "x/4.16818182544058e9", + "FromUnitToBaseFunc": "{x}*4.16818182544058e9", + "FromBaseToUnitFunc": "{x}/4.16818182544058e9", "Localization": [ { "Culture": "en-US", @@ -161,8 +161,8 @@ { "SingularName": "CubicYard", "PluralName": "CubicYards", - "FromUnitToBaseFunc": "x*0.764554858", - "FromBaseToUnitFunc": "x/0.764554858", + "FromUnitToBaseFunc": "{x}*0.764554858", + "FromBaseToUnitFunc": "{x}/0.764554858", "Localization": [ { "Culture": "en-US", @@ -177,8 +177,8 @@ { "SingularName": "CubicFoot", "PluralName": "CubicFeet", - "FromUnitToBaseFunc": "x*0.0283168", - "FromBaseToUnitFunc": "x/0.0283168", + "FromUnitToBaseFunc": "{x}*0.0283168", + "FromBaseToUnitFunc": "{x}/0.0283168", "Prefixes": [ "Hecto", "Kilo", "Mega" ], "Localization": [ { @@ -194,8 +194,8 @@ { "SingularName": "CubicInch", "PluralName": "CubicInches", - "FromUnitToBaseFunc": "x*1.6387*1e-5", - "FromBaseToUnitFunc": "x/(1.6387*1e-5)", + "FromUnitToBaseFunc": "{x}*1.6387*1e-5", + "FromBaseToUnitFunc": "{x}/(1.6387*1e-5)", "Localization": [ { "Culture": "en-US", @@ -210,8 +210,8 @@ { "SingularName": "ImperialGallon", "PluralName": "ImperialGallons", - "FromUnitToBaseFunc": "x*0.00454609000000181429905810072407", - "FromBaseToUnitFunc": "x/0.00454609000000181429905810072407", + "FromUnitToBaseFunc": "{x}*0.00454609000000181429905810072407", + "FromBaseToUnitFunc": "{x}/0.00454609000000181429905810072407", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -227,8 +227,8 @@ { "SingularName": "ImperialOunce", "PluralName": "ImperialOunces", - "FromUnitToBaseFunc": "x*2.8413062499962901241875439064617e-5", - "FromBaseToUnitFunc": "x/2.8413062499962901241875439064617e-5", + "FromUnitToBaseFunc": "{x}*2.8413062499962901241875439064617e-5", + "FromBaseToUnitFunc": "{x}/2.8413062499962901241875439064617e-5", "Localization": [ { "Culture": "en-US", @@ -243,8 +243,8 @@ { "SingularName": "UsGallon", "PluralName": "UsGallons", - "FromUnitToBaseFunc": "x*0.00378541", - "FromBaseToUnitFunc": "x/0.00378541", + "FromUnitToBaseFunc": "{x}*0.00378541", + "FromBaseToUnitFunc": "{x}/0.00378541", "Prefixes": [ "Deca", "Deci", "Hecto", "Kilo", "Mega" ], "Localization": [ { @@ -260,8 +260,8 @@ { "SingularName": "UsOunce", "PluralName": "UsOunces", - "FromUnitToBaseFunc": "x*2.957352956253760505068307980135e-5", - "FromBaseToUnitFunc": "x/2.957352956253760505068307980135e-5", + "FromUnitToBaseFunc": "{x}*2.957352956253760505068307980135e-5", + "FromBaseToUnitFunc": "{x}/2.957352956253760505068307980135e-5", "Localization": [ { "Culture": "en-US", @@ -276,8 +276,8 @@ { "SingularName": "UsTablespoon", "PluralName": "UsTablespoons", - "FromUnitToBaseFunc": "x*1.478676478125e-5", - "FromBaseToUnitFunc": "x/1.478676478125e-5", + "FromUnitToBaseFunc": "{x}*1.478676478125e-5", + "FromBaseToUnitFunc": "{x}/1.478676478125e-5", "Localization": [ { "Culture": "en-US", @@ -296,8 +296,8 @@ { "SingularName": "AuTablespoon", "PluralName": "AuTablespoons", - "FromUnitToBaseFunc": "x*2e-5", - "FromBaseToUnitFunc": "x/2e-5", + "FromUnitToBaseFunc": "{x}*2e-5", + "FromBaseToUnitFunc": "{x}/2e-5", "Localization": [ { "Culture": "en-US", @@ -316,8 +316,8 @@ { "SingularName": "UkTablespoon", "PluralName": "UkTablespoons", - "FromUnitToBaseFunc": "x*1.5e-5", - "FromBaseToUnitFunc": "x/1.5e-5", + "FromUnitToBaseFunc": "{x}*1.5e-5", + "FromBaseToUnitFunc": "{x}/1.5e-5", "Localization": [ { "Culture": "en-US", @@ -336,8 +336,8 @@ { "SingularName": "MetricTeaspoon", "PluralName": "MetricTeaspoons", - "FromUnitToBaseFunc": "x*0.5e-5", - "FromBaseToUnitFunc": "x/0.5e-5", + "FromUnitToBaseFunc": "{x}*0.5e-5", + "FromBaseToUnitFunc": "{x}/0.5e-5", "Localization": [ { "Culture": "en-US", @@ -356,8 +356,8 @@ { "SingularName": "UsTeaspoon", "PluralName": "UsTeaspoons", - "FromUnitToBaseFunc": "x*4.92892159375e-6", - "FromBaseToUnitFunc": "x/4.92892159375e-6", + "FromUnitToBaseFunc": "{x}*4.92892159375e-6", + "FromBaseToUnitFunc": "{x}/4.92892159375e-6", "Localization": [ { "Culture": "en-US", @@ -376,8 +376,8 @@ { "SingularName": "MetricCup", "PluralName": "MetricCups", - "FromUnitToBaseFunc": "x*0.00025", - "FromBaseToUnitFunc": "x/0.00025", + "FromUnitToBaseFunc": "{x}*0.00025", + "FromBaseToUnitFunc": "{x}/0.00025", "Localization": [ { "Culture": "en-US", @@ -388,8 +388,8 @@ { "SingularName": "UsCustomaryCup", "PluralName": "UsCustomaryCups", - "FromUnitToBaseFunc": "x*0.0002365882365", - "FromBaseToUnitFunc": "x/0.0002365882365", + "FromUnitToBaseFunc": "{x}*0.0002365882365", + "FromBaseToUnitFunc": "{x}/0.0002365882365", "Localization": [ { "Culture": "en-US", @@ -400,8 +400,8 @@ { "SingularName": "UsLegalCup", "PluralName": "UsLegalCups", - "FromUnitToBaseFunc": "x*0.00024", - "FromBaseToUnitFunc": "x/0.00024", + "FromUnitToBaseFunc": "{x}*0.00024", + "FromBaseToUnitFunc": "{x}/0.00024", "Localization": [ { "Culture": "en-US", @@ -412,8 +412,8 @@ { "SingularName": "OilBarrel", "PluralName": "OilBarrels", - "FromUnitToBaseFunc": "x*0.158987294928", - "FromBaseToUnitFunc": "x/0.158987294928", + "FromUnitToBaseFunc": "{x}*0.158987294928", + "FromBaseToUnitFunc": "{x}/0.158987294928", "Localization": [ { "Culture": "en-US", @@ -424,8 +424,8 @@ { "SingularName": "UsBeerBarrel", "PluralName": "UsBeerBarrels", - "FromUnitToBaseFunc": "x*0.1173477658", - "FromBaseToUnitFunc": "x/0.1173477658", + "FromUnitToBaseFunc": "{x}*0.1173477658", + "FromBaseToUnitFunc": "{x}/0.1173477658", "Localization": [ { "Culture": "en-US", @@ -436,8 +436,8 @@ { "SingularName": "ImperialBeerBarrel", "PluralName": "ImperialBeerBarrels", - "FromUnitToBaseFunc": "x*0.16365924", - "FromBaseToUnitFunc": "x/0.16365924", + "FromUnitToBaseFunc": "{x}*0.16365924", + "FromBaseToUnitFunc": "{x}/0.16365924", "Localization": [ { "Culture": "en-US", @@ -448,8 +448,8 @@ { "SingularName": "UsQuart", "PluralName": "UsQuarts", - "FromUnitToBaseFunc": "x*9.46352946e-4", - "FromBaseToUnitFunc": "x/9.46352946e-4", + "FromUnitToBaseFunc": "{x}*9.46352946e-4", + "FromBaseToUnitFunc": "{x}/9.46352946e-4", "Localization": [ { "Culture": "en-US", @@ -460,8 +460,8 @@ { "SingularName": "UsPint", "PluralName": "UsPints", - "FromUnitToBaseFunc": "x*4.73176473e-4", - "FromBaseToUnitFunc": "x/4.73176473e-4", + "FromUnitToBaseFunc": "{x}*4.73176473e-4", + "FromBaseToUnitFunc": "{x}/4.73176473e-4", "Localization": [ { "Culture": "en-US", @@ -472,8 +472,8 @@ { "SingularName": "AcreFoot", "PluralName": "AcreFeet", - "FromUnitToBaseFunc": "x/0.000810714", - "FromBaseToUnitFunc": "x*0.000810714", + "FromUnitToBaseFunc": "{x}/0.000810714", + "FromBaseToUnitFunc": "{x}*0.000810714", "Localization": [ { "Culture": "en-US", @@ -487,8 +487,8 @@ "BaseUnits": { "L": "Decimeter" }, - "FromUnitToBaseFunc": "x * 5.6826125e-4", - "FromBaseToUnitFunc": "x / 5.6826125e-4", + "FromUnitToBaseFunc": "{x} * 5.6826125e-4", + "FromBaseToUnitFunc": "{x} / 5.6826125e-4", "Localization": [ { "Culture": "en-US", @@ -499,8 +499,8 @@ { "SingularName": "BoardFoot", "PluralName": "BoardFeet", - "FromUnitToBaseFunc": "x*2.3597372158e-3", - "FromBaseToUnitFunc": "x/2.3597372158e-3", + "FromUnitToBaseFunc": "{x}*2.3597372158e-3", + "FromBaseToUnitFunc": "{x}/2.3597372158e-3", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumeConcentration.json b/Common/UnitDefinitions/VolumeConcentration.json index de56f8491f..9e21a12b3f 100644 --- a/Common/UnitDefinitions/VolumeConcentration.json +++ b/Common/UnitDefinitions/VolumeConcentration.json @@ -7,8 +7,8 @@ { "SingularName": "DecimalFraction", "PluralName": "DecimalFractions", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -19,8 +19,8 @@ { "SingularName": "LitersPerLiter", "PluralName": "LitersPerLiter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -32,8 +32,8 @@ { "SingularName": "LitersPerMililiter", "PluralName": "LitersPerMililiter", - "FromUnitToBaseFunc": "x/1e-3", - "FromBaseToUnitFunc": "x*1e-3", + "FromUnitToBaseFunc": "{x}/1e-3", + "FromBaseToUnitFunc": "{x}*1e-3", "Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ], "Localization": [ { @@ -45,8 +45,8 @@ { "SingularName": "Percent", "PluralName": "Percent", - "FromUnitToBaseFunc": "x/1e2", - "FromBaseToUnitFunc": "x*1e2", + "FromUnitToBaseFunc": "{x}/1e2", + "FromBaseToUnitFunc": "{x}*1e2", "Localization": [ { "Culture": "en-US", @@ -57,8 +57,8 @@ { "SingularName": "PartPerThousand", "PluralName": "PartsPerThousand", - "FromUnitToBaseFunc": "x/1e3", - "FromBaseToUnitFunc": "x*1e3", + "FromUnitToBaseFunc": "{x}/1e3", + "FromBaseToUnitFunc": "{x}*1e3", "Localization": [ { "Culture": "en-US", @@ -69,8 +69,8 @@ { "SingularName": "PartPerMillion", "PluralName": "PartsPerMillion", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -81,8 +81,8 @@ { "SingularName": "PartPerBillion", "PluralName": "PartsPerBillion", - "FromUnitToBaseFunc": "x/1e9", - "FromBaseToUnitFunc": "x*1e9", + "FromUnitToBaseFunc": "{x}/1e9", + "FromBaseToUnitFunc": "{x}*1e9", "Localization": [ { "Culture": "en-US", @@ -93,8 +93,8 @@ { "SingularName": "PartPerTrillion", "PluralName": "PartsPerTrillion", - "FromUnitToBaseFunc": "x/1e12", - "FromBaseToUnitFunc": "x*1e12", + "FromUnitToBaseFunc": "{x}/1e12", + "FromBaseToUnitFunc": "{x}*1e12", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumeFlow.json b/Common/UnitDefinitions/VolumeFlow.json index a9d39b06e8..0e3ae75f37 100644 --- a/Common/UnitDefinitions/VolumeFlow.json +++ b/Common/UnitDefinitions/VolumeFlow.json @@ -10,8 +10,8 @@ { "SingularName": "CubicMeterPerSecond", "PluralName": "CubicMetersPerSecond", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -26,8 +26,8 @@ { "SingularName": "CubicMeterPerMinute", "PluralName": "CubicMetersPerMinute", - "FromUnitToBaseFunc": "x/60", - "FromBaseToUnitFunc": "x*60", + "FromUnitToBaseFunc": "{x}/60", + "FromBaseToUnitFunc": "{x}*60", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ { "SingularName": "CubicMeterPerHour", "PluralName": "CubicMetersPerHour", - "FromUnitToBaseFunc": "x/3600", - "FromBaseToUnitFunc": "x*3600", + "FromUnitToBaseFunc": "{x}/3600", + "FromBaseToUnitFunc": "{x}*3600", "Localization": [ { "Culture": "en-US", @@ -58,8 +58,8 @@ { "SingularName": "CubicMeterPerDay", "PluralName": "CubicMetersPerDay", - "FromUnitToBaseFunc": "x/86400", - "FromBaseToUnitFunc": "x*86400", + "FromUnitToBaseFunc": "{x}/86400", + "FromBaseToUnitFunc": "{x}*86400", "Localization": [ { "Culture": "en-US", @@ -70,8 +70,8 @@ { "SingularName": "CubicFootPerSecond", "PluralName": "CubicFeetPerSecond", - "FromUnitToBaseFunc": "x/35.314666721", - "FromBaseToUnitFunc": "x*35.314666721", + "FromUnitToBaseFunc": "{x}/35.314666721", + "FromBaseToUnitFunc": "{x}*35.314666721", "Localization": [ { "Culture": "en-US", @@ -82,8 +82,8 @@ { "SingularName": "CubicFootPerMinute", "PluralName": "CubicFeetPerMinute", - "FromUnitToBaseFunc": "x/2118.88000326", - "FromBaseToUnitFunc": "x*2118.88000326", + "FromUnitToBaseFunc": "{x}/2118.88000326", + "FromBaseToUnitFunc": "{x}*2118.88000326", "Localization": [ { "Culture": "en-US", @@ -94,8 +94,8 @@ { "SingularName": "CubicFootPerHour", "PluralName": "CubicFeetPerHour", - "FromUnitToBaseFunc": "x*7.8657907199999087346816086183876e-6", - "FromBaseToUnitFunc": "x/7.8657907199999087346816086183876e-6", + "FromUnitToBaseFunc": "{x}*7.8657907199999087346816086183876e-6", + "FromBaseToUnitFunc": "{x}/7.8657907199999087346816086183876e-6", "Localization": [ { "Culture": "en-US", @@ -106,8 +106,8 @@ { "SingularName": "CubicYardPerSecond", "PluralName": "CubicYardsPerSecond", - "FromUnitToBaseFunc": "x*0.764554857984", - "FromBaseToUnitFunc": "x/0.764554857984", + "FromUnitToBaseFunc": "{x}*0.764554857984", + "FromBaseToUnitFunc": "{x}/0.764554857984", "Localization": [ { "Culture": "en-US", @@ -118,8 +118,8 @@ { "SingularName": "CubicYardPerMinute", "PluralName": "CubicYardsPerMinute", - "FromUnitToBaseFunc": "x*0.0127425809664", - "FromBaseToUnitFunc": "x/0.0127425809664", + "FromUnitToBaseFunc": "{x}*0.0127425809664", + "FromBaseToUnitFunc": "{x}/0.0127425809664", "Localization": [ { "Culture": "en-US", @@ -130,8 +130,8 @@ { "SingularName": "CubicYardPerHour", "PluralName": "CubicYardsPerHour", - "FromUnitToBaseFunc": "x*2.1237634944E-4", - "FromBaseToUnitFunc": "x/2.1237634944E-4", + "FromUnitToBaseFunc": "{x}*2.1237634944E-4", + "FromBaseToUnitFunc": "{x}/2.1237634944E-4", "Localization": [ { "Culture": "en-US", @@ -142,8 +142,8 @@ { "SingularName": "CubicYardPerDay", "PluralName": "CubicYardsPerDay", - "FromUnitToBaseFunc": "x/113007", - "FromBaseToUnitFunc": "x*113007", + "FromUnitToBaseFunc": "{x}/113007", + "FromBaseToUnitFunc": "{x}*113007", "Localization": [ { "Culture": "en-US", @@ -154,8 +154,8 @@ { "SingularName": "MillionUsGallonsPerDay", "PluralName": "MillionUsGallonsPerDay", - "FromUnitToBaseFunc": "x/22.824465227", - "FromBaseToUnitFunc": "x*22.824465227", + "FromUnitToBaseFunc": "{x}/22.824465227", + "FromBaseToUnitFunc": "{x}*22.824465227", "Localization": [ { "Culture": "en-US", @@ -166,8 +166,8 @@ { "SingularName": "UsGallonPerDay", "PluralName": "UsGallonsPerDay", - "FromUnitToBaseFunc": "x/22824465.227", - "FromBaseToUnitFunc": "x*22824465.227", + "FromUnitToBaseFunc": "{x}/22824465.227", + "FromBaseToUnitFunc": "{x}*22824465.227", "Localization": [ { "Culture": "en-US", @@ -178,8 +178,8 @@ { "SingularName": "LiterPerSecond", "PluralName": "LitersPerSecond", - "FromUnitToBaseFunc": "x/1000", - "FromBaseToUnitFunc": "x*1000", + "FromUnitToBaseFunc": "{x}/1000", + "FromBaseToUnitFunc": "{x}*1000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -195,8 +195,8 @@ { "SingularName": "LiterPerMinute", "PluralName": "LitersPerMinute", - "FromUnitToBaseFunc": "x/60000.00000", - "FromBaseToUnitFunc": "x*60000.00000", + "FromUnitToBaseFunc": "{x}/60000.00000", + "FromBaseToUnitFunc": "{x}*60000.00000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -212,8 +212,8 @@ { "SingularName": "LiterPerHour", "PluralName": "LitersPerHour", - "FromUnitToBaseFunc": "x/3600000.000", - "FromBaseToUnitFunc": "x*3600000.000", + "FromUnitToBaseFunc": "{x}/3600000.000", + "FromBaseToUnitFunc": "{x}*3600000.000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { @@ -229,8 +229,8 @@ { "SingularName": "LiterPerDay", "PluralName": "LitersPerDay", - "FromUnitToBaseFunc": "x/86400000", - "FromBaseToUnitFunc": "x*86400000", + "FromUnitToBaseFunc": "{x}/86400000", + "FromBaseToUnitFunc": "{x}*86400000", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega" ], "Localization": [ { @@ -242,8 +242,8 @@ { "SingularName": "UsGallonPerSecond", "PluralName": "UsGallonsPerSecond", - "FromUnitToBaseFunc": "x/264.1720523581484", - "FromBaseToUnitFunc": "x*264.1720523581484", + "FromUnitToBaseFunc": "{x}/264.1720523581484", + "FromBaseToUnitFunc": "{x}*264.1720523581484", "Localization": [ { "Culture": "en-US", @@ -254,8 +254,8 @@ { "SingularName": "UsGallonPerMinute", "PluralName": "UsGallonsPerMinute", - "FromUnitToBaseFunc": "x/15850.323141489", - "FromBaseToUnitFunc": "x*15850.323141489", + "FromUnitToBaseFunc": "{x}/15850.323141489", + "FromBaseToUnitFunc": "{x}*15850.323141489", "Localization": [ { "Culture": "en-US", @@ -266,8 +266,8 @@ { "SingularName": "UkGallonPerDay", "PluralName": "UkGallonsPerDay", - "FromUnitToBaseFunc": "x/19005304", - "FromBaseToUnitFunc": "x*19005304", + "FromUnitToBaseFunc": "{x}/19005304", + "FromBaseToUnitFunc": "{x}*19005304", "Localization": [ { "Culture": "en-US", @@ -278,8 +278,8 @@ { "SingularName": "UkGallonPerHour", "PluralName": "UkGallonsPerHour", - "FromUnitToBaseFunc": "x/791887.667", - "FromBaseToUnitFunc": "x*791887.667", + "FromUnitToBaseFunc": "{x}/791887.667", + "FromBaseToUnitFunc": "{x}*791887.667", "Localization": [ { "Culture": "en-US", @@ -290,8 +290,8 @@ { "SingularName": "UkGallonPerMinute", "PluralName": "UkGallonsPerMinute", - "FromUnitToBaseFunc": "x/13198.2", - "FromBaseToUnitFunc": "x*13198.2", + "FromUnitToBaseFunc": "{x}/13198.2", + "FromBaseToUnitFunc": "{x}*13198.2", "Localization": [ { "Culture": "en-US", @@ -302,8 +302,8 @@ { "SingularName": "UkGallonPerSecond", "PluralName": "UkGallonsPerSecond", - "FromUnitToBaseFunc": "x/219.969", - "FromBaseToUnitFunc": "x*219.969", + "FromUnitToBaseFunc": "{x}/219.969", + "FromBaseToUnitFunc": "{x}*219.969", "Prefixes": [ "Mega" ], "Localization": [ { @@ -315,8 +315,8 @@ { "SingularName": "KilousGallonPerMinute", "PluralName": "KilousGallonsPerMinute", - "FromUnitToBaseFunc": "x/15.850323141489", - "FromBaseToUnitFunc": "x*15.850323141489", + "FromUnitToBaseFunc": "{x}/15.850323141489", + "FromBaseToUnitFunc": "{x}*15.850323141489", "Localization": [ { "Culture": "en-US", @@ -327,8 +327,8 @@ { "SingularName": "UsGallonPerHour", "PluralName": "UsGallonsPerHour", - "FromUnitToBaseFunc": "x/951019.38848933424", - "FromBaseToUnitFunc": "x*951019.38848933424", + "FromUnitToBaseFunc": "{x}/951019.38848933424", + "FromBaseToUnitFunc": "{x}*951019.38848933424", "Localization": [ { "Culture": "en-US", @@ -339,8 +339,8 @@ { "SingularName": "CubicDecimeterPerMinute", "PluralName": "CubicDecimetersPerMinute", - "FromUnitToBaseFunc": "x/60000.00000", - "FromBaseToUnitFunc": "x*60000.00000", + "FromUnitToBaseFunc": "{x}/60000.00000", + "FromBaseToUnitFunc": "{x}*60000.00000", "Localization": [ { "Culture": "en-US", @@ -355,8 +355,8 @@ { "SingularName": "OilBarrelPerDay", "PluralName": "OilBarrelsPerDay", - "FromUnitToBaseFunc": "x*1.8401307283333333333333333333333e-6", - "FromBaseToUnitFunc": "x/1.8401307283333333333333333333333e-6", + "FromUnitToBaseFunc": "{x}*1.8401307283333333333333333333333e-6", + "FromBaseToUnitFunc": "{x}/1.8401307283333333333333333333333e-6", "Localization": [ { "Culture": "en-US", @@ -367,8 +367,8 @@ { "SingularName": "OilBarrelPerMinute", "PluralName": "OilBarrelsPerMinute", - "FromUnitToBaseFunc": "x*2.64978825e-3", - "FromBaseToUnitFunc": "x/2.64978825e-3", + "FromUnitToBaseFunc": "{x}*2.64978825e-3", + "FromBaseToUnitFunc": "{x}/2.64978825e-3", "Localization": [ { "Culture": "en-US", @@ -379,8 +379,8 @@ { "SingularName": "OilBarrelPerHour", "PluralName": "OilBarrelsPerHour", - "FromUnitToBaseFunc": "x*4.41631375e-5", - "FromBaseToUnitFunc": "x/4.41631375e-5", + "FromUnitToBaseFunc": "{x}*4.41631375e-5", + "FromBaseToUnitFunc": "{x}/4.41631375e-5", "Localization": [ { "Culture": "en-US", @@ -391,8 +391,8 @@ { "SingularName": "OilBarrelPerSecond", "PluralName": "OilBarrelsPerSecond", - "FromUnitToBaseFunc": "x/6.28981", - "FromBaseToUnitFunc": "x*6.28981", + "FromUnitToBaseFunc": "{x}/6.28981", + "FromBaseToUnitFunc": "{x}*6.28981", "Localization": [ { "Culture": "en-US", @@ -403,8 +403,8 @@ { "SingularName": "CubicMillimeterPerSecond", "PluralName": "CubicMillimetersPerSecond", - "FromUnitToBaseFunc": "x*1e-9", - "FromBaseToUnitFunc": "x/1e-9", + "FromUnitToBaseFunc": "{x}*1e-9", + "FromBaseToUnitFunc": "{x}/1e-9", "Localization": [ { "Culture": "en-US", @@ -419,8 +419,8 @@ { "SingularName": "AcreFootPerSecond", "PluralName": "AcreFeetPerSecond", - "FromUnitToBaseFunc": "x/0.000810713194", - "FromBaseToUnitFunc": "x*0.000810713194", + "FromUnitToBaseFunc": "{x}/0.000810713194", + "FromBaseToUnitFunc": "{x}*0.000810713194", "Localization": [ { "Culture": "en-US", @@ -431,8 +431,8 @@ { "SingularName": "AcreFootPerMinute", "PluralName": "AcreFeetPerMinute", - "FromUnitToBaseFunc": "x/0.0486427916", - "FromBaseToUnitFunc": "x*0.0486427916", + "FromUnitToBaseFunc": "{x}/0.0486427916", + "FromBaseToUnitFunc": "{x}*0.0486427916", "Localization": [ { "Culture": "en-US", @@ -443,8 +443,8 @@ { "SingularName": "AcreFootPerHour", "PluralName": "AcreFeetPerHour", - "FromUnitToBaseFunc": "x/2.91857", - "FromBaseToUnitFunc": "x*2.91857", + "FromUnitToBaseFunc": "{x}/2.91857", + "FromBaseToUnitFunc": "{x}*2.91857", "Localization": [ { "Culture": "en-US", @@ -455,8 +455,8 @@ { "SingularName": "AcreFootPerDay", "PluralName": "AcreFeetPerDay", - "FromUnitToBaseFunc": "x/70.0457", - "FromBaseToUnitFunc": "x*70.0457", + "FromUnitToBaseFunc": "{x}/70.0457", + "FromBaseToUnitFunc": "{x}*70.0457", "Localization": [ { "Culture": "en-US", @@ -467,8 +467,8 @@ { "SingularName": "CubicCentimeterPerMinute", "PluralName": "CubicCentimetersPerMinute", - "FromUnitToBaseFunc": "x*1.6666666666667e-8", - "FromBaseToUnitFunc": "x/1.6666666666667e-8", + "FromUnitToBaseFunc": "{x}*1.6666666666667e-8", + "FromBaseToUnitFunc": "{x}/1.6666666666667e-8", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumeFlowPerArea.json b/Common/UnitDefinitions/VolumeFlowPerArea.json index a5d1621376..27e2a16a31 100644 --- a/Common/UnitDefinitions/VolumeFlowPerArea.json +++ b/Common/UnitDefinitions/VolumeFlowPerArea.json @@ -14,8 +14,8 @@ "L": "Meter", "T": "Second" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -31,8 +31,8 @@ "T": "Minute" }, - "FromUnitToBaseFunc": "x/196.850394", - "FromBaseToUnitFunc": "x*196.850394", + "FromUnitToBaseFunc": "{x}/196.850394", + "FromBaseToUnitFunc": "{x}*196.850394", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumePerLength.json b/Common/UnitDefinitions/VolumePerLength.json index 02b8e0e18b..1ef6df2a3d 100644 --- a/Common/UnitDefinitions/VolumePerLength.json +++ b/Common/UnitDefinitions/VolumePerLength.json @@ -12,8 +12,8 @@ "BaseUnits": { "L": "Meter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [], "Localization": [ { @@ -28,8 +28,8 @@ "BaseUnits": { "L": "Decimeter" }, - "FromUnitToBaseFunc": "x/1000", - "FromBaseToUnitFunc": "x*1000", + "FromUnitToBaseFunc": "{x}/1000", + "FromBaseToUnitFunc": "{x}*1000", "Prefixes": [], "Localization": [ { @@ -41,8 +41,8 @@ { "SingularName": "LiterPerKilometer", "PluralName": "LitersPerKilometer", - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Prefixes": [], "Localization": [ { @@ -54,8 +54,8 @@ { "SingularName": "LiterPerMillimeter", "PluralName": "LitersPerMillimeter", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [], "Localization": [ { @@ -67,8 +67,8 @@ { "SingularName": "OilBarrelPerFoot", "PluralName": "OilBarrelsPerFoot", - "FromUnitToBaseFunc": "x/1.91713408", - "FromBaseToUnitFunc": "x*1.91713408", + "FromUnitToBaseFunc": "{x}/1.91713408", + "FromBaseToUnitFunc": "{x}*1.91713408", "Prefixes": [], "Localization": [ { @@ -80,8 +80,8 @@ { "SingularName": "CubicYardPerFoot", "PluralName": "CubicYardsPerFoot", - "FromUnitToBaseFunc": "x*2.50838208", - "FromBaseToUnitFunc": "x/2.50838208", + "FromUnitToBaseFunc": "{x}*2.50838208", + "FromBaseToUnitFunc": "{x}/2.50838208", "Localization": [ { "Culture": "en-US", @@ -92,8 +92,8 @@ { "SingularName": "CubicYardPerUsSurveyFoot", "PluralName": "CubicYardsPerUsSurveyFoot", - "FromUnitToBaseFunc": "x*2.50837706323584", - "FromBaseToUnitFunc": "x/2.50837706323584", + "FromUnitToBaseFunc": "{x}*2.50837706323584", + "FromBaseToUnitFunc": "{x}/2.50837706323584", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/VolumetricHeatCapacity.json b/Common/UnitDefinitions/VolumetricHeatCapacity.json index efe274e498..b6fb0629bb 100644 --- a/Common/UnitDefinitions/VolumetricHeatCapacity.json +++ b/Common/UnitDefinitions/VolumetricHeatCapacity.json @@ -13,8 +13,8 @@ { "SingularName": "JoulePerCubicMeterKelvin", "PluralName": "JoulesPerCubicMeterKelvin", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -26,8 +26,8 @@ { "SingularName": "JoulePerCubicMeterDegreeCelsius", "PluralName": "JoulesPerCubicMeterDegreeCelsius", - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Prefixes": [ "Kilo", "Mega" ], "Localization": [ { @@ -39,8 +39,8 @@ { "SingularName": "CaloriePerCubicCentimeterDegreeCelsius", "PluralName": "CaloriesPerCubicCentimeterDegreeCelsius", - "FromUnitToBaseFunc": "x / 2.388459e-7", - "FromBaseToUnitFunc": "x * 2.388459e-7", + "FromUnitToBaseFunc": "{x} / 2.388459e-7", + "FromBaseToUnitFunc": "{x} * 2.388459e-7", "Prefixes": [ "Kilo" ], "Localization": [ { @@ -52,8 +52,8 @@ { "SingularName": "BtuPerCubicFootDegreeFahrenheit", "PluralName": "BtusPerCubicFootDegreeFahrenheit", - "FromUnitToBaseFunc": "x / 1.4910660e-5", - "FromBaseToUnitFunc": "x * 1.4910660e-5", + "FromUnitToBaseFunc": "{x} / 1.4910660e-5", + "FromBaseToUnitFunc": "{x} * 1.4910660e-5", "Localization": [ { "Culture": "en-US", diff --git a/Common/UnitDefinitions/WarpingMomentOfInertia.json b/Common/UnitDefinitions/WarpingMomentOfInertia.json index db9d247e86..b1e04ec1c2 100644 --- a/Common/UnitDefinitions/WarpingMomentOfInertia.json +++ b/Common/UnitDefinitions/WarpingMomentOfInertia.json @@ -12,8 +12,8 @@ "BaseUnits": { "L": "Meter" }, - "FromUnitToBaseFunc": "x", - "FromBaseToUnitFunc": "x", + "FromUnitToBaseFunc": "{x}", + "FromBaseToUnitFunc": "{x}", "Localization": [ { "Culture": "en-US", @@ -27,8 +27,8 @@ "BaseUnits": { "L": "Decimeter" }, - "FromUnitToBaseFunc": "x/1e6", - "FromBaseToUnitFunc": "x*1e6", + "FromUnitToBaseFunc": "{x}/1e6", + "FromBaseToUnitFunc": "{x}*1e6", "Localization": [ { "Culture": "en-US", @@ -42,8 +42,8 @@ "BaseUnits": { "L": "Centimeter" }, - "FromUnitToBaseFunc": "x/1e12", - "FromBaseToUnitFunc": "x*1e12", + "FromUnitToBaseFunc": "{x}/1e12", + "FromBaseToUnitFunc": "{x}*1e12", "Localization": [ { "Culture": "en-US", @@ -57,8 +57,8 @@ "BaseUnits": { "L": "Millimeter" }, - "FromUnitToBaseFunc": "x/1e18", - "FromBaseToUnitFunc": "x*1e18", + "FromUnitToBaseFunc": "{x}/1e18", + "FromBaseToUnitFunc": "{x}*1e18", "Localization": [ { "Culture": "en-US", @@ -72,8 +72,8 @@ "BaseUnits": { "L": "Foot" }, - "FromUnitToBaseFunc": "x*Math.Pow(0.3048, 6)", - "FromBaseToUnitFunc": "x/Math.Pow(0.3048, 6)", + "FromUnitToBaseFunc": "{x}*Math.Pow(0.3048, 6)", + "FromBaseToUnitFunc": "{x}/Math.Pow(0.3048, 6)", "Localization": [ { "Culture": "en-US", @@ -87,8 +87,8 @@ "BaseUnits": { "L": "Inch" }, - "FromUnitToBaseFunc": "x*Math.Pow(2.54e-2, 6)", - "FromBaseToUnitFunc": "x/Math.Pow(2.54e-2, 6)", + "FromUnitToBaseFunc": "{x}*Math.Pow(2.54e-2, 6)", + "FromBaseToUnitFunc": "{x}/Math.Pow(2.54e-2, 6)", "Localization": [ { "Culture": "en-US",