Skip to content

Commit db3e8a6

Browse files
committed
Merge branch 'hotfix-unitsystem' of git://github.com/Tirael/UnitsNet
2 parents f6fbdb3 + 8361ac4 commit db3e8a6

File tree

1 file changed

+71
-0
lines changed

1 file changed

+71
-0
lines changed

Src/UnitsNet/UnitSystem.cs

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,14 @@ private void CreateRussian()
152152
MapUnitToAbbreviation(Unit.Micrometer, "мкм");
153153
MapUnitToAbbreviation(Unit.Nanometer, "нм");
154154

155+
// Length (imperial)
156+
MapUnitToAbbreviation(Unit.Microinch, "микродюйм");
157+
MapUnitToAbbreviation(Unit.Mil, "мил");
158+
MapUnitToAbbreviation(Unit.Mile, "миля");
159+
MapUnitToAbbreviation(Unit.Yard, "ярд");
160+
MapUnitToAbbreviation(Unit.Foot, "фут");
161+
MapUnitToAbbreviation(Unit.Inch, "дюйм", "\"");
162+
155163
// Masses
156164
MapUnitToAbbreviation(Unit.Megatonne, "Мт");
157165
MapUnitToAbbreviation(Unit.Kilotonne, "кт");
@@ -164,6 +172,10 @@ private void CreateRussian()
164172
MapUnitToAbbreviation(Unit.Centigram, "сг");
165173
MapUnitToAbbreviation(Unit.Milligram, "мг");
166174

175+
// Mass (imperial)
176+
MapUnitToAbbreviation(Unit.ShortTon, "тонна малая");
177+
MapUnitToAbbreviation(Unit.LongTon, "тонна большая");
178+
167179
// Pressures
168180
MapUnitToAbbreviation(Unit.Pascal, "Па");
169181
MapUnitToAbbreviation(Unit.KiloPascal, "кПа");
@@ -184,13 +196,24 @@ private void CreateRussian()
184196
MapUnitToAbbreviation(Unit.KilogramForce, "кгс");
185197
MapUnitToAbbreviation(Unit.Dyn, "дин");
186198

199+
// Force (imperial/other)
200+
MapUnitToAbbreviation(Unit.KiloPond, "кгс");
201+
MapUnitToAbbreviation(Unit.PoundForce, "фунт-сила");
202+
MapUnitToAbbreviation(Unit.Poundal, "паундаль");
203+
187204
// Area
188205
MapUnitToAbbreviation(Unit.SquareKilometer, "км²");
189206
MapUnitToAbbreviation(Unit.SquareMeter, "м²");
190207
MapUnitToAbbreviation(Unit.SquareDecimeter, "дм²");
191208
MapUnitToAbbreviation(Unit.SquareCentimeter, "см²");
192209
MapUnitToAbbreviation(Unit.SquareMillimeter, "мм²");
193210

211+
// Area Imperial
212+
MapUnitToAbbreviation(Unit.SquareMile, "миля²");
213+
MapUnitToAbbreviation(Unit.SquareYard, "ярд²");
214+
MapUnitToAbbreviation(Unit.SquareFoot, "фут²");
215+
MapUnitToAbbreviation(Unit.SquareInch, "дюйм²");
216+
194217
// Angle
195218
MapUnitToAbbreviation(Unit.Degree, "°");
196219
MapUnitToAbbreviation(Unit.Radian, "рад");
@@ -208,6 +231,16 @@ private void CreateRussian()
208231
MapUnitToAbbreviation(Unit.Centiliter, "сл");
209232
MapUnitToAbbreviation(Unit.Milliliter, "мл");
210233

234+
// Volume US/Imperial
235+
MapUnitToAbbreviation(Unit.CubicMile, "миля³");
236+
MapUnitToAbbreviation(Unit.CubicYard, "ярд³");
237+
MapUnitToAbbreviation(Unit.CubicFoot, "фут³");
238+
MapUnitToAbbreviation(Unit.CubicInch, "дюйм³");
239+
MapUnitToAbbreviation(Unit.UsGallon, "Американский галлон");
240+
MapUnitToAbbreviation(Unit.UsOunce, "Американская унция");
241+
MapUnitToAbbreviation(Unit.ImperialGallon, "Английский галлон");
242+
MapUnitToAbbreviation(Unit.ImperialOunce, "Английская унция");
243+
211244
// Torque
212245
MapUnitToAbbreviation(Unit.Newtonmeter, "Н·м");
213246

@@ -226,6 +259,9 @@ private void CreateRussian()
226259
MapUnitToAbbreviation(Unit.Minute, "мин");
227260
MapUnitToAbbreviation(Unit.Hour, "ч");
228261
MapUnitToAbbreviation(Unit.Day, "д");
262+
MapUnitToAbbreviation(Unit.Week, "мин");
263+
MapUnitToAbbreviation(Unit.Month30Days, "месяц");
264+
MapUnitToAbbreviation(Unit.Year365Days, "год");
229265

