Reducing values to a common format

I use this patch to convert all values into the
format <Description>:<Value><Unit of Measure>.
I put the units of measure in a separate
localization area in order to use them in
the sensor page in the future.

Change-Id: Ic6554860c4185bc4d681a97205051799c6637b5c
Signed-off-by: Glukhov Mikhail <mikl@greenfil.ru>

8 files changed, 92 insertions, 32 deletions

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 74dad4ef..7b057d39 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -389,16 +389,16 @@
         "table": {
             "assetTag": "Asset tag",
             "baseModuleType": "Base module type",
-            "busWidthBits": "Bus width bits",
+            "busWidthBits": "Bus width",
             "bmcDateTime": "BMC date and time",
-            "capacityMiB": "Capacity MiB",
+            "capacityMiB": "Capacity",
             "chassisType": "Chassis type",
             "connectTypesSupported": "Connect types supported",
             "coreCount": "Core count",
             "count": "Count",
-            "dataWidthBits": "Data width bits",
+            "dataWidthBits": "Data width",
             "description": "Description",
-            "efficiencyPercent": "Efficiency percent",
+            "efficiencyPercent": "Efficiency",
             "enabled": "Enabled",
             "fanSpeed": "Fan speed",
             "firmwareVersion": "Firmware version",
@@ -414,18 +414,18 @@
             "managerType": "Manager type",
             "manufacturer": "Manufacturer",
             "maxConcurrentSessions": "Max concurrent sessions",
-            "maxSpeedMHz": "Max speed MHz",
-            "maxPowerWatts": "Max power watts",
+            "maxSpeedMHz": "Max speed",
+            "maxPowerWatts": "Max power",
             "memoryType": "Memory type",
             "memorySummary": "Memory summary",
-            "minPowerWatts": "Min power watts",
-            "minSpeedMHz": "Min speed MHz",
+            "minPowerWatts": "Min power",
+            "minSpeedMHz": "Min speed",
             "model": "Model",
             "name": "Name",
-            "operatingSpeedMhz": "Operating speed Mhz",
+            "operatingSpeedMhz": "Operating speed",
             "partNumber": "Part number",
             "power": "Power",
-            "powerInputWatts": "Power input watts",
+            "powerInputWatts": "Power input",
             "processorArchitecture": "Processor architecture",
             "processorSummary": "Processor summary",
             "processorType": "Processor type",
@@ -1192,5 +1192,17 @@
         "ZM": "Zambia",
         "ZW": "Zimbabwe",
         "AX": "Åland Islands"
+    },
+    "unit": {
+        "℃": "℃",
+        "A": "A",
+        "bit": "bit",
+        "GiB": "GiB",
+        "MHz": "MHz",
+        "MiB": "MiB",
+        "Percent": "%",
+        "RPM": "RPM",
+        "V": "V",
+        "W": "W"
     }
 }
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index 4808aec4..9dd883f3 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -389,16 +389,16 @@
         "table": {
             "assetTag": "Метка",
             "baseModuleType": "Тип базового модуля",
-            "busWidthBits": "Ширина шины в битах",
+            "busWidthBits": "Ширина шины",
             "bmcDateTime": "Дата и время BMC",
-            "capacityMiB": "Объём МиБ",
+            "capacityMiB": "Объём памяти",
             "chassisType": "Тип шасси",
             "connectTypesSupported": "Поддерживаемые типы подключений",
             "coreCount": "Количество ядер",
             "count": "Количество",
-            "dataWidthBits": "Ширина шины данных в битах",
+            "dataWidthBits": "Ширина шины данных",
             "description": "Описание",
-            "efficiencyPercent": "Процент эффективности",
+            "efficiencyPercent": "Эффективность",
             "enabled": "Включено",
             "fanSpeed": "Скорость вращения вентилятора",
             "firmwareVersion": "Версия встроенного ПО",
@@ -414,18 +414,18 @@
             "managerType": "Тип обработчика",
             "manufacturer": "Производитель",
             "maxConcurrentSessions": "Максимальное количество одновременных сессий",
-            "maxSpeedMHz": "Макс. скорость МГц",
-            "maxPowerWatts": "Макс. мощность Вт",
+            "maxSpeedMHz": "Макс. скорость",
+            "maxPowerWatts": "Макс. мощность",
             "memoryType": "Тип памяти",
             "memorySummary": "Сводная информация по памяти",
-            "minPowerWatts": "Мин. мощность Вт",
-            "minSpeedMHz": "Мин. скорость МГц",
+            "minPowerWatts": "Мин. мощность",
+            "minSpeedMHz": "Мин. скорость",
             "model": "Модель",
             "name": "Имя",
-            "operatingSpeedMhz": "Рабочая скорость МГц",
+            "operatingSpeedMhz": "Рабочая скорость",
             "partNumber": "Шифр компонента",
             "power": "Питание",
-            "powerInputWatts": "Входная мощность, Ватт",
+            "powerInputWatts": "Входная мощность",
             "processorArchitecture": "Архитектура",
             "processorSummary": "Сводная информация по процессору",
             "processorType": "Тип процессора",
@@ -1192,5 +1192,17 @@
         "ZM": "Замбия",
         "ZW": "Зимбабве",
         "AX": "Аландские острова"
+    },
+    "unit": {
+        "℃": "℃",
+        "A": "А",
+        "bit": "бит",
+        "GiB": "ГиБ",
+        "MHz": "МГц",
+        "MiB": "МиБ",
+        "Percent": "%",
+        "RPM": "об/мин",
+        "V": "В",
+        "W": "Вт"
     }
 }
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
index b49cec7f..4c557fa2 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -100,10 +100,16 @@
               <dl>
                 <!-- Min power -->
                 <dt>{{ $t('pageInventory.table.minPowerWatts') }}:</dt>
