Skip to content

Commit c02b189

Browse files
authored
UnitAbbreviationsCache: GetDefaultAbbreviation should throw when no abbreviations are mapped (#1539)
fixes the first part of #1509 - `UnitAbbreviationsCache`: `GetDefaultAbbreviation` should throw when no abbreviations are mapped - `Volume`: added the missing abbreviation mappings
1 parent 46663ea commit c02b189

File tree

4 files changed

+194
-75
lines changed

4 files changed

+194
-75
lines changed

Common/UnitDefinitions/Volume.json

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,7 @@
329329
"Localization": [
330330
{
331331
"Culture": "en-US",
332-
"Abbreviations": []
333-
},
334-
{
335-
"Culture": "ru-RU",
336-
"Abbreviations": []
337-
},
338-
{
339-
"Culture": "nb-NO",
340-
"Abbreviations": []
332+
"Abbreviations": [ "tablespoon (U.S.)" ]
341333
}
342334
]
343335
},
@@ -351,15 +343,7 @@
351343
"Localization": [
352344
{
353345
"Culture": "en-US",
354-
"Abbreviations": []
355-
},
356-
{
357-
"Culture": "ru-RU",
358-
"Abbreviations": []
359-
},
360-
{
361-
"Culture": "nb-NO",
362-
"Abbreviations": []
346+
"Abbreviations": [ "tablespoon (A.U.)" ]
363347
}
364348
]
365349
},
@@ -373,15 +357,7 @@
373357
"Localization": [
374358
{
375359
"Culture": "en-US",
376-
"Abbreviations": []
377-
},
378-
{
379-
"Culture": "ru-RU",
380-
"Abbreviations": []
381-
},
382-
{
383-
"Culture": "nb-NO",
384-
"Abbreviations": []
360+
"Abbreviations": [ "tablespoon (U.K.)" ]
385361
}
386362
]
387363
},
@@ -396,14 +372,6 @@
396372
{
397373
"Culture": "en-US",
398374
"Abbreviations": [ "tsp", "t", "ts", "tspn", "t.", "ts.", "tsp.", "tspn.", "teaspoon" ]
399-
},
400-
{
401-
"Culture": "ru-RU",
402-
"Abbreviations": []
403-
},
404-
{
405-
"Culture": "nb-NO",
406-
"Abbreviations": []
407375
}
408376
]
409377
},
@@ -417,15 +385,7 @@
417385
"Localization": [
418386
{
419387
"Culture": "en-US",
420-
"Abbreviations": []
421-
},
422-
{
423-
"Culture": "ru-RU",
424-
"Abbreviations": []
425-
},
426-
{
427-
"Culture": "nb-NO",
428-
"Abbreviations": []
388+
"Abbreviations": [ "teaspoon (U.S.)" ]
429389
}
430390
]
431391
},
@@ -439,7 +399,7 @@
439399
"Localization": [
440400
{
441401
"Culture": "en-US",
442-
"Abbreviations": []
402+
"Abbreviations": [ "metric cup" ]
443403
}
444404
]
445405
},
@@ -453,7 +413,7 @@
453413
"Localization": [
454414
{
455415
"Culture": "en-US",
456-
"Abbreviations": []
416+
"Abbreviations": ["cup (U.S. customary)"]
457417
}
458418
]
459419
},
@@ -467,7 +427,7 @@
467427
"Localization": [
468428
{
469429
"Culture": "en-US",
470-
"Abbreviations": []
430+
"Abbreviations": ["cup (U.S.)"]
471431
}
472432
]
473433
},

0 commit comments

Comments
 (0)