diff --git a/web/assets/js/util/index.js b/web/assets/js/util/index.js index 93416abe..8178e5ab 100644 --- a/web/assets/js/util/index.js +++ b/web/assets/js/util/index.js @@ -558,10 +558,6 @@ 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 76c8642f..07e957f7 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -95,7 +95,7 @@ - + @@ -108,20 +108,31 @@ - CPU: [[ CPUFormatter.cpuCoreFormat(status.cpuCores) ]] - - - Logical Processors: [[ (status.logicalPro) ]] - Speed: [[ CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz) ]] - - + + {{ i18n "pages.index.cpu" }} + + + + {{ i18n "pages.index.cpuCores" }}: [[ (status.cpuCores) ]] + {{ i18n "pages.index.logicalProcessors" }}: [[ (status.logicalPro) ]] + {{ i18n "pages.index.frequency" }}: [[ CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz) ]] + + + - {{ i18n "pages.index.memory"}}: [[ SizeFormatter.sizeFormat(status.mem.current) ]] / [[ SizeFormatter.sizeFormat(status.mem.total) ]] + {{ i18n "pages.index.memory" }} + + + + {{ i18n "pages.index.storageUsed" }}: [[ SizeFormatter.sizeFormat(status.mem.current) ]] + {{ i18n "pages.index.storageTotal" }}: [[ SizeFormatter.sizeFormat(status.mem.total) ]] + + @@ -133,7 +144,14 @@ :stroke-color="status.swap.color" :percent="status.swap.percent"> - Swap: [[ SizeFormatter.sizeFormat(status.swap.current) ]] / [[ SizeFormatter.sizeFormat(status.swap.total) ]] + {{ i18n "pages.index.swap" }} + + + + {{ i18n "pages.index.storageUsed" }}: [[ SizeFormatter.sizeFormat(status.swap.current) ]] + {{ i18n "pages.index.storageTotal" }}: [[ SizeFormatter.sizeFormat(status.swap.total) ]] + + @@ -141,7 +159,14 @@ :stroke-color="status.disk.color" :percent="status.disk.percent"> - {{ i18n "pages.index.hard"}}: [[ SizeFormatter.sizeFormat(status.disk.current) ]] / [[ SizeFormatter.sizeFormat(status.disk.total) ]] + {{ i18n "pages.index.storage" }} + + + + {{ i18n "pages.index.storageUsed" }}: [[ SizeFormatter.sizeFormat(status.disk.current) ]] + {{ i18n "pages.index.storageTotal" }}: [[ SizeFormatter.sizeFormat(status.disk.total) ]] + + @@ -160,18 +185,25 @@ - - + + - An error occurred while running Xray - {{ i18n "pages.index.logs" }} + + + + {{ i18n "pages.index.xrayErrorPopoverTitle" }} + + + + + - [[ line ]] + [[ line ]] - + @@ -237,8 +269,8 @@ - RAM: [[ SizeFormatter.sizeFormat(status.appStats.mem) ]] - Threads: [[ status.appStats.threads ]] + {{ i18n "pages.index.memory" }}: [[ SizeFormatter.sizeFormat(status.appStats.mem) ]] + {{ i18n "pages.index.threads" }}: [[ status.appStats.threads ]] @@ -427,13 +459,6 @@ {{template "component/aCustomStatistic" .}} {{template "modals/textModal"}}
[[ line ]]