From bf6350c0a3c74303144770cf670f12fd01bedc7a Mon Sep 17 00:00:00 2001 From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com> Date: Sat, 5 Apr 2025 00:42:29 +0000 Subject: [PATCH] chore: return old system status with new translations --- web/assets/js/util/index.js | 4 ++++ web/html/index.html | 30 ++++------------------------ web/translation/translate.en_US.toml | 3 --- web/translation/translate.es_ES.toml | 3 --- web/translation/translate.fa_IR.toml | 3 --- web/translation/translate.id_ID.toml | 5 +---- web/translation/translate.ja_JP.toml | 3 --- web/translation/translate.pt_BR.toml | 5 +---- web/translation/translate.ru_RU.toml | 3 --- web/translation/translate.tr_TR.toml | 3 --- web/translation/translate.uk_UA.toml | 3 --- web/translation/translate.vi_VN.toml | 3 --- web/translation/translate.zh_CN.toml | 3 --- web/translation/translate.zh_TW.toml | 3 --- 14 files changed, 10 insertions(+), 64 deletions(-) diff --git a/web/assets/js/util/index.js b/web/assets/js/util/index.js index 8178e5ab..93416abe 100644 --- a/web/assets/js/util/index.js +++ b/web/assets/js/util/index.js @@ -558,6 +558,10 @@ class CPUFormatter { static cpuSpeedFormat(speed) { return speed > 1000 ? (speed / 1000).toFixed(2) + " GHz" : speed.toFixed(2) + " MHz"; } + + static cpuCoreFormat(cores) { + return cores === 1 ? "1 Core" : cores + " Cores"; + } } class TimeFormatter { diff --git a/web/html/index.html b/web/html/index.html index 07e957f7..1be7df13 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -109,11 +109,10 @@ :stroke-color="status.cpu.color" :percent="status.cpu.percent">
- {{ i18n "pages.index.cpu" }} + {{ i18n "pages.index.cpu" }}: [[ CPUFormatter.cpuCoreFormat(status.cpuCores) ]] @@ -125,14 +124,7 @@ :stroke-color="status.mem.color" :percent="status.mem.percent">
- {{ i18n "pages.index.memory" }} - - - - + {{ i18n "pages.index.memory"}}: [[ SizeFormatter.sizeFormat(status.mem.current) ]] / [[ SizeFormatter.sizeFormat(status.mem.total) ]]
@@ -144,14 +136,7 @@ :stroke-color="status.swap.color" :percent="status.swap.percent">
- {{ i18n "pages.index.swap" }} - - - - + {{ i18n "pages.index.swap" }}: [[ SizeFormatter.sizeFormat(status.swap.current) ]] / [[ SizeFormatter.sizeFormat(status.swap.total) ]]
@@ -159,14 +144,7 @@ :stroke-color="status.disk.color" :percent="status.disk.percent">
- {{ i18n "pages.index.storage" }} - - - - + {{ i18n "pages.index.storage"}}: [[ SizeFormatter.sizeFormat(status.disk.current) ]] / [[ SizeFormatter.sizeFormat(status.disk.total) ]]
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 5aecf8d8..7a166d8d 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Overview" "cpu" = "CPU" -"cpuCores" = "Cores" "logicalProcessors" = "Logical Processors" "frequency" = "Frequency" "swap" = "Swap" "storage" = "Storage" -"storageUsed" = "Used" -"storageTotal" = "Total" "memory" = "RAM" "threads" = "Threads" "xrayStatus" = "Xray" diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml index 40f29363..135919c4 100644 --- a/web/translation/translate.es_ES.toml +++ b/web/translation/translate.es_ES.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Estado del Sistema" "cpu" = "CPU" -"cpuCores" = "Núcleos" "logicalProcessors" = "Procesadores lógicos" "frequency" = "Frecuencia" "swap" = "Intercambio" "storage" = "Almacenamiento" -"storageUsed" = "Usado" -"storageTotal" = "Total" "memory" = "RAM" "threads" = "Hilos" "xrayStatus" = "Xray" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index d10dd2b8..d1b21ad0 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "نمای کلی" "cpu" = "پردازنده" -"cpuCores" = "هسته‌ها" "logicalProcessors" = "پردازنده‌های منطقی" "frequency" = "فرکانس" "swap" = "سواپ" "storage" = "ذخیره‌سازی" -"storageUsed" = "استفاده شده" -"storageTotal" = "کل" "memory" = "حافظه رم" "threads" = "رشته‌ها" "xrayStatus" = "ایکس‌ری" diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml index 4a3e96f0..2d349ae1 100644 --- a/web/translation/translate.id_ID.toml +++ b/web/translation/translate.id_ID.toml @@ -91,14 +91,11 @@ [pages.index] "title" = "Ikhtisar" -"cpu" = "CPU" -"cpuCores" = "Inti" +"cpu" = "CPU" "logicalProcessors" = "Prosesor logis" "frequency" = "Frekuensi" "swap" = "Swap" "storage" = "Penyimpanan" -"storageUsed" = "Digunakan" -"storageTotal" = "Total" "memory" = "RAM" "threads" = "Thread" "xrayStatus" = "Xray" diff --git a/web/translation/translate.ja_JP.toml b/web/translation/translate.ja_JP.toml index 4d6ed4fb..cb46541e 100644 --- a/web/translation/translate.ja_JP.toml +++ b/web/translation/translate.ja_JP.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "システムステータス" "cpu" = "CPU" -"cpuCores" = "コア" "logicalProcessors" = "論理プロセッサ" "frequency" = "周波数" "swap" = "スワップ" "storage" = "ストレージ" -"storageUsed" = "使用済み" -"storageTotal" = "合計" "memory" = "RAM" "threads" = "スレッド" "xrayStatus" = "Xray" diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml index ff270f7d..1b3eaea9 100644 --- a/web/translation/translate.pt_BR.toml +++ b/web/translation/translate.pt_BR.toml @@ -91,14 +91,11 @@ [pages.index] "title" = "Visão Geral" -"cpu" = "CPU" -"cpuCores" = "Núcleos" +"cpu" = "CPU" "logicalProcessors" = "Processadores lógicos" "frequency" = "Frequência" "swap" = "Swap" "storage" = "Armazenamento" -"storageUsed" = "Usado" -"storageTotal" = "Total" "memory" = "RAM" "threads" = "Threads" "xrayStatus" = "Xray" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index 31996c10..685fa6e2 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Статус системы" "cpu" = "ЦП" -"cpuCores" = "Ядра" "logicalProcessors" = "Логические процессоры" "frequency" = "Частота" "swap" = "Файл подкачки" "storage" = "Хранилище" -"storageUsed" = "Использовано" -"storageTotal" = "Всего" "memory" = "ОЗУ" "threads" = "Потоки" "xrayStatus" = "Xray" diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml index f33a4c25..10543f8b 100644 --- a/web/translation/translate.tr_TR.toml +++ b/web/translation/translate.tr_TR.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Genel Bakış" "cpu" = "İşlemci" -"cpuCores" = "Çekirdekler" "logicalProcessors" = "Mantıksal işlemciler" "frequency" = "Frekans" "swap" = "Takas" "storage" = "Depolama" -"storageUsed" = "Kullanılan" -"storageTotal" = "Toplam" "memory" = "RAM" "threads" = "İş parçacıkları" "xrayStatus" = "Xray" diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml index 7e501ab6..a1f4a23b 100644 --- a/web/translation/translate.uk_UA.toml +++ b/web/translation/translate.uk_UA.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Огляд" "cpu" = "ЦП" -"cpuCores" = "Ядра" "logicalProcessors" = "Логічні процесори" "frequency" = "Частота" "swap" = "Своп" "storage" = "Сховище" -"storageUsed" = "Використано" -"storageTotal" = "Всього" "memory" = "ОЗП" "threads" = "Потоки" "xrayStatus" = "Xray" diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml index 73f81319..8fc9f1c4 100644 --- a/web/translation/translate.vi_VN.toml +++ b/web/translation/translate.vi_VN.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "Trạng thái hệ thống" "cpu" = "CPU" -"cpuCores" = "Nhân" "logicalProcessors" = "Bộ xử lý logic" "frequency" = "Tần số" "swap" = "Swap" "storage" = "Lưu trữ" -"storageUsed" = "Đã dùng" -"storageTotal" = "Tổng" "memory" = "RAM" "threads" = "Luồng" "xrayStatus" = "Xray" diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml index dd3dbfed..c7619f8f 100644 --- a/web/translation/translate.zh_CN.toml +++ b/web/translation/translate.zh_CN.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "系统状态" "cpu" = "CPU" -"cpuCores" = "核心" "logicalProcessors" = "逻辑处理器" "frequency" = "频率" "swap" = "交换分区" "storage" = "存储" -"storageUsed" = "已用" -"storageTotal" = "总计" "memory" = "内存" "threads" = "线程" "xrayStatus" = "Xray" diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml index 19c136ef..27245959 100644 --- a/web/translation/translate.zh_TW.toml +++ b/web/translation/translate.zh_TW.toml @@ -92,13 +92,10 @@ [pages.index] "title" = "系統狀態" "cpu" = "CPU" -"cpuCores" = "核心" "logicalProcessors" = "邏輯處理器" "frequency" = "頻率" "swap" = "交換空間" "storage" = "儲存" -"storageUsed" = "已使用" -"storageTotal" = "總計" "memory" = "記憶體" "threads" = "執行緒" "xrayStatus" = "Xray"