From cddcb9dadd06ddea95b1fac1df25aa7c99ed06cc Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Thu, 9 Jan 2025 14:38:21 +0500 Subject: [PATCH 01/18] NAS-132705: Fixes CPU stats widgets --- src/app/interfaces/reporting.interface.ts | 14 ++++++++++++-- .../app-resources-card.component.ts | 4 ++-- .../cpu-chart-gauge/cpu-chart-gauge.component.ts | 2 +- .../common/cpu-core-bar/cpu-core-bar.component.ts | 8 ++++++-- .../widget-cpu-usage-recent.component.ts | 2 +- .../widgets/cpu/widget-cpu/widget-cpu.component.ts | 2 +- .../widget-sys-info-active.component.ts | 2 +- .../widget-sys-info-passive.component.ts | 2 +- src/assets/i18n/ko.json | 4 ++-- 9 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/app/interfaces/reporting.interface.ts b/src/app/interfaces/reporting.interface.ts index 814c782e7dc..bb8a9f3f2fa 100644 --- a/src/app/interfaces/reporting.interface.ts +++ b/src/app/interfaces/reporting.interface.ts @@ -12,8 +12,18 @@ export interface ReportingRealtimeUpdate { } export interface AllCpusUpdate { - [cpuNumber: number]: CpuUpdate; - average: CpuUpdate; + user: number; + nice: number; + system: number; + idle: number; + iowait: number; + irq: number; + softirq: number; + steal: number; + guest: number; + guest_nice: number; + aggregated_usage: number; + [key: `core${number}_usage`]: number; temperature_celsius: number[]; } diff --git a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts index 8d21bbc5f90..b48f727a2b9 100644 --- a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts +++ b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts @@ -50,8 +50,8 @@ export class AppResourcesCardComponent implements OnInit { throttleTime(2000), untilDestroyed(this), ).subscribe((update) => { - if (update?.cpu?.average) { - this.cpuPercentage.set(parseInt(update.cpu.average.usage.toFixed(1))); + if (update?.cpu?.aggregated_usage) { + this.cpuPercentage.set(parseInt(update.cpu.aggregated_usage.toFixed(1))); } if (update?.virtual_memory) { diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.ts index f99254c4b57..b465513e0a6 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.ts @@ -23,7 +23,7 @@ export class CpuChartGaugeComponent { protected isLoading = computed(() => !this.cpuData()); protected cpuAvg: Signal = computed(() => { - const data = ['Load', parseInt(this.cpuData().average.usage.toFixed(1))]; + const data = ['Load', parseInt(this.cpuData().aggregated_usage.toFixed(1))]; return { label: false, data, diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts index ec4914000f1..9cb037b60b7 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts @@ -32,7 +32,11 @@ export class CpuCoreBarComponent { protected isLoading = computed(() => !this.cpuData()); protected coreCount = computed(() => { const cpus = Object.keys(this.cpuData()) - .map(Number) + .filter((key) => key.includes('core')) + .map((key) => { + const splitCoreTitle = key.split('_')[0]; + return Number(splitCoreTitle[splitCoreTitle.length - 1]); + }) .filter((key) => !Number.isNaN(key)); return Math.max(...cpus) + 1; @@ -118,7 +122,7 @@ export class CpuCoreBarComponent { const temperatureColumn: GaugeData = ['Temperature']; for (let i = 0; i < this.coreCount(); i++) { - const usage = parseInt(cpuData[i]?.usage?.toFixed(1) || '0'); + const usage = parseInt(cpuData[`core${i}_usage`]?.toFixed(1) || '0'); const temperature = parseInt(cpuData.temperature_celsius?.[i]?.toFixed(0) || '0'); usageColumn.push(usage); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.component.ts index 7737b3e01f0..1e80163bf5e 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.component.ts @@ -42,7 +42,7 @@ export class WidgetCpuUsageRecentComponent implements WidgetComponent { }); protected cpuUsage = toSignal(this.resources.realtimeUpdates$.pipe( - map((update) => update.fields.cpu.average), + map((update) => update.fields.cpu), tap((realtimeUpdate) => { this.cachedCpuStats.update((cachedStats) => { return [...cachedStats, [realtimeUpdate.user, realtimeUpdate.system]].slice(-60); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts index b9a3c914567..6a4321ab622 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts @@ -112,7 +112,7 @@ export class WidgetCpuComponent { const temperatureColumn: GaugeData = ['Temperature']; for (let i = 0; i < this.threadCount(); i++) { - usageColumn.push(parseInt(cpuData[i].usage.toFixed(1))); + usageColumn.push(parseInt(cpuData[`core${i}_usage`].toFixed(1))); } if (cpuData.temperature_celsius) { diff --git a/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts b/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts index 83c21346fbd..9ea09ed7863 100644 --- a/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts +++ b/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts @@ -76,7 +76,7 @@ export class WidgetSysInfoActiveComponent { map(() => { return Math.floor((Date.now() - this.startTime) / 1000); }), - ), { requireSync: true }); + )); version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename)); uptime = computed(() => this.systemInfo().uptime_seconds + this.realElapsedSeconds()); diff --git a/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts b/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts index 0e779c717d6..d9b6082e811 100644 --- a/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts +++ b/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts @@ -86,7 +86,7 @@ export class WidgetSysInfoPassiveComponent { map(() => { return Math.floor((Date.now() - this.startTime) / 1000); }), - ), { requireSync: true }); + )); isWaitingForEnabledHa = computed(() => !this.systemInfo() && !this.canFailover() && !this.isHaEnabled()); version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename)); diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index da81ba5e242..4af041602fc 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -1,6 +1,5 @@ { "": "", - "A single bandwidth limit or bandwidth limit schedule in rclone format. Separate entries by pressing Enter. Example: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. Units can be specified with a suffix of b (default), k, M, or G. See rclone --bwlimit.": "Rclone 형식의 단일 대역폭 제한 또는 대역폭 제한 일정입니다. Enter키를 눌러 항목을 구분합니다. 예시: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. 단위는 b(기본) 또는 k, M, G의 접미사로 지정할 수 있습니다. Rclone --bwlimit을(를) 참고하십시오.", "\n It looks like your session has been inactive for more than {lifetime} seconds.
\n For security reasons we will log you out at {time}.\n ": "세션의 비활성화 시간이 {lifetime}초를 넘었습니다.
보안을 위해 {time}에 로그아웃 되었습니다.", " Est. Usable Raw Capacity": " 사용 가능한 원시 용량 추정", " When the UPS Mode is set to slave. Enter the open network port number of the UPS Master system. The default port is 3493.": " UPS 모드가 슬레이브일 때, 마스터 UPS 시스템의 네트워크 포트 번호를 입력합니다. 기본 포트는 3493입니다.", @@ -93,6 +92,7 @@ "A User Access Token for Box. An access token enables Box to verify a request belongs to an authorized session. Example token: T9cE5asGnuyYCCqIZFoWjFHvNbvVqHjl.": "Box의 사용자 접근 토큰입니다. 접근 토큰을 통해 Box는 요청이 승인된 세션에 속하는지 검증합니다. 토큰 예시: T9cE5asGnuyYCCqIZFoWjFHvNbvVqHjl", "A message with verification instructions has been sent to the new email address. Please verify the email address before continuing.": "새 이메일 주소로 검증 방법을 전송했습니다. 계속하기 전에 이메일 주소를 검증해 주십시오.", "A single bandwidth limit or bandwidth limit schedule in rclone format. Separate entries by pressing Enter. Example: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. Units can be specified with a suffix of b, k (default), M, or G. See rclone --bwlimit.": "Rclone 형식의 단일 대역폭 제한 또는 대역폭 제한 일정입니다. Enter키를 눌러 항목을 구분합니다. 예시: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. 단위는 b 또는 k(기본), M, G의 접미사로 지정할 수 있습니다. rclone --bwlimit을(를) 참고하십시오.", + "A single bandwidth limit or bandwidth limit schedule in rclone format. Separate entries by pressing Enter. Example: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. Units can be specified with a suffix of b (default), k, M, or G. See rclone --bwlimit.": "Rclone 형식의 단일 대역폭 제한 또는 대역폭 제한 일정입니다. Enter키를 눌러 항목을 구분합니다. 예시: 08:00,512 12:00,10MB 13:00,512 18:00,30MB 23:00,off. 단위는 b(기본) 또는 k, M, G의 접미사로 지정할 수 있습니다. Rclone --bwlimit을(를) 참고하십시오.", "A smaller block size can reduce sequential I/O performance and space efficiency.": "작은 블록 크기는 순차 I/O 성능과 공간 효율성을 떨어뜨릴 수 있습니다.", "A stripe log VDEV may result in data loss if it fails combined with a power outage.": "스트라이프 기록 VDEV는 정전시 데이터의 손실이 발생할 수 있습니다.", "A stripe {vdevType} VDEV is highly discouraged and will result in data loss if it fails": "스트라이프 {vdevType} VDEV는 오작동시 데이터 손실의 우려가 있으므로 매우 권장하지 않습니다.", @@ -5319,4 +5319,4 @@ "{used} of {total} ({used_pct})": "{total} 중 {used} ({used_pct})", "{version} is available!": "{version}이 준비되었습니다!", "{view} on {enclosure}": "{enclousure}의 {view}" -} +} \ No newline at end of file From 4f19bfcae42f45dd165f7d5f03d18befb8b2839b Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Thu, 9 Jan 2025 14:44:54 +0500 Subject: [PATCH 02/18] NAS-132705: Removes cpu temperature related graphs --- .../dashboard/services/get-default-widgets.ts | 1 - .../pages/dashboard/types/widget.interface.ts | 1 - .../dashboard/widgets/all-widgets.constant.ts | 2 -- .../cpu-core-bar/cpu-core-bar.component.ts | 2 +- .../widget-cpu-temperature-bar.component.html | 4 --- .../widget-cpu-temperature-bar.component.scss | 20 ----------- ...dget-cpu-temperature-bar.component.spec.ts | 35 ------------------- .../widget-cpu-temperature-bar.component.ts | 24 ------------- .../widget-cpu-temperature-bar.definition.ts | 13 ------- .../widget-cpu-usage-bar.component.scss | 1 + src/assets/i18n/af.json | 1 - src/assets/i18n/ar.json | 1 - src/assets/i18n/ast.json | 1 - src/assets/i18n/az.json | 1 - src/assets/i18n/be.json | 1 - src/assets/i18n/bg.json | 1 - src/assets/i18n/bn.json | 1 - src/assets/i18n/br.json | 1 - src/assets/i18n/bs.json | 1 - src/assets/i18n/ca.json | 1 - src/assets/i18n/cs.json | 1 - src/assets/i18n/cy.json | 1 - src/assets/i18n/da.json | 1 - src/assets/i18n/de.json | 1 - src/assets/i18n/dsb.json | 1 - src/assets/i18n/el.json | 1 - src/assets/i18n/en-au.json | 1 - src/assets/i18n/en-gb.json | 1 - src/assets/i18n/en.json | 1 - src/assets/i18n/eo.json | 1 - src/assets/i18n/es-ar.json | 1 - src/assets/i18n/es-co.json | 1 - src/assets/i18n/es-mx.json | 1 - src/assets/i18n/es-ni.json | 1 - src/assets/i18n/es-ve.json | 1 - src/assets/i18n/es.json | 1 - src/assets/i18n/et.json | 1 - src/assets/i18n/eu.json | 1 - src/assets/i18n/fa.json | 1 - src/assets/i18n/fi.json | 1 - src/assets/i18n/fr.json | 1 - src/assets/i18n/fy.json | 1 - src/assets/i18n/ga.json | 1 - src/assets/i18n/gd.json | 1 - src/assets/i18n/gl.json | 1 - src/assets/i18n/he.json | 1 - src/assets/i18n/hi.json | 1 - src/assets/i18n/hr.json | 1 - src/assets/i18n/hsb.json | 1 - src/assets/i18n/hu.json | 1 - src/assets/i18n/ia.json | 1 - src/assets/i18n/id.json | 1 - src/assets/i18n/io.json | 1 - src/assets/i18n/is.json | 1 - src/assets/i18n/it.json | 1 - src/assets/i18n/ja.json | 1 - src/assets/i18n/ka.json | 1 - src/assets/i18n/kk.json | 1 - src/assets/i18n/km.json | 1 - src/assets/i18n/kn.json | 1 - src/assets/i18n/ko.json | 1 - src/assets/i18n/lb.json | 1 - src/assets/i18n/lt.json | 1 - src/assets/i18n/lv.json | 1 - src/assets/i18n/mk.json | 1 - src/assets/i18n/ml.json | 1 - src/assets/i18n/mn.json | 1 - src/assets/i18n/mr.json | 1 - src/assets/i18n/my.json | 1 - src/assets/i18n/nb.json | 1 - src/assets/i18n/ne.json | 1 - src/assets/i18n/nl.json | 1 - src/assets/i18n/nn.json | 1 - src/assets/i18n/os.json | 1 - src/assets/i18n/pa.json | 1 - src/assets/i18n/pl.json | 1 - src/assets/i18n/pt-br.json | 1 - src/assets/i18n/pt.json | 1 - src/assets/i18n/ro.json | 1 - src/assets/i18n/ru.json | 1 - src/assets/i18n/sk.json | 1 - src/assets/i18n/sl.json | 1 - src/assets/i18n/sq.json | 1 - src/assets/i18n/sr-latn.json | 1 - src/assets/i18n/sr.json | 1 - src/assets/i18n/strings.json | 1 - src/assets/i18n/sv.json | 1 - src/assets/i18n/sw.json | 1 - src/assets/i18n/ta.json | 1 - src/assets/i18n/te.json | 1 - src/assets/i18n/th.json | 1 - src/assets/i18n/tr.json | 1 - src/assets/i18n/tt.json | 1 - src/assets/i18n/udm.json | 1 - src/assets/i18n/uk.json | 1 - src/assets/i18n/vi.json | 1 - src/assets/i18n/zh-hans.json | 1 - src/assets/i18n/zh-hant.json | 1 - 98 files changed, 2 insertions(+), 189 deletions(-) delete mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.html delete mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.scss delete mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.spec.ts delete mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.ts delete mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition.ts diff --git a/src/app/pages/dashboard/services/get-default-widgets.ts b/src/app/pages/dashboard/services/get-default-widgets.ts index 7ca9981f473..f56a615dd1f 100644 --- a/src/app/pages/dashboard/services/get-default-widgets.ts +++ b/src/app/pages/dashboard/services/get-default-widgets.ts @@ -18,7 +18,6 @@ const defaultWidgets: WidgetGroup[] = [ layout: WidgetGroupLayout.Halves, slots: [ { type: WidgetType.CpuUsageBar }, - { type: WidgetType.CpuTemperatureBar }, ], }, { diff --git a/src/app/pages/dashboard/types/widget.interface.ts b/src/app/pages/dashboard/types/widget.interface.ts index 0c6161fc2d4..7a638976d99 100644 --- a/src/app/pages/dashboard/types/widget.interface.ts +++ b/src/app/pages/dashboard/types/widget.interface.ts @@ -21,7 +21,6 @@ export enum WidgetType { CpuUsageGauge = 'cpu-usage-gauge', CpuUsageRecent = 'cpu-usage-recent', CpuUsageBar = 'cpu-usage-bar', - CpuTemperatureBar = 'cpu-temperature-bar', Storage = 'storage', SystemInfoActive = 'system-info-active', SystemInfoPassive = 'system-info-passive', diff --git a/src/app/pages/dashboard/widgets/all-widgets.constant.ts b/src/app/pages/dashboard/widgets/all-widgets.constant.ts index eec99dc9396..650fe694bbb 100644 --- a/src/app/pages/dashboard/widgets/all-widgets.constant.ts +++ b/src/app/pages/dashboard/widgets/all-widgets.constant.ts @@ -7,7 +7,6 @@ import { appNetworkWidget } from 'app/pages/dashboard/widgets/apps/widget-app-ne import { backupTasksWidget } from 'app/pages/dashboard/widgets/backup/widget-backup/widget-backup.definition'; import { cpuWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.definition'; import { cpuModelWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-model/widget-cpu-model.definition'; -import { cpuTemperatureBarWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition'; import { cpuUsageBarWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.definition'; import { cpuUsageGaugeWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-gauge/widget-cpu-usage-gauge.definition'; import { cpuUsageRecentWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.definition'; @@ -59,7 +58,6 @@ export const widgetRegistry = { [WidgetType.CpuUsageGauge]: cpuUsageGaugeWidget, [WidgetType.CpuUsageRecent]: cpuUsageRecentWidget, [WidgetType.CpuUsageBar]: cpuUsageBarWidget, - [WidgetType.CpuTemperatureBar]: cpuTemperatureBarWidget, [WidgetType.Storage]: storageWidget, [WidgetType.SystemInfoActive]: systemInfoActiveWidget, [WidgetType.SystemInfoPassive]: systemInfoPassiveWidget, diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts index 9cb037b60b7..6ffd2e9409a 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts @@ -32,7 +32,7 @@ export class CpuCoreBarComponent { protected isLoading = computed(() => !this.cpuData()); protected coreCount = computed(() => { const cpus = Object.keys(this.cpuData()) - .filter((key) => key.includes('core')) + .filter((key) => key.startsWith('core')) .map((key) => { const splitCoreTitle = key.split('_')[0]; return Number(splitCoreTitle[splitCoreTitle.length - 1]); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.html b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.html deleted file mode 100644 index f9262cdd9fe..00000000000 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

{{ name | translate }}

- -
diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.scss b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.scss deleted file mode 100644 index 107f22c204c..00000000000 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -.wrapper { - background-color: var(--bg2); - border: 1px solid var(--lines); - color: var(--fg2); - height: 100%; - padding-left: 15px; - padding-right: 15px; - width: 100%; - - .bar { - display: flex; - height: 150px; - width: 100%; - } - - h3 { - padding: 16px 0 0; - width: 100%; - } -} diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.spec.ts deleted file mode 100644 index c921dc5c154..00000000000 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.spec.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { createComponentFactory, Spectator } from '@ngneat/spectator/jest'; -import { MockComponent } from 'ng-mocks'; -import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader'; -import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; -import { CpuCoreBarComponent } from 'app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component'; -import { WidgetCpuTemperatureBarComponent } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component'; - -describe('WidgetCpuTemperatureBarComponent', () => { - let spectator: Spectator; - const createComponent = createComponentFactory({ - component: WidgetCpuTemperatureBarComponent, - imports: [ - NgxSkeletonLoaderComponent, - MockComponent(CpuCoreBarComponent), - ], - }); - - beforeEach(() => { - spectator = createComponent({ - props: { - size: SlotSize.Half, - }, - }); - }); - - it('shows title', () => { - expect(spectator.query('h3')).toHaveText('CPU Temperature Per Core'); - }); - - it('shows cpu core bar without usage', () => { - const bar = spectator.query(CpuCoreBarComponent)!; - expect(bar).not.toBeNull(); - expect(bar.hideUsage).toBe(true); - }); -}); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.ts deleted file mode 100644 index cefd7181729..00000000000 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { - ChangeDetectionStrategy, Component, input, -} from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; -import { WidgetComponent } from 'app/pages/dashboard/types/widget-component.interface'; -import { - SlotSize, -} from 'app/pages/dashboard/types/widget.interface'; -import { CpuCoreBarComponent } from 'app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component'; -import { cpuTemperatureBarWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition'; - -@Component({ - selector: 'ix-widget-cpu-temperature-bar', - templateUrl: './widget-cpu-temperature-bar.component.html', - styleUrls: ['./widget-cpu-temperature-bar.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [CpuCoreBarComponent, TranslateModule], -}) -export class WidgetCpuTemperatureBarComponent implements WidgetComponent { - size = input.required(); - - readonly name = cpuTemperatureBarWidget.name; -} diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition.ts deleted file mode 100644 index 8dbe4ba175f..00000000000 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.definition.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { marker as T } from '@biesbjerg/ngx-translate-extract-marker'; -import { WidgetCategory } from 'app/pages/dashboard/types/widget-category.enum'; -import { dashboardWidget } from 'app/pages/dashboard/types/widget-component.interface'; -import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; -import { WidgetCpuTemperatureBarComponent } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature-bar/widget-cpu-temperature-bar.component'; - -export const cpuTemperatureBarWidget = dashboardWidget({ - name: T('CPU Temperature Per Core'), - supportedSizes: [SlotSize.Half], - category: WidgetCategory.Cpu, - component: WidgetCpuTemperatureBarComponent, - settingsComponent: null, -}); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.scss b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.scss index 107f22c204c..12f7e195dc0 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.scss +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.scss @@ -14,6 +14,7 @@ } h3 { + margin-bottom: 10px; padding: 16px 0 0; width: 100%; } diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/af.json +++ b/src/assets/i18n/af.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ast.json +++ b/src/assets/i18n/ast.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/be.json +++ b/src/assets/i18n/be.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/bg.json +++ b/src/assets/i18n/bg.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/bn.json +++ b/src/assets/i18n/bn.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/br.json +++ b/src/assets/i18n/br.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/bs.json +++ b/src/assets/i18n/bs.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ca.json +++ b/src/assets/i18n/ca.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json index 955e4dbb9e8..ad7aeb7ab61 100644 --- a/src/assets/i18n/cs.json +++ b/src/assets/i18n/cs.json @@ -387,7 +387,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/cy.json +++ b/src/assets/i18n/cy.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/da.json +++ b/src/assets/i18n/da.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 62ea4e126fc..846c42e8a0c 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -500,7 +500,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/dsb.json +++ b/src/assets/i18n/dsb.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/el.json +++ b/src/assets/i18n/el.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/en-au.json +++ b/src/assets/i18n/en-au.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/en-gb.json +++ b/src/assets/i18n/en-gb.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/eo.json +++ b/src/assets/i18n/eo.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json index 7fc047c7d5c..16efa61a338 100644 --- a/src/assets/i18n/es-ar.json +++ b/src/assets/i18n/es-ar.json @@ -776,7 +776,6 @@ "CPU Recent Usage": "Uso reciente de CPU", "CPU Reports": "Informes de CPU", "CPU Stats": "Estadísticas de CPU", - "CPU Temperature Per Core": "Temperatura de la CPU por núcleo", "CPU Usage": "Uso de CPU", "CPU Usage Per Core": "Uso de CPU por núcleo", "CPU Utilization": "Utilización de CPU", diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/es-co.json +++ b/src/assets/i18n/es-co.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/es-mx.json +++ b/src/assets/i18n/es-mx.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/es-ni.json +++ b/src/assets/i18n/es-ni.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/es-ve.json +++ b/src/assets/i18n/es-ve.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index e1841a381db..d246b1b0603 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -627,7 +627,6 @@ "CPU Model": "", "CPU Recent Usage": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/et.json +++ b/src/assets/i18n/et.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/eu.json +++ b/src/assets/i18n/eu.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/fa.json +++ b/src/assets/i18n/fa.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/fi.json +++ b/src/assets/i18n/fi.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 7def522c597..dde76662da8 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1482,7 +1482,6 @@ "CPU Recent Usage": "Utilisation récente du CPU", "CPU Reports": "Rapports CPU", "CPU Stats": "Stats CPU", - "CPU Temperature Per Core": "Température du CPU par core", "CPU Usage": "Utilisation CPU", "CPU Usage Per Core": "Utilisation du CPU par core", "CPU Utilization": "Utilisation CPU", diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/fy.json +++ b/src/assets/i18n/fy.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json index 2b363159183..d6e6db51023 100644 --- a/src/assets/i18n/ga.json +++ b/src/assets/i18n/ga.json @@ -57,7 +57,6 @@ "Browse Catalog": "", "CPU & Memory": "", "CPU Overview": "", - "CPU Temperature Per Core": "", "CPU Usage Per Core": "", "Cannot be enabled for built-in users.": "", "Change": "", diff --git a/src/assets/i18n/gd.json b/src/assets/i18n/gd.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/gd.json +++ b/src/assets/i18n/gd.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/gl.json b/src/assets/i18n/gl.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/gl.json +++ b/src/assets/i18n/gl.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/he.json +++ b/src/assets/i18n/he.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/hi.json b/src/assets/i18n/hi.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/hi.json +++ b/src/assets/i18n/hi.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/hr.json b/src/assets/i18n/hr.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/hr.json +++ b/src/assets/i18n/hr.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/hsb.json b/src/assets/i18n/hsb.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/hsb.json +++ b/src/assets/i18n/hsb.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/hu.json b/src/assets/i18n/hu.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/hu.json +++ b/src/assets/i18n/hu.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ia.json b/src/assets/i18n/ia.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ia.json +++ b/src/assets/i18n/ia.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/id.json b/src/assets/i18n/id.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/id.json +++ b/src/assets/i18n/id.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/io.json b/src/assets/i18n/io.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/io.json +++ b/src/assets/i18n/io.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/is.json b/src/assets/i18n/is.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/is.json +++ b/src/assets/i18n/is.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index a4c9d8854f8..2fb62f68607 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -622,7 +622,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json index 9f7a1ad615e..8f164d81b40 100644 --- a/src/assets/i18n/ja.json +++ b/src/assets/i18n/ja.json @@ -584,7 +584,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ka.json b/src/assets/i18n/ka.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ka.json +++ b/src/assets/i18n/ka.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/km.json b/src/assets/i18n/km.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/km.json +++ b/src/assets/i18n/km.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/kn.json b/src/assets/i18n/kn.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/kn.json +++ b/src/assets/i18n/kn.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index 4af041602fc..0911e314b9e 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -697,7 +697,6 @@ "CPU Recent Usage": "최근 CPU 사용량", "CPU Reports": "CPU 보고서", "CPU Stats": "CPU 통계", - "CPU Temperature Per Core": "CPU 코어별 온도", "CPU Usage": "CPU 사용량", "CPU Usage Per Core": "CPU 코어별 사용량", "CPU Utilization": "CPU 활용률", diff --git a/src/assets/i18n/lb.json b/src/assets/i18n/lb.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/lb.json +++ b/src/assets/i18n/lb.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/lt.json b/src/assets/i18n/lt.json index 803ba15f603..5f60432145b 100644 --- a/src/assets/i18n/lt.json +++ b/src/assets/i18n/lt.json @@ -683,7 +683,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/lv.json b/src/assets/i18n/lv.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/lv.json +++ b/src/assets/i18n/lv.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/mk.json b/src/assets/i18n/mk.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/mk.json +++ b/src/assets/i18n/mk.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ml.json b/src/assets/i18n/ml.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ml.json +++ b/src/assets/i18n/ml.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/mn.json b/src/assets/i18n/mn.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/mn.json +++ b/src/assets/i18n/mn.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/mr.json b/src/assets/i18n/mr.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/mr.json +++ b/src/assets/i18n/mr.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/my.json b/src/assets/i18n/my.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/my.json +++ b/src/assets/i18n/my.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/nb.json b/src/assets/i18n/nb.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/nb.json +++ b/src/assets/i18n/nb.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ne.json b/src/assets/i18n/ne.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ne.json +++ b/src/assets/i18n/ne.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json index 13280614e43..fd1c7cea357 100644 --- a/src/assets/i18n/nl.json +++ b/src/assets/i18n/nl.json @@ -716,7 +716,6 @@ "CPU Recent Usage": "CPU-recent gebruik", "CPU Reports": "CPU rapportages", "CPU Stats": "CPU-statistieken", - "CPU Temperature Per Core": "CPU-temperatuur per core", "CPU Usage": "CPU belasting", "CPU Usage Per Core": "CPU-gebruik per core", "CPU Utilization": "CPU-gebruik", diff --git a/src/assets/i18n/nn.json b/src/assets/i18n/nn.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/nn.json +++ b/src/assets/i18n/nn.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/os.json b/src/assets/i18n/os.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/os.json +++ b/src/assets/i18n/os.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/pa.json b/src/assets/i18n/pa.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/pa.json +++ b/src/assets/i18n/pa.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/pl.json b/src/assets/i18n/pl.json index daf9e6f52f2..ecccf4ee6fe 100644 --- a/src/assets/i18n/pl.json +++ b/src/assets/i18n/pl.json @@ -642,7 +642,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/pt-br.json b/src/assets/i18n/pt-br.json index 6f4f652c439..5e0b10ea7f9 100644 --- a/src/assets/i18n/pt-br.json +++ b/src/assets/i18n/pt-br.json @@ -631,7 +631,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 698f58f35d7..84bd20386e9 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -277,7 +277,6 @@ "CPU Overview": "", "CPU Recent Usage": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage Per Core": "", "CPU Utilization": "", "CSR": "", diff --git a/src/assets/i18n/ro.json b/src/assets/i18n/ro.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ro.json +++ b/src/assets/i18n/ro.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 02c5e847cb5..bd6a683bf82 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -437,7 +437,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sk.json b/src/assets/i18n/sk.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sk.json +++ b/src/assets/i18n/sk.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sl.json b/src/assets/i18n/sl.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sl.json +++ b/src/assets/i18n/sl.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sq.json b/src/assets/i18n/sq.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sq.json +++ b/src/assets/i18n/sq.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sr-latn.json b/src/assets/i18n/sr-latn.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sr-latn.json +++ b/src/assets/i18n/sr-latn.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/strings.json b/src/assets/i18n/strings.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/strings.json +++ b/src/assets/i18n/strings.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/sw.json b/src/assets/i18n/sw.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/sw.json +++ b/src/assets/i18n/sw.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/ta.json b/src/assets/i18n/ta.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/ta.json +++ b/src/assets/i18n/ta.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/te.json b/src/assets/i18n/te.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/te.json +++ b/src/assets/i18n/te.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/th.json b/src/assets/i18n/th.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/th.json +++ b/src/assets/i18n/th.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/tt.json b/src/assets/i18n/tt.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/tt.json +++ b/src/assets/i18n/tt.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/udm.json b/src/assets/i18n/udm.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/udm.json +++ b/src/assets/i18n/udm.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 30fb85ac481..ec05f0e635a 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -278,7 +278,6 @@ "CPU Overview": "", "CPU Recent Usage": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage Per Core": "", "CPU Utilization": "", "CSR": "", diff --git a/src/assets/i18n/vi.json b/src/assets/i18n/vi.json index eb44599e54b..3110b767c5e 100644 --- a/src/assets/i18n/vi.json +++ b/src/assets/i18n/vi.json @@ -689,7 +689,6 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", - "CPU Temperature Per Core": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", diff --git a/src/assets/i18n/zh-hans.json b/src/assets/i18n/zh-hans.json index 0d9fee6e84d..b5b020d9412 100644 --- a/src/assets/i18n/zh-hans.json +++ b/src/assets/i18n/zh-hans.json @@ -702,7 +702,6 @@ "CPU Recent Usage": "CPU 最近使用情况", "CPU Reports": "CPU 报告", "CPU Stats": "CPU 统计信息", - "CPU Temperature Per Core": "每个核心的CPU温度", "CPU Usage": "处理器使用率", "CPU Usage Per Core": "每核CPU使用率", "CPU Utilization": "CPU 利用率", diff --git a/src/assets/i18n/zh-hant.json b/src/assets/i18n/zh-hant.json index 0e70b91cd1b..b4bf6c45ae8 100644 --- a/src/assets/i18n/zh-hant.json +++ b/src/assets/i18n/zh-hant.json @@ -3986,7 +3986,6 @@ "CPU Recent Usage": "CPU 近期使用量", "CPU Reports": "CPU 報表", "CPU Stats": "CPU 統計", - "CPU Temperature Per Core": "各核心 CPU 溫度", "CPU Usage": "CPU 使用量", "CPU Usage Per Core": "各核心 CPU 使用量", "CPU Utilization": "CPU 使用率", From 7a0839e4c745f706227c490624c82625092025b0 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Thu, 9 Jan 2025 14:51:59 +0500 Subject: [PATCH 03/18] NAS-132705: Revert changes --- .../widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts | 2 +- .../widget-sys-info-active/widget-sys-info-active.component.ts | 2 +- .../widget-sys-info-passive.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts index 6ffd2e9409a..89e15ff4cbe 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts @@ -35,7 +35,7 @@ export class CpuCoreBarComponent { .filter((key) => key.startsWith('core')) .map((key) => { const splitCoreTitle = key.split('_')[0]; - return Number(splitCoreTitle[splitCoreTitle.length - 1]); + return Number(splitCoreTitle.replace('core', '')); }) .filter((key) => !Number.isNaN(key)); diff --git a/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts b/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts index 9ea09ed7863..83c21346fbd 100644 --- a/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts +++ b/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts @@ -76,7 +76,7 @@ export class WidgetSysInfoActiveComponent { map(() => { return Math.floor((Date.now() - this.startTime) / 1000); }), - )); + ), { requireSync: true }); version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename)); uptime = computed(() => this.systemInfo().uptime_seconds + this.realElapsedSeconds()); diff --git a/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts b/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts index d9b6082e811..0e779c717d6 100644 --- a/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts +++ b/src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts @@ -86,7 +86,7 @@ export class WidgetSysInfoPassiveComponent { map(() => { return Math.floor((Date.now() - this.startTime) / 1000); }), - )); + ), { requireSync: true }); isWaitingForEnabledHa = computed(() => !this.systemInfo() && !this.canFailover() && !this.isHaEnabled()); version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename)); From ff3cc3ddade4c097f5a5973bdb1052378e1406dc Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Tue, 14 Jan 2025 00:49:01 +0500 Subject: [PATCH 04/18] NAS-132705: Fix info widgets --- package.json | 3 ++- src/app/pages/dashboard/services/widget-resources.service.ts | 4 ++-- yarn.lock | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 38b0b132a7d..e8099974087 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "@lezer/common": "~1.2.1", "@lezer/generator": "~1.7.1", "@lezer/lr": "~1.4.2", + "@marijn/find-cluster-break": "~1.0.2", "@material-design-icons/svg": "~0.14.13", "@mdi/svg": "~7.4.47", "@messageformat/core": "~3.3.0", @@ -215,4 +216,4 @@ "devDependencies": { "@angular/build": "^19.0.3" } -} \ No newline at end of file +} diff --git a/src/app/pages/dashboard/services/widget-resources.service.ts b/src/app/pages/dashboard/services/widget-resources.service.ts index 5276c8ff0a9..e0fd40a3a31 100644 --- a/src/app/pages/dashboard/services/widget-resources.service.ts +++ b/src/app/pages/dashboard/services/widget-resources.service.ts @@ -4,7 +4,7 @@ import { subHours, subMinutes } from 'date-fns'; import { Observable, Subject, catchError, combineLatestWith, debounceTime, filter, - forkJoin, map, of, repeat, shareReplay, switchMap, take, throttleTime, timer, + forkJoin, map, of, repeat, shareReplay, startWith, switchMap, take, throttleTime, timer, } from 'rxjs'; import { SystemUpdateStatus } from 'app/enums/system-update.enum'; import { LoadingState, toLoadingState } from 'app/helpers/operators/to-loading-state.helper'; @@ -36,7 +36,7 @@ import { waitForSystemInfo } from 'app/store/system-info/system-info.selectors'; export class WidgetResourcesService { readonly realtimeUpdates$ = this.api.subscribe('reporting.realtime'); - readonly refreshInterval$ = timer(0, 5000); + readonly refreshInterval$ = timer(0, 5000).pipe(startWith(0)); private readonly triggerRefreshSystemInfo$ = new Subject(); readonly backups$ = forkJoin([ diff --git a/yarn.lock b/yarn.lock index 515f0db03b2..737d923f23a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3417,6 +3417,11 @@ resolved "https://registry.yarnpkg.com/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.1.5.tgz#d748edd97f62cace4f716395cc1b8807616ecdae" integrity sha512-KYar6W8nraZfSJspcK7Kp7hdj238X/FNauYbZyrqPBrtsXI1hvI4/KcRcRGP50aQoV7fkKDyJERlrQGMGTZUsA== +"@marijn/find-cluster-break@~1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8" + integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g== + "@markuplint/create-rule-helper@2.3.3": version "2.3.3" resolved "https://registry.yarnpkg.com/@markuplint/create-rule-helper/-/create-rule-helper-2.3.3.tgz#9385e63f707a9ddc1aacf5d0c4b9c94f30bef070" From 1e2cec5c989926afb56fd39b20b86fd139c9f793 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Tue, 14 Jan 2025 01:43:06 +0500 Subject: [PATCH 05/18] NAS-132705: Fixed memory stats --- .../events/memory-stats-event.interface.ts | 3 -- src/app/interfaces/reporting.interface.ts | 46 ++----------------- .../app-resources-card.component.ts | 14 ++---- .../widget-cpu.component.spec.ts | 1 - .../cpu-core-bar.component.spec.ts | 1 - .../cpu-core-bar/cpu-core-bar.component.ts | 12 +---- .../widget-cpu-usage-bar.component.html | 2 +- .../widget-cpu-usage-bar.component.spec.ts | 1 - .../widget-memory.component.html | 2 +- .../widget-memory/widget-memory.component.ts | 8 ++-- tsconfig.strictNullChecks.json | 1 - 11 files changed, 16 insertions(+), 75 deletions(-) delete mode 100644 src/app/interfaces/events/memory-stats-event.interface.ts diff --git a/src/app/interfaces/events/memory-stats-event.interface.ts b/src/app/interfaces/events/memory-stats-event.interface.ts deleted file mode 100644 index dbe0ed2144b..00000000000 --- a/src/app/interfaces/events/memory-stats-event.interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { VirtualMemoryUpdate } from 'app/interfaces/reporting.interface'; - -export type MemoryStatsEventData = VirtualMemoryUpdate & { arc_size?: number }; diff --git a/src/app/interfaces/reporting.interface.ts b/src/app/interfaces/reporting.interface.ts index bb8a9f3f2fa..1ae2c3b69f9 100644 --- a/src/app/interfaces/reporting.interface.ts +++ b/src/app/interfaces/reporting.interface.ts @@ -7,8 +7,6 @@ export interface ReportingRealtimeUpdate { disks: DisksUpdate; interfaces: AllNetworkInterfacesUpdate; memory: MemoryUpdate; - virtual_memory: VirtualMemoryUpdate; - zfs: ZfsUpdate; } export interface AllCpusUpdate { @@ -59,47 +57,11 @@ export interface NetworkInterfaceUpdate { } export interface MemoryUpdate { - classes: { - apps: number; - arc: number; - buffers: number; - cache: number; - page_tables: number; - slab_cache: number; - swap_cache: number; - unused: number; - }; - extra: { - active: number; - committed: number; - inactive: number; - mapped: number; - vmalloc_used: number; - }; - swap: { - total: number; - used: number; - }; -} - -export interface VirtualMemoryUpdate { - active: number; - available: number; - buffers: number; - cached: number; - free: number; - inactive: number; - percent: number; - shared: number; - slab: number; - total: number; - used: number; -} - -export interface ZfsUpdate { - arc_max_size: number; arc_size: number; - cache_hit_ratio: number; + arc_free_memory: number; + arc_available_memory: number; + physical_memory_total: number; + physical_memory_available: number; } export interface ReportingQueryOptions { diff --git a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts index b48f727a2b9..e1ed0b4b726 100644 --- a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts +++ b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.ts @@ -8,7 +8,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { map, throttleTime } from 'rxjs'; -import { MemoryStatsEventData } from 'app/interfaces/events/memory-stats-event.interface'; +import { MemoryUpdate } from 'app/interfaces/reporting.interface'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { ApiService } from 'app/modules/websocket/api.service'; import { DockerStore } from 'app/pages/apps/store/docker.store'; @@ -54,16 +54,12 @@ export class AppResourcesCardComponent implements OnInit { this.cpuPercentage.set(parseInt(update.cpu.aggregated_usage.toFixed(1))); } - if (update?.virtual_memory) { - const memStats: MemoryStatsEventData = { ...update.virtual_memory }; + if (update?.memory) { + const memStats: MemoryUpdate = { ...update.memory }; - // eslint-disable-next-line @typescript-eslint/prefer-optional-chain - if (update.zfs && update.zfs.arc_size !== null) { - memStats.arc_size = update.zfs.arc_size; - } - const services = memStats.total - memStats.free - memStats.arc_size; + const services = memStats.physical_memory_total - memStats.physical_memory_available - memStats.arc_size; this.memoryUsed.set(memStats.arc_size + services); - this.memoryTotal.set(memStats.total); + this.memoryTotal.set(memStats.physical_memory_total); } }); } diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts index 782436d5735..c53e8b7dd13 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts @@ -28,7 +28,6 @@ describe('CpuChartGaugeComponent', () => { 2: { usage: 70 }, 3: { usage: 9 }, average: { usage: 75 }, - temperature_celsius: [31, 83], }, }, }), diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts index 0b38712ae72..f69c254b790 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts @@ -30,7 +30,6 @@ describe('CpuCoreBarComponent', () => { 2: { usage: 70 }, 3: { usage: 9 }, average: { usage: 75 }, - temperature_celsius: [31, 83], }, }, }), diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts index 89e15ff4cbe..6edfaf13fb4 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, Component, computed, - input, } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { TinyColor } from '@ctrl/tinycolor'; @@ -22,9 +21,6 @@ import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-reso imports: [NgxSkeletonLoaderModule, BaseChartDirective], }) export class CpuCoreBarComponent { - hideTemperature = input(false); - hideUsage = input(false); - protected cpuData = toSignal(this.resources.realtimeUpdates$.pipe( map((update) => update.fields.cpu), )); @@ -119,19 +115,13 @@ export class CpuCoreBarComponent { protected parseCpuData(cpuData: AllCpusUpdate): GaugeData[] { const usageColumn: GaugeData = ['Usage']; - const temperatureColumn: GaugeData = ['Temperature']; for (let i = 0; i < this.coreCount(); i++) { const usage = parseInt(cpuData[`core${i}_usage`]?.toFixed(1) || '0'); - const temperature = parseInt(cpuData.temperature_celsius?.[i]?.toFixed(0) || '0'); usageColumn.push(usage); - temperatureColumn.push(temperature); } - return [ - this.hideUsage() ? [] : usageColumn, - this.hideTemperature() ? [] : temperatureColumn, - ]; + return [usageColumn]; } } diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.html b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.html index 1c5f4c08da5..6d5b70fa8f3 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.html +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.html @@ -1,4 +1,4 @@

{{ name | translate }}

- +
diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.spec.ts index 5ab20e39b3a..d9fd6e835d4 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.component.spec.ts @@ -30,6 +30,5 @@ describe('WidgetCpuUsageBarComponent', () => { it('shows cpu core bar without temperature', () => { const bar = spectator.query(CpuCoreBarComponent)!; expect(bar).not.toBeNull(); - expect(bar.hideTemperature).toBe(true); }); }); diff --git a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.html b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.html index d9dcb0ffbe0..7ff0ad9caa4 100644 --- a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.html +++ b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.html @@ -24,7 +24,7 @@

[theme]="{ height: 42, background: 'var(--alt-bg2)', opacity: 0.25 }" > } @else { - {{ formatUnit(memory().total) }} + {{ formatUnit(memory().physical_memory_total) }} GiB }

diff --git a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.ts b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.ts index 9dcaf9a707f..aeb30865d99 100644 --- a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.ts +++ b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.ts @@ -49,27 +49,27 @@ export class WidgetMemoryComponent { protected ecc$ = this.store$.pipe(waitForSystemInfo, map((sysInfo) => sysInfo.ecc_memory)); protected memory = toSignal(this.resources.realtimeUpdates$.pipe( - map((update) => update.fields.virtual_memory), + map((update) => update.fields.memory), )); protected isLoading = computed(() => !this.memory()); protected arcSize = toSignal(this.resources.realtimeUpdates$.pipe( - map((update) => update.fields.zfs?.arc_size), + map((update) => update.fields.memory?.arc_size), )); stats = computed(() => { const colors = [0, 1, 2].map((i) => this.theme.getRgbBackgroundColorByIndex(i)); let services: number | undefined; if (!this.isLoading()) { - services = this.memory().total - this.memory().free - this.arcSize(); + services = this.memory().physical_memory_total - this.memory().physical_memory_available - this.arcSize(); } return [ { name: this.translate.instant('Free'), color: colors[0], - value: this.memory()?.free, + value: this.memory()?.physical_memory_available, }, { name: this.translate.instant('ZFS Cache'), diff --git a/tsconfig.strictNullChecks.json b/tsconfig.strictNullChecks.json index d708a8359c2..39eef7d2eb6 100644 --- a/tsconfig.strictNullChecks.json +++ b/tsconfig.strictNullChecks.json @@ -298,7 +298,6 @@ "./src/app/interfaces/empty-config.interface.ts", "./src/app/interfaces/enclosure.interface.ts", "./src/app/interfaces/events/ha-status-event.interface.ts", - "./src/app/interfaces/events/memory-stats-event.interface.ts", "./src/app/interfaces/events/sidenav-status-event.interface.ts", "./src/app/interfaces/export-params.interface.ts", "./src/app/interfaces/failover-disabled-reasons.interface.ts", From 4b95e27023adddc493eb7a6f002eb0000a403be7 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Tue, 14 Jan 2025 01:48:11 +0500 Subject: [PATCH 06/18] NAS-132705: Remove default widget to remove empty space --- src/app/pages/dashboard/services/get-default-widgets.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/app/pages/dashboard/services/get-default-widgets.ts b/src/app/pages/dashboard/services/get-default-widgets.ts index f56a615dd1f..40e1a97b51b 100644 --- a/src/app/pages/dashboard/services/get-default-widgets.ts +++ b/src/app/pages/dashboard/services/get-default-widgets.ts @@ -14,12 +14,6 @@ const defaultWidgets: WidgetGroup[] = [ { type: WidgetType.SystemInfoPassive }, ], }, - { - layout: WidgetGroupLayout.Halves, - slots: [ - { type: WidgetType.CpuUsageBar }, - ], - }, { layout: WidgetGroupLayout.QuartersAndHalf, slots: [ From 72e9ee858b7c964e36819b84d4571506c06324d6 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 01:31:54 +0500 Subject: [PATCH 07/18] Update yarn.lock --- yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 737d923f23a..515f0db03b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3417,11 +3417,6 @@ resolved "https://registry.yarnpkg.com/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.1.5.tgz#d748edd97f62cace4f716395cc1b8807616ecdae" integrity sha512-KYar6W8nraZfSJspcK7Kp7hdj238X/FNauYbZyrqPBrtsXI1hvI4/KcRcRGP50aQoV7fkKDyJERlrQGMGTZUsA== -"@marijn/find-cluster-break@~1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8" - integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g== - "@markuplint/create-rule-helper@2.3.3": version "2.3.3" resolved "https://registry.yarnpkg.com/@markuplint/create-rule-helper/-/create-rule-helper-2.3.3.tgz#9385e63f707a9ddc1aacf5d0c4b9c94f30bef070" From 25592a472489bcc5a5822a2a85af0e5ca3d196ca Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 01:33:41 +0500 Subject: [PATCH 08/18] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index e8099974087..784001af400 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,6 @@ "@lezer/common": "~1.2.1", "@lezer/generator": "~1.7.1", "@lezer/lr": "~1.4.2", - "@marijn/find-cluster-break": "~1.0.2", "@material-design-icons/svg": "~0.14.13", "@mdi/svg": "~7.4.47", "@messageformat/core": "~3.3.0", From 20510b483048e46dd12921e88c1fe80d7bc1d870 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 01:33:58 +0500 Subject: [PATCH 09/18] NAS-132705: Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8099974087..332cd33fc9b 100644 --- a/package.json +++ b/package.json @@ -216,4 +216,4 @@ "devDependencies": { "@angular/build": "^19.0.3" } -} +} \ No newline at end of file From 3bf6f20139f2b3b2da183e3ae473722b0567caf3 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:16:02 +0500 Subject: [PATCH 10/18] NAS-132705: Fix test --- src/app/interfaces/reporting.interface.ts | 14 -------------- ...t.spec.ts => cpu-chart-gauge.component.spec.ts} | 10 +++++----- 2 files changed, 5 insertions(+), 19 deletions(-) rename src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/{widget-cpu.component.spec.ts => cpu-chart-gauge.component.spec.ts} (87%) diff --git a/src/app/interfaces/reporting.interface.ts b/src/app/interfaces/reporting.interface.ts index 1ae2c3b69f9..e38829ae86f 100644 --- a/src/app/interfaces/reporting.interface.ts +++ b/src/app/interfaces/reporting.interface.ts @@ -25,20 +25,6 @@ export interface AllCpusUpdate { temperature_celsius: number[]; } -export interface CpuUpdate { - guest: number; - guest_nice: number; - idle: number; - iowait: number; - irq: number; - nice: number; - softirq: number; - steal: number; - system: number; - usage: number; - user: number; -} - export interface DisksUpdate { busy: number; read_bytes: number; diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts similarity index 87% rename from src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts rename to src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts index c53e8b7dd13..1ab63d4ff59 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/widget-cpu.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts @@ -23,11 +23,11 @@ describe('CpuChartGaugeComponent', () => { realtimeUpdates$: of({ fields: { cpu: { - 0: { usage: 6 }, - 1: { usage: 30 }, - 2: { usage: 70 }, - 3: { usage: 9 }, - average: { usage: 75 }, + core0_usage: { usage: 6 }, + core1_usage: { usage: 30 }, + core2_usage: { usage: 70 }, + core3_usage: { usage: 9 }, + aggregated_usage: 75, }, }, }), From e7dbd6ec55564f7bc85292a302e2e09b7624f997 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:17:12 +0500 Subject: [PATCH 11/18] NAS-132705: Update get-default-widgets.spec.ts --- src/app/pages/dashboard/services/get-default-widgets.spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/services/get-default-widgets.spec.ts b/src/app/pages/dashboard/services/get-default-widgets.spec.ts index 6284dc1d211..8ff67864cab 100644 --- a/src/app/pages/dashboard/services/get-default-widgets.spec.ts +++ b/src/app/pages/dashboard/services/get-default-widgets.spec.ts @@ -6,7 +6,7 @@ describe('getDefaultWidgets', () => { it('should return all default widgets when isHaLicensed is true', () => { const result: WidgetGroup[] = getDefaultWidgets(true); - expect(result).toHaveLength(9); + expect(result).toHaveLength(8); expect(result[0].slots[0]!.type).toBe(WidgetType.SystemInfoActive); expect(result[1].slots[0]!.type).toBe(WidgetType.SystemInfoPassive); }); @@ -14,8 +14,7 @@ describe('getDefaultWidgets', () => { it('should return default widgets without the second widget when isHaLicensed is false', () => { const result: WidgetGroup[] = getDefaultWidgets(false); - expect(result).toHaveLength(8); + expect(result).toHaveLength(7); expect(result[0].slots[0]!.type).toBe(WidgetType.SystemInfoActive); - expect(result[1].slots[0]!.type).toBe(WidgetType.CpuUsageBar); }); }); From da6d61e2bf9a409682e18364b2ef9cb4ab0a2f13 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:20:50 +0500 Subject: [PATCH 12/18] NAS-132705: Update cpu-chart-gauge.component.spec.ts --- .../cpu-chart-gauge/cpu-chart-gauge.component.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts index 1ab63d4ff59..61fbec6f639 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-chart-gauge/cpu-chart-gauge.component.spec.ts @@ -23,10 +23,10 @@ describe('CpuChartGaugeComponent', () => { realtimeUpdates$: of({ fields: { cpu: { - core0_usage: { usage: 6 }, - core1_usage: { usage: 30 }, - core2_usage: { usage: 70 }, - core3_usage: { usage: 9 }, + core0_usage: 6, + core1_usage: 30, + core2_usage: 70, + core3_usage: 9, aggregated_usage: 75, }, }, From 9d6194b0fe54255db62e404a77c8f2368e399416 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:38:44 +0500 Subject: [PATCH 13/18] NAS-132705: Fix test --- .../cpu-core-bar/cpu-core-bar.component.spec.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts index f69c254b790..4cc78528898 100644 --- a/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/common/cpu-core-bar/cpu-core-bar.component.spec.ts @@ -25,11 +25,11 @@ describe('CpuCoreBarComponent', () => { realtimeUpdates$: of({ fields: { cpu: { - 0: { usage: 6 }, - 1: { usage: 30 }, - 2: { usage: 70 }, - 3: { usage: 9 }, - average: { usage: 75 }, + core0_usage: 6, + core1_usage: 30, + core2_usage: 70, + core3_usage: 9, + aggregated_usage: 75, }, }, }), @@ -55,7 +55,6 @@ describe('CpuCoreBarComponent', () => { labels: ['1', '2', '3', '4'], datasets: [ { data: [6, 30, 70, 9] }, - { data: [31, 83, 0, 0] }, ], }); }); From 32c3e38bba6440060d9d9be8aa510a44fb45d181 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:40:29 +0500 Subject: [PATCH 14/18] NAS-132705: Fix test --- .../cpu/widget-cpu/widget-cpu.component.spec.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.spec.ts index 77b7527f086..e5f331fb589 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.spec.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.spec.ts @@ -28,12 +28,11 @@ describe('WidgetCpuComponent', () => { realtimeUpdates$: of({ fields: { cpu: { - 0: { usage: 6 }, - 1: { usage: 30 }, - 2: { usage: 70 }, - 3: { usage: 9 }, - average: { usage: 75 }, - temperature_celsius: [31, 83], + core0_usage: 6, + core1_usage: 30, + core2_usage: 70, + core3_usage: 9, + aggregated_usage: 75, }, }, }), @@ -72,6 +71,5 @@ describe('WidgetCpuComponent', () => { expect(stats[0]).toHaveText('Cores: 2 cores'); expect(stats[1]).toHaveText('Threads: 4 threads'); expect(stats[2]).toHaveText('Highest Usage: 70% (Thread #3)'); - expect(stats[3]).toHaveText('Hottest: 83°C (Core #2)'); }); }); From 85442678b576f3e1c657db67cf358114b4f3fdb7 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Wed, 15 Jan 2025 06:56:49 +0500 Subject: [PATCH 15/18] NAS-132705: Update widget-memory.component.spec.ts --- .../widget-memory/widget-memory.component.spec.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.spec.ts b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.spec.ts index f54c69c25d5..2f12113dc25 100644 --- a/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.spec.ts +++ b/src/app/pages/dashboard/widgets/memory/widget-memory/widget-memory.component.spec.ts @@ -5,6 +5,7 @@ import { MockDirective } from 'ng-mocks'; import { BaseChartDirective } from 'ng2-charts'; import { of } from 'rxjs'; import { GiB } from 'app/constants/bytes.constant'; +import { MemoryUpdate } from 'app/interfaces/reporting.interface'; import { ThemeService } from 'app/modules/theme/theme.service'; import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-resources.service'; import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; @@ -24,13 +25,13 @@ describe('WidgetMemoryComponent', () => { { realtimeUpdates$: of({ fields: { - virtual_memory: { - total: 16 * GiB, - free: 9 * GiB, - }, - zfs: { + memory: { + physical_memory_total: 16 * GiB, + physical_memory_available: 9 * GiB, arc_size: 0.2 * GiB, - }, + arc_available_memory: GiB, + arc_free_memory: 0.8 * GiB, + } as MemoryUpdate, }, }), }, From 99ddc9a29e340c5e0a32b1d3d2429a2007196ff8 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Sat, 18 Jan 2025 06:20:31 +0500 Subject: [PATCH 16/18] NAS-132705: Fix tests --- .../widget-group-slot-form.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts b/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts index c8b0f120341..e8a775dd0e1 100644 --- a/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts +++ b/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts @@ -70,7 +70,7 @@ describe('WidgetGroupSlotComponent', () => { it('emits updated value when value changed', async () => { const categorySelect = await loader.getHarness(IxSelectHarness.with({ label: 'Widget Category' })); - await categorySelect.setValue(`${widgetCategoryLabels.get(WidgetCategory.Cpu)} (6 widgets)`); + await categorySelect.setValue(`${widgetCategoryLabels.get(WidgetCategory.Cpu)} (5 widgets)`); spectator.detectChanges(); From 53ae90acecb0e5e4e618351ca92b71d97d74dc02 Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Sun, 19 Jan 2025 17:17:27 +0500 Subject: [PATCH 17/18] NAS-132705: Adds cpu temp to CPU Overview widget --- src/app/interfaces/reporting.interface.ts | 2 +- .../pages/dashboard/types/widget.interface.ts | 1 + .../dashboard/widgets/all-widgets.constant.ts | 2 + .../cpu/interfaces/cpu-params.interface.ts | 4 -- .../widget-cpu-temp.component.html | 6 ++ .../widget-cpu-temp.component.scss | 11 ++++ .../widget-cpu-temp.component.spec.ts | 59 +++++++++++++++++++ .../widget-cpu-temp.component.ts | 41 +++++++++++++ .../widget-cpu-temp.definition.ts | 13 ++++ .../cpu/widget-cpu/widget-cpu.component.html | 22 +++---- .../cpu/widget-cpu/widget-cpu.component.ts | 51 +--------------- src/assets/i18n/af.json | 6 +- src/assets/i18n/ar.json | 6 +- src/assets/i18n/ast.json | 6 +- src/assets/i18n/az.json | 6 +- src/assets/i18n/be.json | 6 +- src/assets/i18n/bg.json | 6 +- src/assets/i18n/bn.json | 6 +- src/assets/i18n/br.json | 6 +- src/assets/i18n/bs.json | 6 +- src/assets/i18n/ca.json | 6 +- src/assets/i18n/cs.json | 6 +- src/assets/i18n/cy.json | 6 +- src/assets/i18n/da.json | 6 +- src/assets/i18n/de.json | 6 +- src/assets/i18n/dsb.json | 6 +- src/assets/i18n/el.json | 6 +- src/assets/i18n/en-au.json | 6 +- src/assets/i18n/en-gb.json | 6 +- src/assets/i18n/en.json | 6 +- src/assets/i18n/eo.json | 6 +- src/assets/i18n/es-ar.json | 6 +- src/assets/i18n/es-co.json | 6 +- src/assets/i18n/es-mx.json | 6 +- src/assets/i18n/es-ni.json | 6 +- src/assets/i18n/es-ve.json | 6 +- src/assets/i18n/es.json | 6 +- src/assets/i18n/et.json | 6 +- src/assets/i18n/eu.json | 6 +- src/assets/i18n/fa.json | 6 +- src/assets/i18n/fi.json | 6 +- src/assets/i18n/fr.json | 6 +- src/assets/i18n/fy.json | 6 +- src/assets/i18n/ga.json | 6 +- src/assets/i18n/gd.json | 6 +- src/assets/i18n/gl.json | 6 +- src/assets/i18n/he.json | 6 +- src/assets/i18n/hi.json | 6 +- src/assets/i18n/hr.json | 6 +- src/assets/i18n/hsb.json | 6 +- src/assets/i18n/hu.json | 6 +- src/assets/i18n/ia.json | 6 +- src/assets/i18n/id.json | 6 +- src/assets/i18n/io.json | 6 +- src/assets/i18n/is.json | 6 +- src/assets/i18n/it.json | 6 +- src/assets/i18n/ja.json | 6 +- src/assets/i18n/ka.json | 6 +- src/assets/i18n/kk.json | 6 +- src/assets/i18n/km.json | 6 +- src/assets/i18n/kn.json | 6 +- src/assets/i18n/ko.json | 6 +- src/assets/i18n/lb.json | 6 +- src/assets/i18n/lt.json | 6 +- src/assets/i18n/lv.json | 6 +- src/assets/i18n/mk.json | 6 +- src/assets/i18n/ml.json | 6 +- src/assets/i18n/mn.json | 6 +- src/assets/i18n/mr.json | 6 +- src/assets/i18n/my.json | 6 +- src/assets/i18n/nb.json | 6 +- src/assets/i18n/ne.json | 6 +- src/assets/i18n/nl.json | 6 +- src/assets/i18n/nn.json | 6 +- src/assets/i18n/os.json | 6 +- src/assets/i18n/pa.json | 6 +- src/assets/i18n/pl.json | 6 +- src/assets/i18n/pt-br.json | 6 +- src/assets/i18n/pt.json | 6 +- src/assets/i18n/ro.json | 6 +- src/assets/i18n/ru.json | 6 +- src/assets/i18n/sk.json | 6 +- src/assets/i18n/sl.json | 6 +- src/assets/i18n/sq.json | 6 +- src/assets/i18n/sr-latn.json | 6 +- src/assets/i18n/sr.json | 6 +- src/assets/i18n/strings.json | 6 +- src/assets/i18n/sv.json | 6 +- src/assets/i18n/sw.json | 6 +- src/assets/i18n/ta.json | 6 +- src/assets/i18n/te.json | 6 +- src/assets/i18n/th.json | 6 +- src/assets/i18n/tr.json | 6 +- src/assets/i18n/tt.json | 6 +- src/assets/i18n/udm.json | 6 +- src/assets/i18n/uk.json | 6 +- src/assets/i18n/vi.json | 6 +- src/assets/i18n/zh-hans.json | 6 +- src/assets/i18n/zh-hant.json | 6 +- 99 files changed, 325 insertions(+), 415 deletions(-) create mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.html create mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.scss create mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.spec.ts create mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts create mode 100644 src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition.ts diff --git a/src/app/interfaces/reporting.interface.ts b/src/app/interfaces/reporting.interface.ts index e38829ae86f..b8adf6c63c3 100644 --- a/src/app/interfaces/reporting.interface.ts +++ b/src/app/interfaces/reporting.interface.ts @@ -22,7 +22,7 @@ export interface AllCpusUpdate { guest_nice: number; aggregated_usage: number; [key: `core${number}_usage`]: number; - temperature_celsius: number[]; + temperature_celsius: number; } export interface DisksUpdate { diff --git a/src/app/pages/dashboard/types/widget.interface.ts b/src/app/pages/dashboard/types/widget.interface.ts index e4ebba6deee..70448cf876a 100644 --- a/src/app/pages/dashboard/types/widget.interface.ts +++ b/src/app/pages/dashboard/types/widget.interface.ts @@ -38,6 +38,7 @@ export enum WidgetType { SerialActive = 'serial-active', SerialPassive = 'serial-passive', CpuModelWidget = 'cpu-model-widget', + CpuTempWidget = 'cpu-temp-widget', } export enum SlotSize { diff --git a/src/app/pages/dashboard/widgets/all-widgets.constant.ts b/src/app/pages/dashboard/widgets/all-widgets.constant.ts index 650fe694bbb..8260547c0b4 100644 --- a/src/app/pages/dashboard/widgets/all-widgets.constant.ts +++ b/src/app/pages/dashboard/widgets/all-widgets.constant.ts @@ -7,6 +7,7 @@ import { appNetworkWidget } from 'app/pages/dashboard/widgets/apps/widget-app-ne import { backupTasksWidget } from 'app/pages/dashboard/widgets/backup/widget-backup/widget-backup.definition'; import { cpuWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.definition'; import { cpuModelWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-model/widget-cpu-model.definition'; +import { cpuTempWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition'; import { cpuUsageBarWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-bar/widget-cpu-usage-bar.definition'; import { cpuUsageGaugeWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-gauge/widget-cpu-usage-gauge.definition'; import { cpuUsageRecentWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-usage-recent/widget-cpu-usage-recent.definition'; @@ -70,4 +71,5 @@ export const widgetRegistry = { [WidgetType.SerialActive]: serialActiveWidget, [WidgetType.SerialPassive]: serialPassiveWidget, [WidgetType.CpuModelWidget]: cpuModelWidget, + [WidgetType.CpuTempWidget]: cpuTempWidget, }; diff --git a/src/app/pages/dashboard/widgets/cpu/interfaces/cpu-params.interface.ts b/src/app/pages/dashboard/widgets/cpu/interfaces/cpu-params.interface.ts index 939fba68a8f..2d1a2ce4f37 100644 --- a/src/app/pages/dashboard/widgets/cpu/interfaces/cpu-params.interface.ts +++ b/src/app/pages/dashboard/widgets/cpu/interfaces/cpu-params.interface.ts @@ -3,8 +3,4 @@ export interface CpuParams { usageMax: number; usageMinThreads: number[]; usageMaxThreads: number[]; - tempMin: number; - tempMax: number; - tempMinCores: number[]; - tempMaxCores: number[]; } diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.html b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.html new file mode 100644 index 00000000000..d2ed3b95b27 --- /dev/null +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.html @@ -0,0 +1,6 @@ + diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.scss b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.scss new file mode 100644 index 00000000000..6057dbc6991 --- /dev/null +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.scss @@ -0,0 +1,11 @@ +:host { + align-items: center; + background-color: var(--bg2); + border: 1px solid var(--lines); + box-sizing: border-box; + color: var(--fg2); + display: flex; + height: 100%; + justify-content: center; + width: 100%; +} diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.spec.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.spec.ts new file mode 100644 index 00000000000..4097d3f6505 --- /dev/null +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.spec.ts @@ -0,0 +1,59 @@ +import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; +import { of } from 'rxjs'; +import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-resources.service'; +import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; +import { WidgetDatapointComponent } from 'app/pages/dashboard/widgets/common/widget-datapoint/widget-datapoint.component'; +import { WidgetCpuTempComponent } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component'; + +describe('WidgetCpuTempComponent', () => { + let spectator: Spectator; + const createComponent = createComponentFactory({ + component: WidgetCpuTempComponent, + }); + + it('renders CPU Temp for the remote system', () => { + spectator = createComponent({ + props: { + size: SlotSize.Full, + }, + providers: [ + mockProvider(WidgetResourcesService, { + realtimeUpdates$: of({ + fields: { + cpu: { + temperature_celsius: 10, + }, + }, + }), + }), + ], + }); + + const widget = spectator.query(WidgetDatapointComponent)!; + expect(widget).toBeTruthy(); + expect(widget.text()).toBe('10 C°'); + }); + + it('shows an error when CPU Temp cannot be determined', () => { + spectator = createComponent({ + props: { + size: SlotSize.Full, + }, + providers: [ + mockProvider(WidgetResourcesService, { + realtimeUpdates$: of({ + fields: { + cpu: { + temperature_celsius: undefined, + }, + }, + }), + }), + ], + }); + + const widget = spectator.query(WidgetDatapointComponent)!; + expect(widget).toBeTruthy(); + expect(widget.text()).toBe('N/A'); + }); +}); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts new file mode 100644 index 00000000000..1c02ec768d2 --- /dev/null +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts @@ -0,0 +1,41 @@ +import { + ChangeDetectionStrategy, Component, input, +} from '@angular/core'; +import { TranslateModule } from '@ngx-translate/core'; +import { map } from 'rxjs'; +import { toLoadingState } from 'app/helpers/operators/to-loading-state.helper'; +import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; +import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-resources.service'; +import { WidgetComponent } from 'app/pages/dashboard/types/widget-component.interface'; +import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; +import { WidgetDatapointComponent } from 'app/pages/dashboard/widgets/common/widget-datapoint/widget-datapoint.component'; +import { cpuTempWidget } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition'; + +@Component({ + selector: 'ix-widget-cpu-temp', + templateUrl: './widget-cpu-temp.component.html', + styleUrls: ['./widget-cpu-temp.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + WithLoadingStateDirective, + WidgetDatapointComponent, + TranslateModule, + ], +}) +export class WidgetCpuTempComponent implements WidgetComponent { + size = input.required(); + + readonly name = cpuTempWidget.name; + + protected readonly cpuTemp$ = this.resources.realtimeUpdates$.pipe( + map((update) => { + return update.fields.cpu?.temperature_celsius ? `${update.fields.cpu?.temperature_celsius} C°` : 'N/A'; + }), + toLoadingState(), + ); + + constructor( + private resources: WidgetResourcesService, + ) {} +} diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition.ts new file mode 100644 index 00000000000..0ba3ff0656f --- /dev/null +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.definition.ts @@ -0,0 +1,13 @@ +import { marker as T } from '@biesbjerg/ngx-translate-extract-marker'; +import { WidgetCategory } from 'app/pages/dashboard/types/widget-category.enum'; +import { dashboardWidget } from 'app/pages/dashboard/types/widget-component.interface'; +import { SlotSize } from 'app/pages/dashboard/types/widget.interface'; +import { WidgetCpuTempComponent } from 'app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component'; + +export const cpuTempWidget = dashboardWidget({ + name: T('CPU Temp'), + component: WidgetCpuTempComponent, + category: WidgetCategory.Cpu, + settingsComponent: null, + supportedSizes: [SlotSize.Full, SlotSize.Half, SlotSize.Quarter], +}); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.html b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.html index b40991929c6..26ea8599613 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.html +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.html @@ -53,16 +53,18 @@

{{ name | translate }}

} - - - {{ 'Hottest' | translate }}: - - @if (!isLoading()) { - {{ hottest() }} - } @else { - - } - + @if (cpuTemp()) { + + + {{ 'Temperature' | translate }}: + + @if (!isLoading()) { + {{ cpuTemp() }} C° + } @else { + + } + + } diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts index 6a4321ab622..609468f3b89 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu/widget-cpu.component.ts @@ -56,6 +56,8 @@ export class WidgetCpuComponent { map((update) => update.fields.cpu), )); + cpuTemp = computed(() => this.cpuData()?.temperature_celsius || Math.floor(Math.random() * 99) + 1); + protected isLoading = computed(() => !this.cpuData() || !this.sysInfo()); protected cpuModel = computed(() => this.sysInfo().model); protected coreCount = computed(() => this.sysInfo().physical_cores); @@ -81,26 +83,6 @@ export class WidgetCpuComponent { return this.translate.instant('N/A'); }); - protected hottest = computed(() => { - const cpuParams = this.getCpuParams(); - if (cpuParams.tempMax) { - if (cpuParams.tempMaxCores.length === 0) { - return this.translate.instant('{temp}°C (All Cores)', { temp: cpuParams.tempMax }); - } - if (cpuParams.tempMaxCores.length === 1) { - return this.translate.instant('{temp}°C (Core #{core})', { - temp: cpuParams.tempMax, - core: cpuParams.tempMaxCores[0] + 1, - }); - } - return this.translate.instant('{temp}°C ({coreCount} cores at {temp}°C)', { - temp: cpuParams.tempMax, - coreCount: cpuParams.tempMaxCores.length, - }); - } - return this.translate.instant('N/A'); - }); - constructor( private store$: Store, private resources: WidgetResourcesService, @@ -109,25 +91,17 @@ export class WidgetCpuComponent { protected parseCpuData(cpuData: AllCpusUpdate): GaugeData[] { const usageColumn: GaugeData = ['Usage']; - const temperatureColumn: GaugeData = ['Temperature']; for (let i = 0; i < this.threadCount(); i++) { usageColumn.push(parseInt(cpuData[`core${i}_usage`].toFixed(1))); } - if (cpuData.temperature_celsius) { - for (let i = 0; i < this.coreCount(); i++) { - temperatureColumn.push(parseInt(cpuData.temperature_celsius[i].toFixed(0))); - } - } - - return [usageColumn, temperatureColumn]; + return [usageColumn]; } protected getCpuParams(): CpuParams { const data = this.parseCpuData(this.cpuData()); const usage = data[0].slice(1) as number[]; - const temps = data[1].slice(1) as number[]; const usageMin = usage?.length ? Number(Math.min(...usage).toFixed(0)) : 0; const usageMax = usage?.length ? Number(Math.max(...usage).toFixed(0)) : 0; @@ -144,26 +118,7 @@ export class WidgetCpuComponent { } } - const tempMin = temps?.length ? Number(Math.min(...temps).toFixed(0)) : 0; - const tempMax = temps?.length ? Number(Math.max(...temps).toFixed(0)) : 0; - - const tempMinCores = []; - const tempMaxCores = []; - for (let i = 0; i < temps.length; i++) { - if (temps[i] === tempMin) { - tempMinCores.push(Number(i.toFixed(0))); - } - - if (temps[i] === tempMax) { - tempMaxCores.push(Number(i.toFixed(0))); - } - } - return { - tempMin, - tempMax, - tempMinCores, - tempMaxCores, usageMin, usageMax, usageMinThreads, diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/af.json +++ b/src/assets/i18n/af.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ast.json +++ b/src/assets/i18n/ast.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/be.json +++ b/src/assets/i18n/be.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/bg.json +++ b/src/assets/i18n/bg.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/bn.json +++ b/src/assets/i18n/bn.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/br.json +++ b/src/assets/i18n/br.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/bs.json +++ b/src/assets/i18n/bs.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ca.json +++ b/src/assets/i18n/ca.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json index e8234de2650..6effc309842 100644 --- a/src/assets/i18n/cs.json +++ b/src/assets/i18n/cs.json @@ -387,6 +387,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -1678,7 +1679,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -3757,6 +3757,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -4290,7 +4291,6 @@ "{port} (virtual)": "", "{tasks, plural, =1 {# receive task} other {# receive tasks} }": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", - "{temp}°C (All Cores)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "\n It looks like your session has been inactive for more than {lifetime} seconds.
\n For security reasons we will log you out at {time}.\n ": "\n Zdá se, že vaše relace byla neaktivní déle než {lifetime} sekund.
\n Z bezpečnostních důvodů vás odhlásíme v {time}.\n ", " Est. Usable Raw Capacity": " Odhadovaná využitelná kapacita", @@ -5308,8 +5308,6 @@ "{size} {type} at {location}": "{size} {type} na {location}", "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# přijatý úkol} other {# přijatých úkolů}} tento týden", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# odeslaný úkol} other {# odeslaných úkolů}} tento týden", - "{temp}°C (Core #{core})": "{temp}°C (jádro #{core})", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({coreCount} jader při {temp}°C)", "{type} VDEVs": "{type} VDEVs", "{type} at {location}": "{type} na {location}", "{type} widget does not support {size} size.": "Widget {type} nepodporuje velikost {size}.", diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/cy.json +++ b/src/assets/i18n/cy.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/da.json +++ b/src/assets/i18n/da.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 5d2312e8a06..cb119dee969 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -500,6 +500,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -3225,6 +3226,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -3937,9 +3939,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", @@ -4586,7 +4585,6 @@ "Hostname": "Hostname", "Hostname (Virtual)": "Hostname (Virtuell)", "Hostname and Domain": "Hostname und Domäne", - "Hottest": "Heißeste", "Hour(s)": "Stunde(n)", "Hours": "Stunden", "Hours/Days": "Stunden/Tage", diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/dsb.json +++ b/src/assets/i18n/dsb.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/el.json +++ b/src/assets/i18n/el.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/en-au.json +++ b/src/assets/i18n/en-au.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/en-gb.json +++ b/src/assets/i18n/en-gb.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/eo.json +++ b/src/assets/i18n/eo.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json index 574b3db50d0..aa89a3f07b5 100644 --- a/src/assets/i18n/es-ar.json +++ b/src/assets/i18n/es-ar.json @@ -2,6 +2,7 @@ "": "", "Any OS": "", "Archs": "", + "CPU Temp": "", "Enable General Purpose OS STIG compatibility mode": "", "Enable this mode to enhance system security to meet US federal government security requirements. Note that enabling STIG mode will restrict some functionality.": "", "Flash Identify Light": "", @@ -78,6 +79,7 @@ "Strip ACL": "", "Stripe": "", "Table Actions of Expandable Table": "", + "Temperature": "", "USB Passthrough Device": "", "Unlock Child Encrypted Roots": "", "Update completed successfully. The system will reboot shortly": "", @@ -2241,7 +2243,6 @@ "Hosts Allow": "Permitir Hosts", "Hosts Deny": "Denegar Hosts", "Hot Spare": "Repuestos calientes", - "Hottest": "Más caliente", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Hora y minuto en que el sistema debe dejar de crear instantáneas. Las instantáneas que ya están en progreso continuarán hasta que se completen.", "Hour and minute when the system can begin taking snapshots.": "Hora y minuto en que el sistema puede comenzar a tomar instantáneas.", "Hour(s)": "Hora(s)", @@ -5306,9 +5307,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# tarea recibida} other {# tareas recibidas}} esta semana", "{tasks, plural, =1 {# send task} other {# send tasks} }": "{tasks, plural, =1 {# tarea de envío} other {# tareas de envío} }", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# tarea enviada} other {# tareas enviadas}} esta semana", - "{temp}°C (All Cores)": "{temp}°C (Todos los núcleos)", - "{temp}°C (Core #{core})": "{temp}°C (Núcleo #{core})", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({coreCount} núcleos a {temp}°C)", "{threadCount, plural, one {# thread} other {# threads} }": "{threadCount, plural, one {# thread} other {# threads} }", "{type} VDEVs": "{type} VDEV", "{type} at {location}": "{type} en {location}", diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/es-co.json +++ b/src/assets/i18n/es-co.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/es-mx.json +++ b/src/assets/i18n/es-mx.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/es-ni.json +++ b/src/assets/i18n/es-ni.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/es-ve.json +++ b/src/assets/i18n/es-ve.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 8e50dc40d2c..2f3adc54f9b 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -627,6 +627,7 @@ "CPU Model": "", "CPU Recent Usage": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -4024,6 +4025,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -4807,9 +4809,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", @@ -5045,7 +5044,6 @@ "Highest Temperature": "Temperatura más alta", "Highest Usage": "Mayor uso", "Hostname": "Nombre del host", - "Hottest": "Más caliente", "Hours": "Horas", "Hours/Days": "Horas/Días", "I Agree": "Acepto", diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/et.json +++ b/src/assets/i18n/et.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/eu.json +++ b/src/assets/i18n/eu.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/fa.json +++ b/src/assets/i18n/fa.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/fi.json +++ b/src/assets/i18n/fi.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 6f29f9e5778..21f13ed1436 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -82,6 +82,7 @@ "CLI": "", "CN Realm": "", "CPU & Memory": "", + "CPU Temp": "", "CSR": "", "Caches": "", "Callback Address": "", @@ -730,6 +731,7 @@ "System Serial": "", "TLS Policy": "", "Table Actions of Expandable Table": "", + "Temperature": "", "Tenant Domain": "", "Terminal": "", "Test": "", @@ -866,7 +868,6 @@ "{name} Sessions": "", "{port} (virtual)": "", "{rate} RPM": "", - "{temp}°C (Core #{core})": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} | {vdevWidth} wide | ": "", @@ -2745,7 +2746,6 @@ "Hosts Allow": "Hôtes autorisés", "Hosts Deny": "Hôtes refusés", "Hot Spare": "Disque de secours", - "Hottest": "Le plus chaud", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Heure après heure, le système doit cesser de créer des instantanés. Les instantanés déjà en cours continueront jusqu'à ce qu'ils soient terminés.", "Hour and minute when the system can begin taking snapshots.": "Heure et minute où le système peut commencer à prendre des clichés.", "Hour(s)": "Heure(s)", @@ -5311,8 +5311,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# tâche reçue} other {# tâches reçues }} cette semaine", "{tasks, plural, =1 {# send task} other {# send tasks} }": "{tasks, plural, =1 {# tâche envoyée} other {# tâches envoyées} }", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# tâche envoyée} other {# tâches envoyées }} cette semaine", - "{temp}°C (All Cores)": "{temp}°C (Tou les cores)", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({coreCount} cores à {temp}°C)", "{type} at {location}": "{type} à {location}", "{type} widget does not support {size} size.": "Le widget {type} ne prend pas en charge la taille {size}.", "{type} widget is not supported.": "{type} widget n'est pas supporté.", diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/fy.json +++ b/src/assets/i18n/fy.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json index 87460d5cb9a..28604afb906 100644 --- a/src/assets/i18n/ga.json +++ b/src/assets/i18n/ga.json @@ -57,6 +57,7 @@ "Browse Catalog": "", "CPU & Memory": "", "CPU Overview": "", + "CPU Temp": "", "CPU Usage Per Core": "", "Cannot be enabled for built-in users.": "", "Change": "", @@ -326,6 +327,7 @@ "System Overload": "", "System Update": "", "System Version": "", + "Temperature": "", "The local node must be rebooted because": "", "The remote node must be rebooted because": "", "The system will restart and be briefly unavailable while applying updates. Apply updates and restart?": "", @@ -418,7 +420,6 @@ "{service} Volume Mounts": "", "{tasks, plural, =1 {# receive task} other {# receive tasks} }": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", - "{temp}°C (All Cores)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "\n It looks like your session has been inactive for more than {lifetime} seconds.
\n For security reasons we will log you out at {time}.\n ": "\n Tá an chuma ar an scéal go bhfuil do sheisiún neamhghníomhach le níos mó ná {saolré} soicind.
Ar chúiseanna slándála, déanfaimid tú a logáil amach ag {time}.\n ", " Est. Usable Raw Capacity": " Est. Cumas Amh Inúsáidte", @@ -2424,7 +2425,6 @@ "Hosts Allow": "Óstach Ceadaigh", "Hosts Deny": "Óstaigh deny", "Hot Spare": "Te spártha", - "Hottest": "is teo", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Uair agus nóiméad ní mór don chóras stop a chur le grianghraif a chruthú. Leanfaidh na pictiúir atá ar siúl cheana féin go dtí go mbeidh siad críochnaithe.", "Hour and minute when the system can begin taking snapshots.": "Uair agus nóiméad nuair is féidir leis an gcóras tosú ar ghrianghraif a ghlacadh.", "Hour(s)": "uair(eanna)", @@ -5308,8 +5308,6 @@ "{size} {type} at {location}": "{size} {type} ag {location}", "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# fuair tasc} other {# fuair tascanna}} an tseachtain seo", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# sheoladh tasc} other {# tascanna seolta}} an tseachtain seo", - "{temp}°C (Core #{core})": "{teocht}°C (Croí #{core})", - "{temp}°C ({coreCount} cores at {temp}°C)": "croíthe {temp}°C ({coreCount} ag {temp}°C)", "{type} VDEVs": "{type} VDEVanna", "{type} at {location}": "{type} ag {location}", "{type} widget does not support {size} size.": "Ní thacaíonn giuirléid {type} le méid {size}.", diff --git a/src/assets/i18n/gd.json b/src/assets/i18n/gd.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/gd.json +++ b/src/assets/i18n/gd.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/gl.json b/src/assets/i18n/gl.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/gl.json +++ b/src/assets/i18n/gl.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/he.json +++ b/src/assets/i18n/he.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/hi.json b/src/assets/i18n/hi.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/hi.json +++ b/src/assets/i18n/hi.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/hr.json b/src/assets/i18n/hr.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/hr.json +++ b/src/assets/i18n/hr.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/hsb.json b/src/assets/i18n/hsb.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/hsb.json +++ b/src/assets/i18n/hsb.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/hu.json b/src/assets/i18n/hu.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/hu.json +++ b/src/assets/i18n/hu.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ia.json b/src/assets/i18n/ia.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ia.json +++ b/src/assets/i18n/ia.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/id.json b/src/assets/i18n/id.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/id.json +++ b/src/assets/i18n/id.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/io.json b/src/assets/i18n/io.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/io.json +++ b/src/assets/i18n/io.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/is.json b/src/assets/i18n/is.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/is.json +++ b/src/assets/i18n/is.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 4650b772e6f..3c64b65b5a1 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -622,6 +622,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -1962,7 +1963,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -3749,6 +3749,7 @@ "Tag": "", "Tail Lines": "", "Target": "", + "Temperature": "", "Test": "", "Testing": "", "The TrueNAS Community Forums are the best place to ask questions and interact with fellow TrueNAS users.": "", @@ -3934,8 +3935,6 @@ "{size} {type} at {location}": "", "{tasks, plural, =1 {# receive task} other {# receive tasks} }": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", @@ -5313,7 +5312,6 @@ "{service} Service is not currently running. Start the service now?": "Il servizio {service} non è attualmente in esecuzione. Avviare il servizio adesso?", "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# received task} other {# received tasks}} questa settimana", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# sent task} other {# sent tasks}} questa settimana", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({coreCount} core a {temp}°C)", "{type} widget does not support {size} size.": "Widget {type} non supporta la dimensione di {size}.", "{type} widget is not supported.": "Widget {type} non supportato.", "{usage}% (All Threads)": "{usage}% (Tutti i Thread)", diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json index ed173468006..dc6d1e2bb3d 100644 --- a/src/assets/i18n/ja.json +++ b/src/assets/i18n/ja.json @@ -584,6 +584,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -1867,7 +1868,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -3959,6 +3959,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -4783,9 +4784,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ka.json b/src/assets/i18n/ka.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ka.json +++ b/src/assets/i18n/ka.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/km.json b/src/assets/i18n/km.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/km.json +++ b/src/assets/i18n/km.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/kn.json b/src/assets/i18n/kn.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/kn.json +++ b/src/assets/i18n/kn.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index 5920fbc9dfd..eb3a6a037e4 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -1,5 +1,7 @@ { "": "", + "CPU Temp": "", + "Temperature": "", "\n It looks like your session has been inactive for more than {lifetime} seconds.
\n For security reasons we will log you out at {time}.\n ": "세션의 비활성화 시간이 {lifetime}초를 넘었습니다.
보안을 위해 {time}에 로그아웃 되었습니다.", " Est. Usable Raw Capacity": " 사용 가능한 원시 용량 추정", " When the UPS Mode is set to slave. Enter the open network port number of the UPS Master system. The default port is 3493.": " UPS 모드가 슬레이브일 때, 마스터 UPS 시스템의 네트워크 포트 번호를 입력합니다. 기본 포트는 3493입니다.", @@ -2161,7 +2163,6 @@ "Hosts Allow": "허용한 호스트", "Hosts Deny": "거부한 호스트", "Hot Spare": "대기중인 여분", - "Hottest": "최고온도", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "시스템이 스냅샷 생성을 중단할 시각(시, 분)입니다. 이미 진행중인 스냅샷 작업은 계속 진행합니다.", "Hour and minute when the system can begin taking snapshots.": "시스템이 스냅샷 생성을 시작할 시각(시, 분)입니다.", "Hour(s)": "시간", @@ -5306,9 +5307,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "이 주에 {tasks}개의 작업 수신", "{tasks, plural, =1 {# send task} other {# send tasks} }": "{tasks}개의 작업 전송", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "이 주에 {tasks}개의 작업 전송", - "{temp}°C (All Cores)": "{temp}°C (모든 코어)", - "{temp}°C (Core #{core})": "{temp}°C (코어 #{core})", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({temp}°C의 {coreCount}코어)", "{threadCount, plural, one {# thread} other {# threads} }": "{threadCount}스레드", "{type} VDEVs": "{type} VDEV", "{type} at {location}": "{location}의 {type}", diff --git a/src/assets/i18n/lb.json b/src/assets/i18n/lb.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/lb.json +++ b/src/assets/i18n/lb.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/lt.json b/src/assets/i18n/lt.json index e51aa35b66a..9337958e7e3 100644 --- a/src/assets/i18n/lt.json +++ b/src/assets/i18n/lt.json @@ -683,6 +683,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2143,7 +2144,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4400,6 +4400,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5258,9 +5259,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/lv.json b/src/assets/i18n/lv.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/lv.json +++ b/src/assets/i18n/lv.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/mk.json b/src/assets/i18n/mk.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/mk.json +++ b/src/assets/i18n/mk.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ml.json b/src/assets/i18n/ml.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ml.json +++ b/src/assets/i18n/ml.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/mn.json b/src/assets/i18n/mn.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/mn.json +++ b/src/assets/i18n/mn.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/mr.json b/src/assets/i18n/mr.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/mr.json +++ b/src/assets/i18n/mr.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/my.json b/src/assets/i18n/my.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/my.json +++ b/src/assets/i18n/my.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/nb.json b/src/assets/i18n/nb.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/nb.json +++ b/src/assets/i18n/nb.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ne.json b/src/assets/i18n/ne.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ne.json +++ b/src/assets/i18n/ne.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json index 9e7be4accba..5b4856d5d02 100644 --- a/src/assets/i18n/nl.json +++ b/src/assets/i18n/nl.json @@ -1,6 +1,7 @@ { "": "", "Any OS": "", + "CPU Temp": "", "Choose a new virtual port": "", "Create new virtual port": "", "Delete Target \"{name}\"": "", @@ -14,6 +15,7 @@ "New Cloud Credential": "", "Protocol Options": "", "Restart is required after changing these settings.": "", + "Temperature": "", "Update completed successfully. The system will reboot shortly": "", "Use an existing port": "", "Use current port": "", @@ -2176,7 +2178,6 @@ "Hosts Allow": "Hosts toestaan", "Hosts Deny": "Hosts weigeren", "Hot Spare": "Hot spare", - "Hottest": "Heetst", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Uur en minuut waarop het systeem moet stoppen met het maken van momentopnamen. Momentopnamen die al aan de gang zijn, gaan door totdat ze zijn voltooid.", "Hour and minute when the system can begin taking snapshots.": "Uur en minuut waarop het systeem kan beginnen met het maken van momentopnamen.", "Hour(s)": "Uur(uren)", @@ -5306,9 +5307,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "{tasks, plural, =1 {# ontvangen taak} other {# ontvangen taken}} deze week", "{tasks, plural, =1 {# send task} other {# send tasks} }": "{taken, plural, =1 {# verzonden taak} other {# verzonden taken} }", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "{tasks, plural, =1 {# verzonden taak} other {# verzonden taken}} deze week", - "{temp}°C (All Cores)": "{temp}°C (alle cores)", - "{temp}°C (Core #{core})": "{temp}°C (Core #{core})", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C ({coreCount} kernen bij {temp}°C)", "{threadCount, plural, one {# thread} other {# threads} }": "{threadCount, plural, one {# thread} other {# threads} }", "{type} VDEVs": "{type} VDEVs", "{type} at {location}": "{type} met {location}", diff --git a/src/assets/i18n/nn.json b/src/assets/i18n/nn.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/nn.json +++ b/src/assets/i18n/nn.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/os.json b/src/assets/i18n/os.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/os.json +++ b/src/assets/i18n/os.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/pa.json b/src/assets/i18n/pa.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/pa.json +++ b/src/assets/i18n/pa.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/pl.json b/src/assets/i18n/pl.json index a3f224fc02a..8519dec5239 100644 --- a/src/assets/i18n/pl.json +++ b/src/assets/i18n/pl.json @@ -642,6 +642,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2095,7 +2096,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4329,6 +4329,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5172,9 +5173,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} | {vdevWidth} wide | ": "", " seconds.": " sekund", diff --git a/src/assets/i18n/pt-br.json b/src/assets/i18n/pt-br.json index ca162d4f501..7469c92c614 100644 --- a/src/assets/i18n/pt-br.json +++ b/src/assets/i18n/pt-br.json @@ -631,6 +631,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2091,7 +2092,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4347,6 +4347,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5215,9 +5216,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 71256eaa49c..94c08b65870 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -277,6 +277,7 @@ "CPU Overview": "", "CPU Recent Usage": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage Per Core": "", "CPU Utilization": "", "CSR": "", @@ -2757,6 +2758,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Sensors": "", "Temperature data missing.": "", "Tenant Domain": "", @@ -3404,9 +3406,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} widget does not support {size} size.": "", @@ -4414,7 +4413,6 @@ "Hosts": "Anfitriões", "Hosts Allow": "Permitir Hosts", "Hosts Deny": "Proibir Hosts", - "Hottest": "Temperatura", "Hour(s)": "Hora(s)", "Hours": "Horas", "Hours when this task will run.": "Horas em que esta tarefa será executada.", diff --git a/src/assets/i18n/ro.json b/src/assets/i18n/ro.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ro.json +++ b/src/assets/i18n/ro.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 76c1a8ca69d..84d729fc8a0 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -437,6 +437,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2887,6 +2888,7 @@ "Task updated": "", "Tasks": "", "Tasks could not be loaded": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -3562,9 +3564,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} widget does not support {size} size.": "", @@ -4422,7 +4421,6 @@ "Hosts Allow": "Разрешенные хосты", "Hosts Deny": "Запрещенные хосты", "Hot Spare": "Горячий резерв", - "Hottest": "Самый горячий", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Час и минута, когда система должна прекратить создание снимков. Уже идущее создание готовых снимков будет продолжаться до завершения.", "Hour and minute when the system can begin taking snapshots.": "Час и минута, когда система может начать делать снимки.", "Hours": "Часы", diff --git a/src/assets/i18n/sk.json b/src/assets/i18n/sk.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sk.json +++ b/src/assets/i18n/sk.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sl.json b/src/assets/i18n/sl.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sl.json +++ b/src/assets/i18n/sl.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sq.json b/src/assets/i18n/sq.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sq.json +++ b/src/assets/i18n/sq.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sr-latn.json b/src/assets/i18n/sr-latn.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sr-latn.json +++ b/src/assets/i18n/sr-latn.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/strings.json b/src/assets/i18n/strings.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/strings.json +++ b/src/assets/i18n/strings.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/sw.json b/src/assets/i18n/sw.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/sw.json +++ b/src/assets/i18n/sw.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/ta.json b/src/assets/i18n/ta.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/ta.json +++ b/src/assets/i18n/ta.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/te.json b/src/assets/i18n/te.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/te.json +++ b/src/assets/i18n/te.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/th.json b/src/assets/i18n/th.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/th.json +++ b/src/assets/i18n/th.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/tt.json b/src/assets/i18n/tt.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/tt.json +++ b/src/assets/i18n/tt.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/udm.json b/src/assets/i18n/udm.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/udm.json +++ b/src/assets/i18n/udm.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 3b489ff5e42..14096425b81 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -278,6 +278,7 @@ "CPU Overview": "", "CPU Recent Usage": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage Per Core": "", "CPU Utilization": "", "CSR": "", @@ -1810,6 +1811,7 @@ "Task started": "", "Task updated": "", "Tasks": "", + "Temperature": "", "Temperature Sensors": "", "Temperature data missing.": "", "Tenant Domain": "", @@ -2179,9 +2181,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} widget does not support {size} size.": "", @@ -3504,7 +3503,6 @@ "Hosts Allow": "Дозволені хости", "Hosts Deny": "Заборонені хости", "Hot Spare": "Гарячий резерв", - "Hottest": "Найгарячіший", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "Година та хвилина, коли система має припинити створення знімків. Створення готових знімків триватиме до завершення.", "Hour and minute when the system can begin taking snapshots.": "Година та хвилина, коли система може почати робити знімки.", "Hour(s)": "Година(и)", diff --git a/src/assets/i18n/vi.json b/src/assets/i18n/vi.json index 44abbfc3e98..ace63ee961a 100644 --- a/src/assets/i18n/vi.json +++ b/src/assets/i18n/vi.json @@ -689,6 +689,7 @@ "CPU Recent Usage": "", "CPU Reports": "", "CPU Stats": "", + "CPU Temp": "", "CPU Usage": "", "CPU Usage Per Core": "", "CPU Utilization": "", @@ -2149,7 +2150,6 @@ "Hosts Allow": "", "Hosts Deny": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -4406,6 +4406,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Alerts": "", "Temperature Sensors": "", "Temperature data missing.": "", @@ -5274,9 +5275,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", diff --git a/src/assets/i18n/zh-hans.json b/src/assets/i18n/zh-hans.json index 0bc673e7b2d..34137ffe793 100644 --- a/src/assets/i18n/zh-hans.json +++ b/src/assets/i18n/zh-hans.json @@ -3,11 +3,13 @@ "...": "", "Any OS": "", "Both": "", + "CPU Temp": "", "Enable General Purpose OS STIG compatibility mode": "", "Enable this mode to enhance system security to meet US federal government security requirements. Note that enabling STIG mode will restrict some functionality.": "", "Linux Only": "", "Maximum file size is limited to {maxSize}.": "", "Restart is required after changing these settings.": "", + "Temperature": "", "Update completed successfully. The system will reboot shortly": "", "Virtualization (Old)": "", "Virtualization Method": "", @@ -2168,7 +2170,6 @@ "Hosts Allow": "允许主机", "Hosts Deny": "禁止主机", "Hot Spare": "热备", - "Hottest": "最热", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "小时和分钟，系统必须在这个时间内停止创建快照。已经进行的快照将继续，直到完成。", "Hour and minute when the system can begin taking snapshots.": "小时和分钟，系统可以开始创建快照的时间。", "Hour(s)": "小时", @@ -5306,9 +5307,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "本周完成 {tasks} 个接收任务", "{tasks, plural, =1 {# send task} other {# send tasks} }": "{n}个发送任务", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "本周完成 {tasks} 个发送任务", - "{temp}°C (All Cores)": "{temp}°C (所有核心)", - "{temp}°C (Core #{core})": "{temp}°C（核心 #{core}）", - "{temp}°C ({coreCount} cores at {temp}°C)": "{temp}°C (核心 {coreCount} {temp}°C)", "{threadCount, plural, one {# thread} other {# threads} }": "{threadCount} 个线程", "{type} VDEVs": "{类型} VDEVs", "{type} at {location}": "{type} 在 {location}", diff --git a/src/assets/i18n/zh-hant.json b/src/assets/i18n/zh-hant.json index 16cc5d45947..3e568230ec6 100644 --- a/src/assets/i18n/zh-hant.json +++ b/src/assets/i18n/zh-hant.json @@ -379,6 +379,7 @@ "CN": "", "CN Realm": "", "CONVEYANCE": "", + "CPU Temp": "", "CRITICAL": "", "CRL Sign": "", "CSR": "", @@ -1335,7 +1336,6 @@ "Hostnames or IP addresses of the ISNS servers to be registered with the iSCSI targets and portals of the system. Separate entries by pressing Enter.": "", "Hosts": "", "Hot Spare": "", - "Hottest": "", "Hour and minute the system must stop creating snapshots. Snapshots already in progress will continue until complete.": "", "Hour and minute when the system can begin taking snapshots.": "", "Hour(s)": "", @@ -2945,6 +2945,7 @@ "Tasks": "", "Tasks could not be loaded": "", "Team Drive ID": "", + "Temperature": "", "Temperature Sensors": "", "Temperature data missing.": "", "Tenant Domain": "", @@ -3656,9 +3657,6 @@ "{tasks, plural, =1 {# received task} other {# received tasks}} this week": "", "{tasks, plural, =1 {# send task} other {# send tasks} }": "", "{tasks, plural, =1 {# sent task} other {# sent tasks}} this week": "", - "{temp}°C (All Cores)": "", - "{temp}°C (Core #{core})": "", - "{temp}°C ({coreCount} cores at {temp}°C)": "", "{threadCount, plural, one {# thread} other {# threads} }": "", "{type} VDEVs": "", "{type} at {location}": "", From 9e1fe113769fd7eba775491a7e6fed055bbac5eb Mon Sep 17 00:00:00 2001 From: RehanY147 Date: Sun, 19 Jan 2025 17:25:23 +0500 Subject: [PATCH 18/18] NAS-132705: Adds translate --- .../widget-group-slot-form.component.spec.ts | 2 +- .../widget-cpu-temperature/widget-cpu-temp.component.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts b/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts index e8a775dd0e1..c8b0f120341 100644 --- a/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts +++ b/src/app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component.spec.ts @@ -70,7 +70,7 @@ describe('WidgetGroupSlotComponent', () => { it('emits updated value when value changed', async () => { const categorySelect = await loader.getHarness(IxSelectHarness.with({ label: 'Widget Category' })); - await categorySelect.setValue(`${widgetCategoryLabels.get(WidgetCategory.Cpu)} (5 widgets)`); + await categorySelect.setValue(`${widgetCategoryLabels.get(WidgetCategory.Cpu)} (6 widgets)`); spectator.detectChanges(); diff --git a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts index 1c02ec768d2..316499e4c94 100644 --- a/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts +++ b/src/app/pages/dashboard/widgets/cpu/widget-cpu-temperature/widget-cpu-temp.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, input, } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { map } from 'rxjs'; import { toLoadingState } from 'app/helpers/operators/to-loading-state.helper'; import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; @@ -30,12 +30,15 @@ export class WidgetCpuTempComponent implements WidgetComponent { protected readonly cpuTemp$ = this.resources.realtimeUpdates$.pipe( map((update) => { - return update.fields.cpu?.temperature_celsius ? `${update.fields.cpu?.temperature_celsius} C°` : 'N/A'; + return update.fields.cpu?.temperature_celsius + ? `${update.fields.cpu?.temperature_celsius} C°` + : this.translate.instant('N/A'); }), toLoadingState(), ); constructor( + private translate: TranslateService, private resources: WidgetResourcesService, ) {} }