230266
// Cooking units
231267
MapUnitToAbbreviation(Unit.Tablespoon, "столовая ложка");
@@ -255,6 +291,14 @@ private void CreateCultureInvariants()
255291
MapUnitToAbbreviation(Unit.Micrometer, "μm");
256292
MapUnitToAbbreviation(Unit.Nanometer, "nm");
257293

294+
// Length (imperial)
295+
MapUnitToAbbreviation(Unit.Microinch, "μin");
296+
MapUnitToAbbreviation(Unit.Mil, "mil");
297+
MapUnitToAbbreviation(Unit.Mile, "mi");
298+
MapUnitToAbbreviation(Unit.Yard, "yd");
299+
MapUnitToAbbreviation(Unit.Foot, "ft");
300+
MapUnitToAbbreviation(Unit.Inch, "in");
301+
258302
// Masses
259303
MapUnitToAbbreviation(Unit.Megatonne, "Mt");
260304
MapUnitToAbbreviation(Unit.Kilotonne, "kt");
@@ -267,6 +311,10 @@ private void CreateCultureInvariants()
267311
MapUnitToAbbreviation(Unit.Centigram, "cg");
268312
MapUnitToAbbreviation(Unit.Milligram, "mg");
269313

314+
// Mass (imperial)
315+
MapUnitToAbbreviation(Unit.ShortTon, "short tn");
316+
MapUnitToAbbreviation(Unit.LongTon, "long tn");
317+
270318
// Pressures
271319
MapUnitToAbbreviation(Unit.Pascal, "Pa");
272320
MapUnitToAbbreviation(Unit.KiloPascal, "kPa");
@@ -287,13 +335,24 @@ private void CreateCultureInvariants()
287335
MapUnitToAbbreviation(Unit.KilogramForce, "kgf");
288336
MapUnitToAbbreviation(Unit.Dyn, "dyn");
289337

338+
// Force (imperial/other)
339+
MapUnitToAbbreviation(Unit.KiloPond, "kp");
340+
MapUnitToAbbreviation(Unit.PoundForce, "lbf");
341+
MapUnitToAbbreviation(Unit.Poundal, "pdl");
342+
290343
// Area
291344
MapUnitToAbbreviation(Unit.SquareKilometer, "km²");
292345
MapUnitToAbbreviation(Unit.SquareMeter, "m²");
293346
MapUnitToAbbreviation(Unit.SquareDecimeter, "dm²");
294347
MapUnitToAbbreviation(Unit.SquareCentimeter, "cm²");
295348
MapUnitToAbbreviation(Unit.SquareMillimeter, "mm²");
296349

350+
// Area Imperial
351+
MapUnitToAbbreviation(Unit.SquareMile, "mi²");
352+
MapUnitToAbbreviation(Unit.SquareYard, "yd²");
353+
MapUnitToAbbreviation(Unit.SquareFoot, "ft²");
354+
MapUnitToAbbreviation(Unit.SquareInch, "in²");
355+
297356
// Angle
298357
MapUnitToAbbreviation(Unit.Degree, "°");
299358
MapUnitToAbbreviation(Unit.Radian, "rad");
@@ -311,6 +370,16 @@ private void CreateCultureInvariants()
311370
MapUnitToAbbreviation(Unit.Centiliter, "cl");
312371
MapUnitToAbbreviation(Unit.Milliliter, "ml");
313372

373+
// Volume US/Imperial
374+
MapUnitToAbbreviation(Unit.CubicMile, "mi³");
375+
MapUnitToAbbreviation(Unit.CubicYard, "yd³");
376+
MapUnitToAbbreviation(Unit.CubicFoot, "ft³");
377+
MapUnitToAbbreviation(Unit.CubicInch, "in³");
378+
MapUnitToAbbreviation(Unit.UsGallon, "gal (U.S.)");
379+
MapUnitToAbbreviation(Unit.UsOunce, "oz (U.S.)");
380+
MapUnitToAbbreviation(Unit.ImperialGallon, "gal (imp.)");
381+
MapUnitToAbbreviation(Unit.ImperialOunce, "oz (imp.)");
382+
314383
// Torque
315384
MapUnitToAbbreviation(Unit.Newtonmeter, "Nm");
316385

@@ -330,6 +399,8 @@ private void CreateCultureInvariants()
330399
MapUnitToAbbreviation(Unit.Hour, "h");
331400
MapUnitToAbbreviation(Unit.Day, "d");
332401
MapUnitToAbbreviation(Unit.Week, "week");
402+
MapUnitToAbbreviation(Unit.Month30Days, "month");
403+
MapUnitToAbbreviation(Unit.Year365Days, "year");
333404

334405
// Cooking units
335406
MapUnitToAbbreviation(Unit.Tablespoon, "tbsp.");

0 commit comments

Comments
 (0)