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>

2 files changed, 44 insertions, 20 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": "Вт"
     }
 }