From ec6d69f468db48efb322059858e21c563301094a Mon Sep 17 00:00:00 2001
From: Reinier van der Leer <reintjebadboy@gmail.com>
Date: Tue, 8 Oct 2019 02:12:02 +0200
Subject: [PATCH] Units: consistent Meter spelling and abbreviations (#19648)

* fixed unit symbols and description consistency in valueFormats/categories.ts

The preferred English spelling is "litre" (vs "liter") and "metre" (vs "meter"), except in American english. Also, the symbol for Litre is an uppercase 'L', not lowercase.

* Changed metre -> meter in units
---
 .../src/utils/valueFormats/categories.ts         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/grafana-ui/src/utils/valueFormats/categories.ts b/packages/grafana-ui/src/utils/valueFormats/categories.ts
index fbe921069df..4b02f62bd78 100644
--- a/packages/grafana-ui/src/utils/valueFormats/categories.ts
+++ b/packages/grafana-ui/src/utils/valueFormats/categories.ts
@@ -181,7 +181,7 @@ export const getCategories = (): ValueFormatCategory[] => [
       { name: 'Kilovolt-ampere reactive (kvar)', id: 'kvoltampreact', fn: decimalSIPrefix('var', 1) },
       { name: 'Watt-hour (Wh)', id: 'watth', fn: decimalSIPrefix('Wh') },
       { name: 'Kilowatt-hour (kWh)', id: 'kwatth', fn: decimalSIPrefix('Wh', 1) },
-      { name: 'Kilowatt-min (kWm)', id: 'kwattm', fn: decimalSIPrefix('W/Min', 1) },
+      { name: 'Kilowatt-min (kWm)', id: 'kwattm', fn: decimalSIPrefix('W-Min', 1) },
       { name: 'Ampere-hour (Ah)', id: 'amph', fn: decimalSIPrefix('Ah') },
       { name: 'Kiloampere-hour (kAh)', id: 'kamph', fn: decimalSIPrefix('Ah', 1) },
       { name: 'Milliampere-hour (mAh)', id: 'mamph', fn: decimalSIPrefix('Ah', -1) },
@@ -205,8 +205,8 @@ export const getCategories = (): ValueFormatCategory[] => [
       { name: 'Cubic meters/sec (cms)', id: 'flowcms', fn: toFixedUnit('cms') },
       { name: 'Cubic feet/sec (cfs)', id: 'flowcfs', fn: toFixedUnit('cfs') },
       { name: 'Cubic feet/min (cfm)', id: 'flowcfm', fn: toFixedUnit('cfm') },
-      { name: 'Litre/hour', id: 'litreh', fn: toFixedUnit('l/h') },
-      { name: 'Litre/min (l/min)', id: 'flowlpm', fn: toFixedUnit('l/min') },
+      { name: 'Litre/hour', id: 'litreh', fn: toFixedUnit('L/h') },
+      { name: 'Litre/min (L/min)', id: 'flowlpm', fn: toFixedUnit('L/min') },
       { name: 'milliLitre/min (mL/min)', id: 'flowmlpm', fn: toFixedUnit('mL/min') },
       { name: 'Lux (lx)', id: 'lux', fn: toFixedUnit('lux') },
     ],
@@ -244,7 +244,7 @@ export const getCategories = (): ValueFormatCategory[] => [
   {
     name: 'length',
     formats: [
-      { name: 'millimetre (mm)', id: 'lengthmm', fn: decimalSIPrefix('m', -1) },
+      { name: 'millimeter (mm)', id: 'lengthmm', fn: decimalSIPrefix('m', -1) },
       { name: 'feet (ft)', id: 'lengthft', fn: toFixedUnit('ft') },
       { name: 'meter (m)', id: 'lengthm', fn: decimalSIPrefix('m') },
       { name: 'kilometer (km)', id: 'lengthkm', fn: decimalSIPrefix('m', 1) },
@@ -322,7 +322,7 @@ export const getCategories = (): ValueFormatCategory[] => [
   {
     name: 'Velocity',
     formats: [
-      { name: 'metres/second (m/s)', id: 'velocityms', fn: toFixedUnit('m/s') },
+      { name: 'meters/second (m/s)', id: 'velocityms', fn: toFixedUnit('m/s') },
       { name: 'kilometers/hour (km/h)', id: 'velocitykmh', fn: toFixedUnit('km/h') },
       { name: 'miles/hour (mph)', id: 'velocitymph', fn: toFixedUnit('mph') },
       { name: 'knot (kn)', id: 'velocityknot', fn: toFixedUnit('kn') },
@@ -333,9 +333,9 @@ export const getCategories = (): ValueFormatCategory[] => [
     formats: [
       { name: 'millilitre (mL)', id: 'mlitre', fn: decimalSIPrefix('L', -1) },
       { name: 'litre (L)', id: 'litre', fn: decimalSIPrefix('L') },
-      { name: 'cubic metre', id: 'm3', fn: toFixedUnit('m³') },
-      { name: 'Normal cubic metre', id: 'Nm3', fn: toFixedUnit('Nm³') },
-      { name: 'cubic decimetre', id: 'dm3', fn: toFixedUnit('dm³') },
+      { name: 'cubic meter', id: 'm3', fn: toFixedUnit('m³') },
+      { name: 'Normal cubic meter', id: 'Nm3', fn: toFixedUnit('Nm³') },
+      { name: 'cubic decimeter', id: 'dm3', fn: toFixedUnit('dm³') },
       { name: 'gallons', id: 'gallons', fn: toFixedUnit('gal') },
     ],
   },