-                <dd>{{ dataFormatter(item.minPowerWatts) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.minPowerWatts) }}
+                  {{ $t('unit.W') }}
+                </dd>
                 <!-- Max power -->
                 <dt>{{ $t('pageInventory.table.maxPowerWatts') }}:</dt>
-                <dd>{{ dataFormatter(item.maxPowerWatts) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.maxPowerWatts) }}
+                  {{ $t('unit.W') }}
+                </dd>
               </dl>
             </b-col>
           </b-row>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index d29f6f8e..459d3bb3 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -95,7 +95,10 @@
               <dl>
                 <!-- Capacity MiB -->
                 <dt>{{ $t('pageInventory.table.capacityMiB') }}:</dt>
-                <dd>{{ dataFormatter(item.capacityMiB) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.capacityMiB) }}
+                  {{ $t('unit.MiB') }}
+                </dd>
               </dl>
               <dl>
                 <!-- Status-->
@@ -132,17 +135,26 @@
               <dl>
                 <!-- Bus Width Bits -->
                 <dt>{{ $t('pageInventory.table.busWidthBits') }}:</dt>
-                <dd>{{ dataFormatter(item.busWidthBits) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.busWidthBits) }}
+                  {{ $t('unit.bit') }}
+                </dd>
               </dl>
               <dl>
                 <!-- Data Width Bits -->
                 <dt>{{ $t('pageInventory.table.dataWidthBits') }}:</dt>
-                <dd>{{ dataFormatter(item.dataWidthBits) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.dataWidthBits) }}
+                  {{ $t('unit.bit') }}
+                </dd>
               </dl>
               <dl>
                 <!-- Operating Speed Mhz -->
                 <dt>{{ $t('pageInventory.table.operatingSpeedMhz') }}:</dt>
-                <dd>{{ dataFormatter(item.operatingSpeedMhz) }} MHz</dd>
+                <dd>
+                  {{ dataFormatter(item.operatingSpeedMhz) }}
+                  {{ $t('unit.MHz') }}
+                </dd>
               </dl>
             </b-col>
           </b-row>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
index fe788c53..9e26d903 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -73,7 +73,10 @@
               <dl>
                 <!-- Fan speed -->
                 <dt>{{ $t('pageInventory.table.fanSpeed') }}:</dt>
-                <dd>{{ dataFormatter(item.speed) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.speed) }}
+                  {{ $t('unit.RPM') }}
+                </dd>
               </dl>
             </b-col>
             <b-col sm="6" xl="4">
diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index aed7871a..df03fdf2 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -83,10 +83,16 @@
                 <dd>{{ dataFormatter(item.statusHealth) }}</dd>
                 <!-- Efficiency percent -->
                 <dt>{{ $t('pageInventory.table.efficiencyPercent') }}:</dt>
-                <dd>{{ dataFormatter(item.efficiencyPercent) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.efficiencyPercent) }}
+                  {{ $t('unit.Percent') }}
+                </dd>
                 <!-- Power input watts -->
                 <dt>{{ $t('pageInventory.table.powerInputWatts') }}:</dt>
-                <dd>{{ dataFormatter(item.powerInputWatts) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.powerInputWatts) }}
+                  {{ $t('unit.W') }}
+                </dd>
               </dl>
             </b-col>
           </b-row>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
index 7d5dd700..793dbd86 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
@@ -127,10 +127,16 @@
               <dl>
                 <!-- Min Speed MHz -->
                 <dt>{{ $t('pageInventory.table.minSpeedMHz') }}:</dt>
-                <dd>{{ dataFormatter(item.minSpeedMHz) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.minSpeedMHz) }}
+                  {{ $t('unit.MHz') }}
+                </dd>
                 <!-- Max Speed MHz -->
                 <dt>{{ $t('pageInventory.table.maxSpeedMHz') }}:</dt>
-                <dd>{{ dataFormatter(item.maxSpeedMHz) }}</dd>
+                <dd>
+                  {{ dataFormatter(item.maxSpeedMHz) }}
+                  {{ $t('unit.MHz') }}
+                </dd>
                 <!-- Total Cores -->
                 <dt>{{ $t('pageInventory.table.totalCores') }}:</dt>
                 <dd>{{ dataFormatter(item.totalCores) }}</dd>
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index cf2cf020..e62f5006 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -115,7 +115,10 @@
                 <dd>{{ dataFormatter(item.memorySummaryHealthRollup) }}</dd>
                 <!-- Total system memory -->
                 <dt>{{ $t('pageInventory.table.totalSystemMemoryGiB') }}:</dt>
-                <dd>{{ dataFormatter(item.totalSystemMemoryGiB) }}GB</dd>
+                <dd>
+                  {{ dataFormatter(item.totalSystemMemoryGiB) }}
+                  {{ $t('unit.GiB') }}
+                </dd>
               </dl>
               <!-- Processor Summary -->
               <p class="mt-1 mb-2 h6 float-none m-0">