From a66e1b2e6d1d1c7ff5e3fa71e5dd18a91350ecf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 27 Feb 2025 21:10:57 +0800 Subject: [PATCH] Doc: fix `SI` size prefix description Fix #1589 --- CHANGELOG.md | 1 + doc/json_schema.json | 4 ++-- src/data/help.json | 4 ++-- src/options/display.h | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6154d532..1e40506b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Bugfixes: * Fix `{day-pretty}` output in custom format (DateTime, Windows) * Fix VanillaOS detection (OS, Linux) * Fix secure boot testing (Bootmgr, Linux) +* Fix the SI unit "kB" in help message Features: * Support Chassis module in macOS (Chassis, macOS) diff --git a/doc/json_schema.json b/doc/json_schema.json index 0ee8a87c1..ae1f3f9d8 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -786,11 +786,11 @@ }, { "const": "si", - "description": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ..." + "description": "1000 Bytes = 1 kB, 1000 kB = 1 MB, ..." }, { "const": "jedec", - "description": "1024 Bytes = 1 kB, 1024 K = 1 MB, ..." + "description": "1024 Bytes = 1 KB, 1024 KB = 1 MB, ..." } ] }, diff --git a/src/data/help.json b/src/data/help.json index 35218f5ca..a4a869f5a 100644 --- a/src/data/help.json +++ b/src/data/help.json @@ -683,8 +683,8 @@ "type": "enum", "enum": { "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...", - "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...", - "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..." + "SI": "1000 Bytes = 1 kB, 1000 kB = 1 MB, ...", + "JEDEC": "1024 Bytes = 1 KB, 1024 KB = 1 MB, ..." }, "default": "IEC" } diff --git a/src/options/display.h b/src/options/display.h index ef3c21971..f96f304be 100644 --- a/src/options/display.h +++ b/src/options/display.h @@ -5,8 +5,8 @@ typedef enum __attribute__((__packed__)) FFSizeBinaryPrefixType { FF_SIZE_BINARY_PREFIX_TYPE_IEC, // 1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard) - FF_SIZE_BINARY_PREFIX_TYPE_SI, // 1000 Bytes = 1 KB, 1000 KB = 1 MB, ... - FF_SIZE_BINARY_PREFIX_TYPE_JEDEC, // 1024 Bytes = 1 kB, 1024 kB = 1 MB, ... + FF_SIZE_BINARY_PREFIX_TYPE_SI, // 1000 Bytes = 1 kB, 1000 kB = 1 MB, ... + FF_SIZE_BINARY_PREFIX_TYPE_JEDEC, // 1024 Bytes = 1 KB, 1024 KB = 1 MB, ... } FFSizeBinaryPrefixType; typedef enum __attribute__((__packed__)) FFTemperatureUnit