From d0b078f692fc02578b0bfbc3868ce81516c71dd3 Mon Sep 17 00:00:00 2001 From: Glukhov Mikhail Date: Sat, 24 Dec 2022 12:16:53 +0300 Subject: Reducing values to a common format I use this patch to convert all values into the format :. 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 --- src/locales/en-US.json | 32 +++++++++++++++------- src/locales/ru-RU.json | 32 +++++++++++++++------- .../Inventory/InventoryTableChassis.vue | 10 +++++-- .../Inventory/InventoryTableDimmSlot.vue | 20 +++++++++++--- .../Inventory/InventoryTableFans.vue | 5 +++- .../Inventory/InventoryTablePowerSupplies.vue | 10 +++++-- .../Inventory/InventoryTableProcessors.vue | 10 +++++-- .../Inventory/InventoryTableSystem.vue | 5 +++- 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 @@
{{ $t('pageInventory.table.minPowerWatts') }}:
-
{{ dataFormatter(item.minPowerWatts) }}
+
+ {{ dataFormatter(item.minPowerWatts) }} + {{ $t('unit.W') }} +
{{ $t('pageInventory.table.maxPowerWatts') }}:
-
{{ dataFormatter(item.maxPowerWatts) }}
+
+ {{ dataFormatter(item.maxPowerWatts) }} + {{ $t('unit.W') }} +
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 @@
{{ $t('pageInventory.table.capacityMiB') }}:
-
{{ dataFormatter(item.capacityMiB) }}
+
+ {{ dataFormatter(item.capacityMiB) }} + {{ $t('unit.MiB') }} +
@@ -132,17 +135,26 @@
{{ $t('pageInventory.table.busWidthBits') }}:
-
{{ dataFormatter(item.busWidthBits) }}
+
+ {{ dataFormatter(item.busWidthBits) }} + {{ $t('unit.bit') }} +
{{ $t('pageInventory.table.dataWidthBits') }}:
-
{{ dataFormatter(item.dataWidthBits) }}
+
+ {{ dataFormatter(item.dataWidthBits) }} + {{ $t('unit.bit') }} +
{{ $t('pageInventory.table.operatingSpeedMhz') }}:
-
{{ dataFormatter(item.operatingSpeedMhz) }} MHz
+
+ {{ dataFormatter(item.operatingSpeedMhz) }} + {{ $t('unit.MHz') }} +
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 @@
{{ $t('pageInventory.table.fanSpeed') }}:
-
{{ dataFormatter(item.speed) }}
+
+ {{ dataFormatter(item.speed) }} + {{ $t('unit.RPM') }} +
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 @@
{{ dataFormatter(item.statusHealth) }}
{{ $t('pageInventory.table.efficiencyPercent') }}:
-
{{ dataFormatter(item.efficiencyPercent) }}
+
+ {{ dataFormatter(item.efficiencyPercent) }} + {{ $t('unit.Percent') }} +
{{ $t('pageInventory.table.powerInputWatts') }}:
-
{{ dataFormatter(item.powerInputWatts) }}
+
+ {{ dataFormatter(item.powerInputWatts) }} + {{ $t('unit.W') }} +
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 @@
{{ $t('pageInventory.table.minSpeedMHz') }}:
-
{{ dataFormatter(item.minSpeedMHz) }}
+
+ {{ dataFormatter(item.minSpeedMHz) }} + {{ $t('unit.MHz') }} +
{{ $t('pageInventory.table.maxSpeedMHz') }}:
-
{{ dataFormatter(item.maxSpeedMHz) }}
+
+ {{ dataFormatter(item.maxSpeedMHz) }} + {{ $t('unit.MHz') }} +
{{ $t('pageInventory.table.totalCores') }}:
{{ dataFormatter(item.totalCores) }}
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 @@
{{ dataFormatter(item.memorySummaryHealthRollup) }}
{{ $t('pageInventory.table.totalSystemMemoryGiB') }}:
-
{{ dataFormatter(item.totalSystemMemoryGiB) }}GB
+
+ {{ dataFormatter(item.totalSystemMemoryGiB) }} + {{ $t('unit.GiB') }} +

-- cgit v1.2.3