From b8af7ad95d17ed30df79e3dab88781d4198c251f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 13:22:57 -0700 Subject: [PATCH 1/5] New Crowdin translations by GitHub Action (#3698) Co-authored-by: Crowdin Bot --- public/locales/af/common.json | 7 +++++++ public/locales/ar/common.json | 7 +++++++ public/locales/bg/common.json | 7 +++++++ public/locales/ca/common.json | 7 +++++++ public/locales/cs/common.json | 7 +++++++ public/locales/da/common.json | 7 +++++++ public/locales/de/common.json | 7 +++++++ public/locales/el/common.json | 7 +++++++ public/locales/eo/common.json | 7 +++++++ public/locales/es/common.json | 7 +++++++ public/locales/eu/common.json | 7 +++++++ public/locales/fi/common.json | 7 +++++++ public/locales/fr/common.json | 7 +++++++ public/locales/he/common.json | 7 +++++++ public/locales/hi/common.json | 7 +++++++ public/locales/hr/common.json | 7 +++++++ public/locales/hu/common.json | 7 +++++++ public/locales/id/common.json | 7 +++++++ public/locales/it/common.json | 7 +++++++ public/locales/ja/common.json | 7 +++++++ public/locales/ko/common.json | 7 +++++++ public/locales/lv/common.json | 7 +++++++ public/locales/ms/common.json | 7 +++++++ public/locales/nl/common.json | 7 +++++++ public/locales/no/common.json | 7 +++++++ public/locales/pl/common.json | 7 +++++++ public/locales/pt/common.json | 7 +++++++ public/locales/pt_BR/common.json | 19 +++++++++++++------ public/locales/ro/common.json | 7 +++++++ public/locales/ru/common.json | 7 +++++++ public/locales/sk/common.json | 7 +++++++ public/locales/sl/common.json | 7 +++++++ public/locales/sr/common.json | 7 +++++++ public/locales/sv/common.json | 7 +++++++ public/locales/te/common.json | 7 +++++++ public/locales/th/common.json | 7 +++++++ public/locales/tr/common.json | 15 +++++++++++---- public/locales/uk/common.json | 7 +++++++ public/locales/vi/common.json | 7 +++++++ public/locales/yue/common.json | 7 +++++++ public/locales/zh-Hans/common.json | 7 +++++++ public/locales/zh-Hant/common.json | 7 +++++++ 42 files changed, 304 insertions(+), 10 deletions(-) diff --git a/public/locales/af/common.json b/public/locales/af/common.json index 7b8b1ee3d..fe23c0222 100644 --- a/public/locales/af/common.json +++ b/public/locales/af/common.json @@ -893,5 +893,12 @@ "ping": "Pieng", "download": "Aflaai", "upload": "Laai Op" + }, + "stocks": { + "stocks": "Aandele", + "loading": "Laai", + "open": "Oop - VS Mark", + "closed": "Toe - VS Mark", + "invalidConfiguration": "Ongeldige opstelling" } } diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index 9df6e2c08..60035f597 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -893,5 +893,12 @@ "ping": "بينغ", "download": "التنزيل", "upload": "التحميل" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 6d5703715..af5b90159 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index 582fa8132..19b214743 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -893,5 +893,12 @@ "ping": "Latència", "download": "Descarregar", "upload": "Pujada" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 239770421..a2218b4ae 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -893,5 +893,12 @@ "ping": "Odezva", "download": "Stahování", "upload": "Nahrávání" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/da/common.json b/public/locales/da/common.json index f9652fd0e..779f885e8 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/de/common.json b/public/locales/de/common.json index d50ca2f86..c452ba6f9 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Aktien", + "loading": "Wird geladen", + "open": "Offen - US-Markt", + "closed": "Geschlossen - US-Markt", + "invalidConfiguration": "Ungültige Konfiguration" } } diff --git a/public/locales/el/common.json b/public/locales/el/common.json index 0569b1d83..e6cbcfc19 100644 --- a/public/locales/el/common.json +++ b/public/locales/el/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Λήξη", "upload": "Μεταφόρτωση" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index 930796d65..02358fabe 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -893,5 +893,12 @@ "ping": "Sondaĵo", "download": "Elŝuti", "upload": "Alŝuti" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 9bae44fde..d412ce856 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Descarga", "upload": "Subida" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/eu/common.json b/public/locales/eu/common.json index 8d56d7d66..2cbda3b1f 100644 --- a/public/locales/eu/common.json +++ b/public/locales/eu/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index 539a73886..4b54f8e03 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index 8409c0b79..d769cd0fb 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Récep.", "upload": "Envoi" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 25d528d69..279c27010 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 81441dff8..fc76c9dc6 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index 3b68d083a..1404cac0b 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Preuzimanje", "upload": "Prijenos" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index fd5968fe0..160a277b9 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Letöltés", "upload": "Feltöltés" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/id/common.json b/public/locales/id/common.json index 314d0b7c1..1635d9667 100644 --- a/public/locales/id/common.json +++ b/public/locales/id/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Unduh", "upload": "Unggah" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 16d7a537b..7256c1e8f 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index b6a897998..d276e8ab4 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "ダウンロード", "upload": "アップロード" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json index 376ca7e32..59bc528c4 100644 --- a/public/locales/ko/common.json +++ b/public/locales/ko/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "다운로드", "upload": "업로드" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 9b3d1bd2f..594d958ee 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Lejupielāde", "upload": "Augšupielāde" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index a73fbf110..bf43076cf 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Muat turun", "upload": "Muat naik" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 967d203a9..429eabf40 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/no/common.json b/public/locales/no/common.json index a246208cd..39e4ad793 100644 --- a/public/locales/no/common.json +++ b/public/locales/no/common.json @@ -893,5 +893,12 @@ "ping": "Responstid", "download": "Last ned", "upload": "Opplastning" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index c3729d1b2..4611c90a0 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Pobieranie", "upload": "Wysyłanie" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 5a96a3a6b..e4772deca 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -893,5 +893,12 @@ "ping": "Tempo de resposta", "download": "Descarregar", "upload": "Carregar" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pt_BR/common.json b/public/locales/pt_BR/common.json index 836200fe7..95ede1c05 100644 --- a/public/locales/pt_BR/common.json +++ b/public/locales/pt_BR/common.json @@ -317,7 +317,7 @@ "hours": "{{number}}h", "minutes": "{{number}}m", "seconds": "{{number}}s", - "ago": "{{value}} Ago" + "ago": "{{value}} Atrás" }, "tdarr": { "queue": "Fila", @@ -328,7 +328,7 @@ "traefik": { "routers": "Roteadores", "services": "Serviços", - "middleware": "Middleware" + "middleware": "" }, "navidrome": { "nothing_streaming": "Sem Streams Ativos", @@ -884,14 +884,21 @@ "total": "Total" }, "swagdashboard": { - "proxied": "Proxied", - "auth": "With Auth", - "outdated": "Outdated", - "banned": "Banned" + "proxied": "Com proxy", + "auth": "Com Autenticação", + "outdated": "Desatualizado", + "banned": "Banido" }, "myspeed": { "ping": "Tempo de resposta", "download": "Descarregar", "upload": "Carregar" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Abrir - Mercado Americano", + "closed": "Fechado - Mercado americano", + "invalidConfiguration": "Configuração Inválida" } } diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index a3411f8ed..38189210d 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Descarcă", "upload": "Încarcă" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index d57d911bc..fc1fdbae7 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -893,5 +893,12 @@ "ping": "Пинг", "download": "Скачивание", "upload": "Загрузка" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json index 256475c7e..d967ad973 100644 --- a/public/locales/sk/common.json +++ b/public/locales/sk/common.json @@ -893,5 +893,12 @@ "ping": "Odozva", "download": "Sťahovanie", "upload": "Nahrávanie" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json index 6eebfaeb6..7bbc04d1f 100644 --- a/public/locales/sl/common.json +++ b/public/locales/sl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Prenos", "upload": "Nalaganje" + }, + "stocks": { + "stocks": "Delnice", + "loading": "Nalaganje", + "open": "Odprto - US trg", + "closed": "Zaprto - US trg", + "invalidConfiguration": "Neveljavna konfiguracija" } } diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index 4311bf87e..c3f4a546d 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index d69745460..cb75e4c84 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/te/common.json b/public/locales/te/common.json index 2b4a34d70..446b290a8 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/th/common.json b/public/locales/th/common.json index 711f7df71..335b7d10b 100644 --- a/public/locales/th/common.json +++ b/public/locales/th/common.json @@ -893,5 +893,12 @@ "ping": "ปิง", "download": "ดาวน์โหลด", "upload": "อัพโหลด" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index d6a6e508d..679047953 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -884,14 +884,21 @@ "total": "Toplam" }, "swagdashboard": { - "proxied": "Proxied", - "auth": "With Auth", - "outdated": "Outdated", - "banned": "Banned" + "proxied": "Proxy Üzerinden", + "auth": "Kimlik Doğrulamalı", + "outdated": "Eskimiş", + "banned": "Yasaklı" }, "myspeed": { "ping": "Gecikme", "download": "İndirme", "upload": "Yükleme" + }, + "stocks": { + "stocks": "Hisse Senetleri", + "loading": "Yükleniyor", + "open": "Açık - ABD Pazarı", + "closed": "Kapalı - ABD Pazarı", + "invalidConfiguration": "Geçersiz Yapılandırma" } } diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 1626ccde1..425c9920e 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -893,5 +893,12 @@ "ping": "Пінг", "download": "Завантаження", "upload": "Відправлення" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 2720cba7e..338ea8fbb 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index 186c8a16f..2de995043 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -893,5 +893,12 @@ "ping": "延遲", "download": "下載速率", "upload": "上傳速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/zh-Hans/common.json b/public/locales/zh-Hans/common.json index 6a8534fce..9334cea47 100644 --- a/public/locales/zh-Hans/common.json +++ b/public/locales/zh-Hans/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "下载速率", "upload": "上传速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index a67f0d45d..570de17f5 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -893,5 +893,12 @@ "ping": "延遲", "download": "下載速率", "upload": "上傳速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } From 9d16e280cdd3d51cebaa584989e910815217d41d Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:07:24 -0700 Subject: [PATCH 2/5] Enhancement: support pfsense v2 api (#3716) --- docs/widgets/services/pfsense.md | 1 + src/utils/config/service-helpers.js | 5 ++++- src/widgets/pfsense/component.jsx | 13 ++++++++++--- src/widgets/pfsense/widget.js | 14 +++++++++++--- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/widgets/services/pfsense.md b/docs/widgets/services/pfsense.md index 8f32a718d..adf98f4b2 100644 --- a/docs/widgets/services/pfsense.md +++ b/docs/widgets/services/pfsense.md @@ -26,5 +26,6 @@ widget: headers: # optional, or username/password Authorization: client_id client_token wan: igb0 + version: v2 # optional, defaults to v1 fields: ["load", "memory", "temp", "wanStatus"] # optional ``` diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 93b5b1b6f..75d31add0 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -399,7 +399,7 @@ export function cleanServiceGroups(groups) { expandOneStreamToTwoRows, showEpisodeNumber, - // glances, pihole + // glances, pihole, pfsense version, // glances @@ -509,6 +509,9 @@ export function cleanServiceGroups(groups) { if (type === "unifi") { if (site) cleanedService.widget.site = site; } + if (type === "pfsense") { + if (version) cleanedService.widget.version = version; + } if (type === "proxmox") { if (node) cleanedService.widget.node = node; } diff --git a/src/widgets/pfsense/component.jsx b/src/widgets/pfsense/component.jsx index 0e961dbc4..54ae1bfdc 100644 --- a/src/widgets/pfsense/component.jsx +++ b/src/widgets/pfsense/component.jsx @@ -9,8 +9,12 @@ export default function Component({ service }) { const { widget } = service; - const { data: systemData, error: systemError } = useWidgetAPI(widget, "system"); - const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); + const version = widget.version ?? 1; + const { data: systemData, error: systemError } = useWidgetAPI(widget, version === 1 ? "system" : "systemv2"); + const { data: interfaceData, error: interfaceError } = useWidgetAPI( + widget, + version === 1 ? "interface" : "interfacev2", + ); const showWanIP = widget.fields?.filter((f) => f !== "wanIP").length <= 4 && widget.fields?.includes("wanIP"); const showDiskUsage = widget.fields?.filter((f) => f !== "disk").length <= 4 && widget.fields?.includes("disk"); @@ -37,7 +41,10 @@ export default function Component({ service }) { return ( - + Date: Sun, 7 Jul 2024 21:44:10 -0700 Subject: [PATCH 3/5] Fix pfsense version doc --- docs/widgets/services/pfsense.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/widgets/services/pfsense.md b/docs/widgets/services/pfsense.md index adf98f4b2..a7d7a9235 100644 --- a/docs/widgets/services/pfsense.md +++ b/docs/widgets/services/pfsense.md @@ -26,6 +26,6 @@ widget: headers: # optional, or username/password Authorization: client_id client_token wan: igb0 - version: v2 # optional, defaults to v1 + version: 2 # optional, defaults to 1 for api v1 fields: ["load", "memory", "temp", "wanStatus"] # optional ``` From a522153df229f0ab6ea95b2514d48f256ee08615 Mon Sep 17 00:00:00 2001 From: Chris Hoffman Date: Mon, 8 Jul 2024 17:18:30 -0500 Subject: [PATCH 4/5] Documentation: fix mistaken documentation on field podSelector for services (#3719) --- docs/configs/kubernetes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configs/kubernetes.md b/docs/configs/kubernetes.md index c76813f47..06685f3af 100644 --- a/docs/configs/kubernetes.md +++ b/docs/configs/kubernetes.md @@ -36,7 +36,7 @@ Inside of the service you'd like to connect to a pod: The `app` field is used to create a label selector, in this example case it would match pods with the label: `app.kubernetes.io/name=emby`. -Sometimes this is insufficient for complex or atypical application deployments. In these cases, the `pod-selector` field can be used. Any field selector can be used with it, so it allows for some very powerful selection capabilities. +Sometimes this is insufficient for complex or atypical application deployments. In these cases, the `podSelector` field can be used. Any field selector can be used with it, so it allows for some very powerful selection capabilities. For instance, it can be utilized to roll multiple underlying deployments under one application to see a high-level aggregate: @@ -47,7 +47,7 @@ For instance, it can be utilized to roll multiple underlying deployments under o description: Matrix Synapse Powered Chat app: matrix-element namespace: comms - pod-selector: >- + podSelector: >- app.kubernetes.io/instance in ( matrix-element, matrix-media-repo, @@ -58,7 +58,7 @@ For instance, it can be utilized to roll multiple underlying deployments under o !!! note - A blank string as a pod-selector does not deactivate it, but will actually select all pods in the namespace. This is a useful way to capture the resource usage of a complex application siloed to a single namespace, like Longhorn. + A blank string as a podSelector does not deactivate it, but will actually select all pods in the namespace. This is a useful way to capture the resource usage of a complex application siloed to a single namespace, like Longhorn. ## Automatic Service Discovery From 95ab0706b680622fad0a707950a6405ea02b7ada Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 9 Jul 2024 06:45:43 -0700 Subject: [PATCH 5/5] Correct pfsense v2 percent calculations --- src/widgets/pfsense/component.jsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/widgets/pfsense/component.jsx b/src/widgets/pfsense/component.jsx index 54ae1bfdc..8e02c590f 100644 --- a/src/widgets/pfsense/component.jsx +++ b/src/widgets/pfsense/component.jsx @@ -38,6 +38,12 @@ export default function Component({ service }) { } const wan = interfaceData.data.filter((l) => l.hwif === widget.wan)[0]; + let memUsage = systemData?.data.mem_usage; + let diskUsage = systemData.data.disk_usage; + if (version === 1) { + memUsage *= 100; + diskUsage *= 100; + } return ( @@ -45,10 +51,7 @@ export default function Component({ service }) { label="pfsense.load" value={version === 1 ? systemData.data.load_avg[0] : systemData.data.cpu_load_avg[0]} /> - + {showWanIP && } - {showDiskUsage && ( - - )} + {showDiskUsage && } ); }