OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into opnsense-widget

Browse Source
This commit is contained in:
Benoit SERRA 2022-12-26 07:36:24 +01:00 committed by GitHub
commit aa35b919bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/locales/es/common.json
View File

@ -382,15 +382,15 @@
"connectedSwitches": "Interruptores conectados" "connectedSwitches": "Interruptores conectados"
}, },
"downloadstation": { "downloadstation": {
"download": "Download", "download": "Descargar",
"upload": "Upload", "upload": "Subir",
"leech": "Leech", "leech": "Sanguijuela",
"seed": "Seed" "seed": "Semilla"
}, },
"mikrotik": { "mikrotik": {
"cpuLoad": "CPU Load", "cpuLoad": "Carga de la CPU",
"memoryUsed": "Memory Used", "memoryUsed": "Memoria utilizada",
"uptime": "Uptime", "uptime": "Tiempo en funcionamiento",
"numberOfLeases": "Leases" "numberOfLeases": "Alquileres"
} }
} }

12
public/locales/fr/common.json
View File

@ -382,15 +382,15 @@
"connectedSwitches": "Switches connectés" "connectedSwitches": "Switches connectés"
}, },
"downloadstation": { "downloadstation": {
"download": "Download", "download": "Récep.",
"upload": "Upload", "upload": "Envoi",
"leech": "Leech", "leech": "Leech",
"seed": "Seed" "seed": "Seed"
}, },
"mikrotik": { "mikrotik": {
"cpuLoad": "CPU Load", "cpuLoad": "Charge CPU",
"memoryUsed": "Memory Used", "memoryUsed": "Mém. Utilisée",
"uptime": "Uptime", "uptime": "Disponibilité",
"numberOfLeases": "Leases" "numberOfLeases": "Baux"
} }
} }

16
public/locales/it/common.json
View File

@ -375,11 +375,11 @@
"bibitrate": "{{value, rate(bits: true; binary: true)}}" "bibitrate": "{{value, rate(bits: true; binary: true)}}"
}, },
"omada": { "omada": {
"connectedAp": "Connected APs", "connectedAp": "AP Connessi",
"activeUser": "Active devices", "activeUser": "Dispositivi attivi",
"alerts": "Alerts", "alerts": "Allarmi",
"connectedGateway": "Connected gateways", "connectedGateway": "Gateway connessi",
"connectedSwitches": "Connected switches" "connectedSwitches": "Switch connessi"
}, },
"downloadstation": { "downloadstation": {
"download": "Download", "download": "Download",
@ -388,9 +388,9 @@
"seed": "Seed" "seed": "Seed"
}, },
"mikrotik": { "mikrotik": {
"cpuLoad": "CPU Load", "cpuLoad": "Carico della CPU",
"memoryUsed": "Memory Used", "memoryUsed": "Memoria Utilizzata",
"uptime": "Uptime", "uptime": "Tempo di attività",
"numberOfLeases": "Leases" "numberOfLeases": "Leases"
} }
} }

38
public/locales/pl/common.json
View File

@ -357,40 +357,40 @@
"seed": "Seed" "seed": "Seed"
}, },
"tdarr": { "tdarr": {
"queue": "Queue", "queue": "Kolejka",
"processed": "Processed", "processed": "Przetworzone",
"errored": "Errored", "errored": "Błędne",
"saved": "Saved" "saved": "Zapisane"
}, },
"miniflux": { "miniflux": {
"read": "Read", "read": "Przeczytane",
"unread": "Unread" "unread": "Nieprzeczytane"
}, },
"nextdns": { "nextdns": {
"wait": "Please Wait", "wait": "Proszę czekać",
"no_devices": "No Device Data Received" "no_devices": "Nie otrzymano danych urządzenia"
}, },
"common": { "common": {
"bibyterate": "{{value, rate(bits: false; binary: true)}}", "bibyterate": "{{value, rate(bits: false; binary: true)}}",
"bibitrate": "{{value, rate(bits: true; binary: true)}}" "bibitrate": "{{value, rate(bits: true; binary: true)}}"
}, },
"omada": { "omada": {
"connectedSwitches": "Connected switches", "connectedSwitches": "Połączone przełączniki",
"connectedAp": "Connected APs", "connectedAp": "Połączone punkty dostępowe",
"activeUser": "Active devices", "activeUser": "Aktywne urządzenia",
"alerts": "Alerts", "alerts": "Alarmy",
"connectedGateway": "Connected gateways" "connectedGateway": "Połączone bramy"
}, },
"downloadstation": { "downloadstation": {
"download": "Download", "download": "Pobieranie",
"upload": "Upload", "upload": "Wysyłanie",
"leech": "Leech", "leech": "Leech",
"seed": "Seed" "seed": "Seed"
}, },
"mikrotik": { "mikrotik": {
"cpuLoad": "CPU Load", "cpuLoad": "Obciążenie procesora",
"memoryUsed": "Memory Used", "memoryUsed": "Zuyżyta pamięć",
"uptime": "Uptime", "uptime": "Czas działania",
"numberOfLeases": "Leases" "numberOfLeases": "Dzierżawy"
} }
} }

4
src/widgets/opnsense/component.jsx
View File

@ -20,7 +20,6 @@ export default function Component({ service }) {
if (!activityData || !interfaceData) { if (!activityData || !interfaceData) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="opnsense.cpu" /> <Block label="opnsense.cpu" />
<Block label="opnsense.memory" /> <Block label="opnsense.memory" />
<Block label="opnsense.wanUpload" /> <Block label="opnsense.wanUpload" />
@ -29,9 +28,9 @@ export default function Component({ service }) {
); );
} }
const cpuidle = activityData.headers[2].substring(60,64); const cpuidle = activityData.headers[2].substring(60,64);
const cpu = 100 - parseFloat(cpuidle); const cpu = 100 - parseFloat(cpuidle);
const memoryInfos = activityData.headers[3].split(" "); const memoryInfos = activityData.headers[3].split(" ");
const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]);
const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100;
@ -41,7 +40,6 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })} /> <Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })} />
<Block label="opnsense.memory" value={t("common.percent", { value: memory })} /> <Block label="opnsense.memory" value={t("common.percent", { value: memory })} />
<Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload })} /> <Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload })} />