Fix for explicit AbbreviationsWithPrefixes not lining up with the pre… (

#542) * Fix for explicit AbbreviationsWithPrefixes not lining up with the prefixes. * Abort build when AbbreviationsWithPrefixes mismatches prefixes count. Will remove incorrect json after testing failure on AppVeyor. * Build fails properly. Putting missing abbreviation back. * Fix for count output
angularsen · Oct 31, 2018 · 28f0989 · 28f0989
1 parent 157b288
commit 28f0989
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/Common/UnitDefinitions/Force.json b/Common/UnitDefinitions/Force.json
@@ -70,7 +70,7 @@
         {
           "Culture": "ru-RU",
           "Abbreviations": [ "Н" ],
-          "AbbreviationsWithPrefixes": [ "даН", "кН" ]
+          "AbbreviationsWithPrefixes": [ "мкН", "мН", "даН", "кН", "МН" ]
         }
       ]
     },

diff --git a/Common/UnitDefinitions/Torque.json b/Common/UnitDefinitions/Torque.json
@@ -48,7 +48,7 @@
         {
           "Culture": "ru-RU",
           "Abbreviations": [ "Н·м" ],
-          "AbbreviationsWithPrefixes": [ "кН·м" ]
+          "AbbreviationsWithPrefixes": [ "кН·м", "МН·м" ]
         }
       ]
     },

diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs
@@ -1526,7 +1526,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "daN"),
-                                new AbbreviationsForCulture("ru-RU", ""),
+                                new AbbreviationsForCulture("ru-RU", "даН"),
                             }),
                         new CulturesForEnumValue((int) ForceUnit.Dyn,
                             new[]
@@ -1544,7 +1544,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "kN"),
-                                new AbbreviationsForCulture("ru-RU", ""),
+                                new AbbreviationsForCulture("ru-RU", "кН"),
                             }),
                         new CulturesForEnumValue((int) ForceUnit.KiloPond,
                             new[]
@@ -1556,19 +1556,19 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "MN"),
-                                new AbbreviationsForCulture("ru-RU", ""),
+                                new AbbreviationsForCulture("ru-RU", "МН"),
                             }),
                         new CulturesForEnumValue((int) ForceUnit.Micronewton,
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "µN"),
-                                new AbbreviationsForCulture("ru-RU", "даН"),
+                                new AbbreviationsForCulture("ru-RU", "мкН"),
                             }),
                         new CulturesForEnumValue((int) ForceUnit.Millinewton,
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "mN"),
-                                new AbbreviationsForCulture("ru-RU", "кН"),
+                                new AbbreviationsForCulture("ru-RU", "мН"),
                             }),
                         new CulturesForEnumValue((int) ForceUnit.Newton,
                             new[]
@@ -4318,7 +4318,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                             new[]
                             {
                                 new AbbreviationsForCulture("en-US", "MN·m"),
-                                new AbbreviationsForCulture("ru-RU", ""),
+                                new AbbreviationsForCulture("ru-RU", "МН·м"),
                             }),
                         new CulturesForEnumValue((int) TorqueUnit.MeganewtonMillimeter,
                             new[]

diff --git a/UnitsNet/Scripts/GenerateUnits.ps1 b/UnitsNet/Scripts/GenerateUnits.ps1
@@ -169,6 +169,14 @@ function Add-PrefixUnits {
 
         foreach ($unit in $quantity.Units)
         {
+            foreach ($localization in $unit.Localization){
+                if($localization.AbbreviationsWithPrefixes.Count -gt 0){
+                    if($unit.Prefixes.Count -ne $localization.AbbreviationsWithPrefixes.Count){
+                        Write-Error "The prefix count ($($unit.Prefixes.Count)) does not match the abbreviations with prefixes count ($($localization.AbbreviationsWithPrefixes.Count)) for $($quantity.Name).$($unit.SingularName)" -ErrorAction Stop
+                    }
+                }
+            }
+
             $prefixIndex = 0
             foreach ($prefix in $unit.Prefixes)
             {
@@ -215,6 +223,7 @@ function Add-PrefixUnits {
                     PluralName=$prefix + $(ToCamelCase $unit.PluralName)
                     FromUnitToBaseFunc="("+$unit.FromUnitToBaseFunc+") * $prefixFactor"
                     FromBaseToUnitFunc="("+$unit.FromBaseToUnitFunc+") / $prefixFactor"
+
                     Localization=$unit.Localization | % {
                         $abbrev = $prefixAbbreviation + $_.Abbreviations[0]
                         if ($_.AbbreviationsWithPrefixes) {