diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index 952f2e702..708db37a4 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -173,7 +173,7 @@ App.Units.Inch = App.Units.Quantity('in') App.Units.Foot = App.Units.Quantity('fo') App.Units.Thou = App.Units.Quantity('th') App.Units.Yard = App.Units.Quantity('yr') -App.Units.Mile = App.Units.Quantity('mile') +App.Units.Mile = App.Units.Quantity('mi') App.Units.Pound = App.Units.Quantity('lb') App.Units.Ounce = App.Units.Quantity('oz') @@ -200,7 +200,7 @@ App.Units.NewtonMeter = App.Units.Quantity('Nm') App.Units.VoltAmpereSecond = App.Units.Quantity('VAs') App.Units.WattSecond = App.Units.Quantity('Ws') -App.Units.MPH = App.Units.Quantity('mile/h') +App.Units.MPH = App.Units.Quantity('mi/h') App.Units.KMH = App.Units.Quantity('km/h') diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index 92071d12d..f12d703f5 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -163,7 +163,7 @@ Quantity Quantity::KiloGram (1.0 ,Unit(0,1)); Quantity Quantity::Ton (1.0e3 ,Unit(0,1)); Quantity Quantity::Second (1.0 ,Unit(0,0,1)); -Quantity Quantity::Minut (60.0 ,Unit(0,0,1)); +Quantity Quantity::Minute (60.0 ,Unit(0,0,1)); Quantity Quantity::Hour (3600.0 ,Unit(0,0,1)); Quantity Quantity::Ampere (1.0 ,Unit(0,0,0,1)); diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h index eea35946a..76d378a7f 100644 --- a/src/Base/Quantity.h +++ b/src/Base/Quantity.h @@ -102,7 +102,7 @@ public: static Quantity Ton; static Quantity Second; - static Quantity Minut; + static Quantity Minute; static Quantity Hour; static Quantity Ampere; diff --git a/src/Base/QuantityLexer.c b/src/Base/QuantityLexer.c index e057825a1..0082fcf22 100644 --- a/src/Base/QuantityLexer.c +++ b/src/Base/QuantityLexer.c @@ -921,7 +921,7 @@ yylval = Quantity::Second; return UNIT; // second (internal case 21: YY_RULE_SETUP #line 57 "QuantityParser.l" -yylval = Quantity::Minut; return UNIT; // minute +yylval = Quantity::Minute; return UNIT; // minute YY_BREAK case 22: YY_RULE_SETUP diff --git a/src/Base/QuantityParser.l b/src/Base/QuantityParser.l index c1dfb7e23..eee575546 100644 --- a/src/Base/QuantityParser.l +++ b/src/Base/QuantityParser.l @@ -54,7 +54,7 @@ ID [a-z][a-z0-9]* "t" yylval = Quantity::Ton; return UNIT; // Metric Tonne "s" yylval = Quantity::Second; return UNIT; // second (internal standard time) - "min" yylval = Quantity::Minut; return UNIT; // minute + "min" yylval = Quantity::Minute; return UNIT; // minute "h" yylval = Quantity::Hour; return UNIT; // hour "A" yylval = Quantity::Ampere; return UNIT; // Ampere (internal standard electric current)