From d27b795d817a05e3ef03c2449b6d7bd8a120a979 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 20 Jan 2023 07:04:17 -0800 Subject: [PATCH 01/45] Remove capital from octoprint widget remove add --- public/locales/en/common.json | 2 +- src/widgets/components.js | 2 +- .../{octoPrint => octoprint}/component.jsx | 24 +++++++++---------- .../{octoPrint => octoprint}/widget.js | 0 src/widgets/widgets.js | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) rename src/widgets/{octoPrint => octoprint}/component.jsx (68%) rename src/widgets/{octoPrint => octoprint}/widget.js (100%) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 15af1c0d..cd3e40c4 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -424,7 +424,7 @@ "print_progress": "Progress", "layers": "Layers" }, - "octoPrint": { + "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", "temp_bed": "Bed temp", diff --git a/src/widgets/components.js b/src/widgets/components.js index d87f0b68..601e3f24 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -30,7 +30,7 @@ const components = { nextdns: dynamic(() => import("./nextdns/component")), npm: dynamic(() => import("./npm/component")), nzbget: dynamic(() => import("./nzbget/component")), - octoPrint: dynamic(() => import("./octoPrint/component")), + octoprint: dynamic(() => import("./octoprint/component")), omada: dynamic(() => import("./omada/component")), ombi: dynamic(() => import("./ombi/component")), opnsense: dynamic(() => import("./opnsense/component")), diff --git a/src/widgets/octoPrint/component.jsx b/src/widgets/octoprint/component.jsx similarity index 68% rename from src/widgets/octoPrint/component.jsx rename to src/widgets/octoprint/component.jsx index b58a5c95..6935fe59 100644 --- a/src/widgets/octoPrint/component.jsx +++ b/src/widgets/octoprint/component.jsx @@ -23,7 +23,7 @@ export default function Component({ service }) { if (!printerStats || !state || !tempTool || !tempBed) { return ( - + ); } @@ -36,29 +36,29 @@ export default function Component({ service }) { if (!jobStats || !completion) { return ( - - - - + + + + ); } return ( - - - - + + + + ); } return ( - - - + + + ); } diff --git a/src/widgets/octoPrint/widget.js b/src/widgets/octoprint/widget.js similarity index 100% rename from src/widgets/octoPrint/widget.js rename to src/widgets/octoprint/widget.js diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 349f9f93..55436cec 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -24,7 +24,7 @@ import navidrome from "./navidrome/widget"; import nextdns from "./nextdns/widget"; import npm from "./npm/widget"; import nzbget from "./nzbget/widget"; -import octoPrint from "./octoPrint/widget"; +import octoprint from "./octoprint/widget"; import omada from "./omada/widget"; import ombi from "./ombi/widget"; import opnsense from "./opnsense/widget"; @@ -84,7 +84,7 @@ const widgets = { nextdns, npm, nzbget, - octoPrint, + octoprint, omada, ombi, opnsense, From 6c5f27cd87450dc66f0d75937afa39444e4de888 Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Thu, 19 Jan 2023 20:38:43 +0000 Subject: [PATCH 02/45] Translated using Weblate (Spanish) Currently translated at 100.0% (299 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/es/ --- public/locales/es/common.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/locales/es/common.json b/public/locales/es/common.json index e38f2323..41a229ea 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -416,9 +416,9 @@ "series": "Serie" }, "octoPrint": { - "printer_state": "Status", - "temp_tool": "Tool temp", - "temp_bed": "Bed temp", - "job_completion": "Completion" + "printer_state": "Estado", + "temp_tool": "Temperatura de la herramienta", + "temp_bed": "temperatura de la cama", + "job_completion": "Conclusión" } } From 6634909f5b4bb34edcecb5c2d13510672df38bf9 Mon Sep 17 00:00:00 2001 From: Nonoss117 Date: Thu, 19 Jan 2023 00:05:08 +0000 Subject: [PATCH 03/45] Translated using Weblate (French) Currently translated at 100.0% (299 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/fr/ --- public/locales/fr/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index efc10a41..0fe9f32b 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -416,9 +416,9 @@ "series": "Séries" }, "octoPrint": { - "printer_state": "Status", + "printer_state": "Statut", "temp_tool": "Tool temp", "temp_bed": "Bed temp", - "job_completion": "Completion" + "job_completion": "Achèvement" } } From 592848f42f41e95f7bf7b842c932d9e794ed7f8d Mon Sep 17 00:00:00 2001 From: Chun Chi Hsieh Date: Thu, 19 Jan 2023 19:03:32 +0000 Subject: [PATCH 04/45] Translated using Weblate (Chinese (Traditional)) Currently translated at 96.3% (288 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hant/ --- public/locales/zh-Hant/common.json | 90 +++++++++++++++--------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index 48d8f913..66da4539 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -61,20 +61,20 @@ "timeleft": "剩餘時間" }, "rutorrent": { - "active": "Active", - "upload": "上傳", - "download": "下載" + "active": "活動中", + "upload": "上行速率", + "download": "下行速率" }, "radarr": { "movies": "電影", "wanted": "關注中", "queued": "已加入佇列", - "missing": "遺失" + "missing": "缺少" }, "sonarr": { "wanted": "關注中", "queued": "已加入佇列", - "series": "系列" + "series": "影集" }, "readarr": { "wanted": "關注中", @@ -93,13 +93,13 @@ "processing": "處理中" }, "pihole": { - "queries": "查詢數", + "queries": "查詢", "blocked": "已阻擋", "gravity": "Gravity" }, "speedtest": { - "upload": "上行", - "download": "下行", + "upload": "上行速率", + "download": "下行速率", "ping": "Ping" }, "portainer": { @@ -132,23 +132,23 @@ "prowlarr": { "enableIndexers": "索引器", "numberOfGrabs": "抓取", - "numberOfQueries": "查詢數", + "numberOfQueries": "查詢", "numberOfFailGrabs": "抓取失敗", "numberOfFailQueries": "查詢失敗" }, "transmission": { - "download": "下載", - "upload": "上傳", - "leech": "Leech", - "seed": "Seed" + "download": "下行速率", + "upload": "上行速率", + "leech": "未完成下載", + "seed": "已完成下載" }, "jackett": { "configured": "已配置", "errored": "發生錯誤" }, "bazarr": { - "missingEpisodes": "缺失的劇集", - "missingMovies": "缺失的電影" + "missingEpisodes": "缺少的劇集", + "missingMovies": "缺少的電影" }, "lidarr": { "wanted": "關注中", @@ -156,16 +156,16 @@ "albums": "專輯" }, "adguard": { - "queries": "查詢數", + "queries": "查詢", "blocked": "已阻擋", "filtered": "已過濾", "latency": "延遲" }, "qbittorrent": { - "download": "下載", - "upload": "上傳", - "leech": "Leech", - "seed": "Seed" + "download": "下行速率", + "upload": "上行速率", + "leech": "未完成下載", + "seed": "已完成下載" }, "mastodon": { "user_count": "使用者", @@ -216,8 +216,8 @@ "wait": "請稍後" }, "changedetectionio": { - "totalObserved": "Total Observed", - "diffsDetected": "Diffs Detected" + "totalObserved": "總監測數", + "diffsDetected": "偵測到的變更" }, "wmo": { "0-day": "晴", @@ -345,16 +345,16 @@ "total": "全部" }, "deluge": { - "download": "下載", - "upload": "上傳", - "leech": "Leech", - "seed": "Seed" + "download": "下行速率", + "upload": "上行速率", + "leech": "未完成下載", + "seed": "已完成下載" }, "flood": { - "download": "下載", - "upload": "上傳", - "leech": "Leech", - "seed": "Seed" + "download": "下行速率", + "upload": "上行速率", + "leech": "未完成下載", + "seed": "已完成下載" }, "tdarr": { "queue": "佇列", @@ -382,10 +382,10 @@ "connectedSwitches": "已連接的交換器" }, "downloadstation": { - "download": "下載", - "upload": "上傳", - "leech": "Leech", - "seed": "Seed" + "download": "下行速率", + "upload": "上行速率", + "leech": "未完成下載", + "seed": "已完成下載" }, "mikrotik": { "cpuLoad": "CPU負載", @@ -405,20 +405,20 @@ "wanDownload": "WAN下載" }, "moonraker": { - "printer_state": "Printer State", - "print_status": "Print Status", - "print_progress": "Progress", - "layers": "Layers" + "printer_state": "列印機狀態", + "print_status": "列印狀態", + "print_progress": "進度", + "layers": "層" }, "medusa": { - "wanted": "Wanted", - "queued": "Queued", - "series": "Series" + "wanted": "關注中", + "queued": "已加入佇列", + "series": "影集" }, "octoPrint": { - "printer_state": "Status", - "temp_tool": "Tool temp", - "temp_bed": "Bed temp", - "job_completion": "Completion" + "printer_state": "狀態", + "temp_tool": "噴嘴溫度", + "temp_bed": "平台溫度", + "job_completion": "完成度" } } From fc01c6b428ffd63de4f7af196fff887e0a57962c Mon Sep 17 00:00:00 2001 From: retmas-gh Date: Thu, 19 Jan 2023 22:35:35 +0000 Subject: [PATCH 05/45] Translated using Weblate (Polish) Currently translated at 95.9% (287 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pl/ --- public/locales/pl/common.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index b5610f99..7ff50096 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -394,31 +394,31 @@ "numberOfLeases": "Dzierżawy" }, "xteve": { - "streams_all": "All Streams", - "streams_active": "Active Streams", - "streams_xepg": "XEPG Channels" + "streams_all": "Wszystkie strumienie", + "streams_active": "Aktywne strumienie", + "streams_xepg": "Kanały XEPG" }, "opnsense": { - "cpu": "CPU Load", - "memory": "Active Memory", - "wanUpload": "WAN Upload", - "wanDownload": "WAN Download" + "cpu": "Obciążenie procesora", + "memory": "Pamięć rzeczywista", + "wanUpload": "WAN wysyłanie", + "wanDownload": "WAN pobieranie" }, "moonraker": { - "printer_state": "Printer State", - "print_status": "Print Status", - "print_progress": "Progress", - "layers": "Layers" + "printer_state": "Stan drukarki", + "print_status": "Status wydruku", + "print_progress": "Postęp", + "layers": "Warstwy" }, "medusa": { - "wanted": "Wanted", - "queued": "Queued", - "series": "Series" + "wanted": "Poszukiwane", + "queued": "Zakolejkowane", + "series": "Seria" }, "octoPrint": { "printer_state": "Status", "temp_tool": "Tool temp", "temp_bed": "Bed temp", - "job_completion": "Completion" + "job_completion": "Ukończenie" } } From 43d781f1f9212374e751d87a6c3a9d7703961d4c Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 19 Jan 2023 01:49:56 +0000 Subject: [PATCH 06/45] Translated using Weblate (Ukrainian) Currently translated at 100.0% (299 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/uk/ --- public/locales/uk/common.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 72435e12..04cbaaf2 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -416,9 +416,9 @@ "series": "Серії" }, "octoPrint": { - "printer_state": "Status", - "temp_tool": "Tool temp", - "temp_bed": "Bed temp", - "job_completion": "Completion" + "printer_state": "Стан", + "temp_tool": "Температура інструменту", + "temp_bed": "Температура ліжка", + "job_completion": "Завершення" } } From 3737ce704ec2e4c1cc7a99bb78a36c71e899f0c7 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Fri, 20 Jan 2023 17:08:30 +0100 Subject: [PATCH 07/45] Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ --- public/locales/ar/common.json | 2 -- public/locales/bg/common.json | 2 -- public/locales/ca/common.json | 2 -- public/locales/cs/common.json | 2 -- public/locales/da/common.json | 2 -- public/locales/de/common.json | 2 -- public/locales/eo/common.json | 2 -- public/locales/es/common.json | 2 -- public/locales/fi/common.json | 2 -- public/locales/fr/common.json | 2 -- public/locales/he/common.json | 2 -- public/locales/hi/common.json | 2 -- public/locales/hr/common.json | 2 -- public/locales/hu/common.json | 2 -- public/locales/it/common.json | 2 -- public/locales/ja/common.json | 2 -- public/locales/lv/common.json | 2 -- public/locales/ms/common.json | 2 -- public/locales/nb-NO/common.json | 2 -- public/locales/nl/common.json | 2 -- public/locales/pl/common.json | 2 -- public/locales/pt-BR/common.json | 2 -- public/locales/pt/common.json | 2 -- public/locales/ro/common.json | 2 -- public/locales/ru/common.json | 2 -- public/locales/sr/common.json | 2 -- public/locales/sv/common.json | 2 -- public/locales/te/common.json | 2 -- public/locales/tr/common.json | 2 -- public/locales/uk/common.json | 2 -- public/locales/vi/common.json | 2 -- public/locales/yue/common.json | 2 -- public/locales/zh-CN/common.json | 2 -- public/locales/zh-Hant/common.json | 2 -- 34 files changed, 68 deletions(-) diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index bcdc306e..dada3063 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index aeb2fdb7..7867b671 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index ff08ff99..bfb0e401 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 5d404844..be09d4c1 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/da/common.json b/public/locales/da/common.json index d818bd5c..32b6937e 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/de/common.json b/public/locales/de/common.json index 89ba1e7d..08f078f5 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index c6904e37..675008db 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 41a229ea..ffa131ec 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -416,9 +416,7 @@ "series": "Serie" }, "octoPrint": { - "printer_state": "Estado", "temp_tool": "Temperatura de la herramienta", - "temp_bed": "temperatura de la cama", "job_completion": "Conclusión" } } diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index cf2dfa58..1c9d5e4c 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index 0fe9f32b..dd40f907 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -416,9 +416,7 @@ "series": "Séries" }, "octoPrint": { - "printer_state": "Statut", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Achèvement" } } diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 057cdafa..7351c441 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 5cc8dd16..5491daa8 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index aa47cd15..01cdc39f 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index 6f668aff..c40d0692 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 845d3427..6b328b86 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index 4704baa1..1ee33b7a 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 03830336..ffd9e357 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -416,9 +416,7 @@ "layers": "Layers" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index ce612966..30d85af0 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json index 8955bdcd..7b3071e5 100644 --- a/public/locales/nb-NO/common.json +++ b/public/locales/nb-NO/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index db1aadb3..21f49b55 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index 7ff50096..d06fa5d8 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -416,9 +416,7 @@ "series": "Seria" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Ukończenie" } } diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json index ebcf61cc..1d66ef30 100644 --- a/public/locales/pt-BR/common.json +++ b/public/locales/pt-BR/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 8a81448c..6c857c23 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -425,9 +425,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index 0de37484..501fcdf8 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index 2fff4ca0..efdf1c0a 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index f424d2f8..da39c4cc 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index 650b5422..9bf13199 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/te/common.json b/public/locales/te/common.json index aad40d9c..5725fbb3 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index 88c83ac3..c6abed1e 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 04cbaaf2..9f9d7d32 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -416,9 +416,7 @@ "series": "Серії" }, "octoPrint": { - "printer_state": "Стан", "temp_tool": "Температура інструменту", - "temp_bed": "Температура ліжка", "job_completion": "Завершення" } } diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 6a32f636..5f1edff2 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index 5c91c674..f737a8ac 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index 72fd7fee..e3791e74 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -416,9 +416,7 @@ "series": "Series" }, "octoPrint": { - "printer_state": "Status", "temp_tool": "Tool temp", - "temp_bed": "Bed temp", "job_completion": "Completion" } } diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index 66da4539..dc42d234 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -416,9 +416,7 @@ "series": "影集" }, "octoPrint": { - "printer_state": "狀態", "temp_tool": "噴嘴溫度", - "temp_bed": "平台溫度", "job_completion": "完成度" } } From d4b3885139696f1ca3d1b4c3a225aaf2f0d6d69e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:41 +0000 Subject: [PATCH 08/45] Translated using Weblate (German) Currently translated at 76.2% (228 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/de/ --- public/locales/de/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/de/common.json b/public/locales/de/common.json index 08f078f5..795c5767 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From e850abbaec0ce4f6eeebdb13ab1b02dc07fa61eb Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:51 +0000 Subject: [PATCH 09/45] Translated using Weblate (Spanish) Currently translated at 98.6% (295 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/es/ --- public/locales/es/common.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/locales/es/common.json b/public/locales/es/common.json index ffa131ec..5cade675 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -416,7 +416,12 @@ "series": "Serie" }, "octoPrint": { - "temp_tool": "Temperatura de la herramienta", "job_completion": "Conclusión" + }, + "octoprint": { + "temp_bed": "Bed temp", + "printer_state": "Status", + "temp_tool": "Tool temp", + "job_completion": "Completion" } } From 3add3a57d2ffcee9f195436b304f02371132d8f0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:42 +0000 Subject: [PATCH 10/45] Translated using Weblate (French) Currently translated at 98.6% (295 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/fr/ --- public/locales/fr/common.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index dd40f907..bc76b2c2 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -416,7 +416,12 @@ "series": "Séries" }, "octoPrint": { - "temp_tool": "Tool temp", "job_completion": "Achèvement" + }, + "octoprint": { + "printer_state": "Status", + "temp_tool": "Tool temp", + "temp_bed": "Bed temp", + "job_completion": "Completion" } } From 19e654656fac692c15712c72e5a76438010b3707 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:42 +0000 Subject: [PATCH 11/45] Translated using Weblate (Portuguese) Currently translated at 85.6% (256 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pt/ --- public/locales/pt/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 6c857c23..4be6454a 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -425,7 +425,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 300fce5f17fa5b578a3d9b6adc2a2d2b9b039d0c Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:50 +0000 Subject: [PATCH 12/45] Translated using Weblate (Russian) Currently translated at 16.0% (48 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ru/ --- public/locales/ru/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index efdf1c0a..2c741aba 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From b6a2421a648ad501f7a8265483280f6e1e759f83 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:51 +0000 Subject: [PATCH 13/45] Translated using Weblate (Chinese (Simplified)) Currently translated at 56.1% (168 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hans/ --- public/locales/zh-CN/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index e3791e74..12b72076 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From cc073ea23c8311754177403426273895c05353c1 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:43 +0000 Subject: [PATCH 14/45] Translated using Weblate (Italian) Currently translated at 96.3% (288 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/it/ --- public/locales/it/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 6b328b86..20a9c541 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 6cd9d76892b08b8b1059907e391df91781e6a978 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:51 +0000 Subject: [PATCH 15/45] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 26.4% (79 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/nb_NO/ --- public/locales/nb-NO/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json index 7b3071e5..f3d981ca 100644 --- a/public/locales/nb-NO/common.json +++ b/public/locales/nb-NO/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 3d5bb9d9eb4e52bc540459a9cd8d92af3056b2a9 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:49 +0000 Subject: [PATCH 16/45] Translated using Weblate (Vietnamese) Currently translated at 14.7% (44 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/vi/ --- public/locales/vi/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 5f1edff2..609318fa 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 3f887a7e26c244bde5910dddb99566be7328b780 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:49 +0000 Subject: [PATCH 17/45] Translated using Weblate (Dutch) Currently translated at 29.4% (88 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/nl/ --- public/locales/nl/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 21f49b55..f632179b 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From c9cb975265e1e15d4a99e00e642c6710bcd88259 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:50 +0000 Subject: [PATCH 18/45] Translated using Weblate (Chinese (Traditional)) Currently translated at 94.9% (284 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hant/ --- public/locales/zh-Hant/common.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index dc42d234..d2b4951e 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -416,7 +416,12 @@ "series": "影集" }, "octoPrint": { - "temp_tool": "噴嘴溫度", "job_completion": "完成度" + }, + "octoprint": { + "printer_state": "Status", + "temp_tool": "Tool temp", + "temp_bed": "Bed temp", + "job_completion": "Completion" } } From 580c6adfb1151ba858d8e9333eb6249049a392a2 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:46 +0000 Subject: [PATCH 19/45] Translated using Weblate (Catalan) Currently translated at 86.2% (258 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ca/ --- public/locales/ca/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index bfb0e401..5540b487 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 940b6098d453899bafd8237b1ec49e0d83090037 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:43 +0000 Subject: [PATCH 20/45] Translated using Weblate (Polish) Currently translated at 95.3% (285 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pl/ --- public/locales/pl/common.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index d06fa5d8..8bccfdd8 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -416,7 +416,12 @@ "series": "Seria" }, "octoPrint": { - "temp_tool": "Tool temp", "job_completion": "Ukończenie" + }, + "octoprint": { + "printer_state": "Status", + "temp_tool": "Tool temp", + "temp_bed": "Bed temp", + "job_completion": "Completion" } } From f1baafe9a140eae57540743f34b62edb2fd981c0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:44 +0000 Subject: [PATCH 21/45] Translated using Weblate (Swedish) Currently translated at 44.1% (132 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sv/ --- public/locales/sv/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index 9bf13199..e90ff86f 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From f0557d0a9c495d316166e7405aa3acf2cef1a2b8 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:44 +0000 Subject: [PATCH 22/45] Translated using Weblate (Croatian) Currently translated at 95.6% (286 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hr/ --- public/locales/hr/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index 01cdc39f..5d981740 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 8dcc25f68f283a533a15e84f8087c72d131bfa04 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:52 +0000 Subject: [PATCH 23/45] Translated using Weblate (Hungarian) Currently translated at 36.1% (108 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hu/ --- public/locales/hu/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index c40d0692..70d00aec 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 45b59cd336ba4b54b7d4d20308cfa9f96e902832 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:45 +0000 Subject: [PATCH 24/45] Translated using Weblate (Hebrew) Currently translated at 33.7% (101 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/he/ --- public/locales/he/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 7351c441..21577cac 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 0d4b4ef65cc37151ce8f58452d9b0d71432ada5d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:52 +0000 Subject: [PATCH 25/45] Translated using Weblate (Romanian) Currently translated at 45.8% (137 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ro/ --- public/locales/ro/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index 501fcdf8..5b5d89a8 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From ccb227366dd74f18f21520f9b95808937a64ce83 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:47 +0000 Subject: [PATCH 26/45] Translated using Weblate (Portuguese (Brazil)) Currently translated at 39.1% (117 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pt_BR/ --- public/locales/pt-BR/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json index 1d66ef30..e6f524f3 100644 --- a/public/locales/pt-BR/common.json +++ b/public/locales/pt-BR/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From c7771033c64c2ec732c18eb85c1eba111d244b9d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:46 +0000 Subject: [PATCH 27/45] Translated using Weblate (Yue) Currently translated at 39.4% (118 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/yue/ --- public/locales/yue/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index f737a8ac..6ee13704 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From c490d2467f00c3d364684ee5c3e4e2d4b4545bbe Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:43 +0000 Subject: [PATCH 28/45] Translated using Weblate (Finnish) Currently translated at 41.1% (123 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/fi/ --- public/locales/fi/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index 1c9d5e4c..af8a04a9 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 530495d804f80a649918cbd64f4611cf83a1b35e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:44 +0000 Subject: [PATCH 29/45] Translated using Weblate (Telugu) Currently translated at 72.5% (217 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/te/ --- public/locales/te/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/te/common.json b/public/locales/te/common.json index 5725fbb3..01bdbb53 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 1993a1660aca24d995314c971637b34ecba33040 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:48 +0000 Subject: [PATCH 30/45] Translated using Weblate (Bulgarian) Currently translated at 15.3% (46 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/bg/ --- public/locales/bg/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 7867b671..050f7c9f 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From ec4dcd0663040b12115eac12040475c8e8c11fa0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:44 +0000 Subject: [PATCH 31/45] Translated using Weblate (Turkish) Currently translated at 77.2% (231 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/tr/ --- public/locales/tr/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index c6abed1e..b1cfbf0e 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From e6f9d6fd1d899216c64c8440932a4aad2723f0f0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:52 +0000 Subject: [PATCH 32/45] Translated using Weblate (Serbian) Currently translated at 3.0% (9 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sr/ --- public/locales/sr/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index da39c4cc..7b362ecc 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 1a1194acf8743aafeb9072a6ee0dde1583083acc Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:47 +0000 Subject: [PATCH 33/45] Translated using Weblate (Arabic) Currently translated at 14.7% (44 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ar/ --- public/locales/ar/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index dada3063..1c69a469 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 064299982640e142c84aa242cc7663ec85f099de Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:49 +0000 Subject: [PATCH 34/45] Translated using Weblate (Czech) Currently translated at 75.2% (225 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/cs/ --- public/locales/cs/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index be09d4c1..094c8cf0 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From e4c2eec7eeef5f0aef7af28807c0695df5b1b118 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:48 +0000 Subject: [PATCH 35/45] Translated using Weblate (Danish) Currently translated at 66.2% (198 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/da/ --- public/locales/da/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/da/common.json b/public/locales/da/common.json index 32b6937e..2e5391a7 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 680d889228069e89d8afb082457148967042599b Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:49 +0000 Subject: [PATCH 36/45] Translated using Weblate (Malay) Currently translated at 84.6% (253 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ms/ --- public/locales/ms/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index 30d85af0..096c956e 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 85073629adf954b015a5077d674c782a9b13a2e9 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:47 +0000 Subject: [PATCH 37/45] Translated using Weblate (Hindi) Currently translated at 3.0% (9 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hi/ --- public/locales/hi/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 5491daa8..1752cb98 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 0b41c1d68654dd0634556a999d82af7344b14f83 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:48 +0000 Subject: [PATCH 38/45] Translated using Weblate (Esperanto) Currently translated at 34.4% (103 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/eo/ --- public/locales/eo/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index 675008db..f0750357 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -416,7 +416,12 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 9f68f3b3f43a405e6092d2a4ae9aaf7db3fb407b Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:42 +0000 Subject: [PATCH 39/45] Translated using Weblate (Ukrainian) Currently translated at 98.6% (295 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/uk/ --- public/locales/uk/common.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 9f9d7d32..189b3a0d 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -416,7 +416,12 @@ "series": "Серії" }, "octoPrint": { - "temp_tool": "Температура інструменту", "job_completion": "Завершення" + }, + "octoprint": { + "printer_state": "Status", + "temp_tool": "Tool temp", + "temp_bed": "Bed temp", + "job_completion": "Completion" } } From 71669b295dfbb4987cb99ce1ffe5e022d2e7cd4f Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:50 +0000 Subject: [PATCH 40/45] Translated using Weblate (Japanese) Currently translated at 5.0% (15 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ja/ --- public/locales/ja/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index 1ee33b7a..9589e378 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -416,6 +416,11 @@ "series": "Series" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "temp_bed": "Bed temp", + "printer_state": "Status", "temp_tool": "Tool temp", "job_completion": "Completion" } From cdbdb86c9e67751c73f8e33459bee7b79386d808 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Fri, 20 Jan 2023 16:08:52 +0000 Subject: [PATCH 41/45] Translated using Weblate (Latvian) Currently translated at 39.7% (119 of 299 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/lv/ --- public/locales/lv/common.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index ffd9e357..7329287e 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -416,7 +416,12 @@ "layers": "Layers" }, "octoPrint": { + "job_completion": "Completion" + }, + "octoprint": { + "printer_state": "Status", "temp_tool": "Tool temp", + "temp_bed": "Bed temp", "job_completion": "Completion" } } From 794f22d373c6d98a6cde84a4d6ed527876951012 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:27:33 -0800 Subject: [PATCH 42/45] Re-merge "use unprivileged user in a container" This reverts commit 67e72fb96af4e2d8e4ba7044689599502ca98caf. --- Dockerfile | 32 ++++++++++++++++---------------- docker-entrypoint.sh | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48e5d2f3..1d9a4931 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,12 +7,10 @@ WORKDIR /app COPY --link package.json pnpm-lock.yaml* ./ -RUN < config/settings.yaml - NEXT_PUBLIC_BUILDTIME=$BUILDTIME NEXT_PUBLIC_VERSION=$VERSION NEXT_PUBLIC_REVISION=$REVISION npm run build -EOF +SHELL ["/bin/ash", "-xeo", "pipefail", "-c"] +RUN npm run telemetry \ + && mkdir config && echo '---' > config/settings.yaml \ + && NEXT_PUBLIC_BUILDTIME=$BUILDTIME NEXT_PUBLIC_VERSION=$VERSION NEXT_PUBLIC_REVISION=$REVISION npm run build # Production image, copy all the files and run next FROM docker.io/node:18-alpine AS runner @@ -50,12 +46,15 @@ ENV NODE_ENV production WORKDIR /app # Copy files from context (this allows the files to copy before the builder stage is done). -COPY --link package.json next.config.js ./ -COPY --link /public ./public +COPY --link --chown=1000:1000 package.json next.config.js ./ +COPY --link --chown=1000:1000 /public ./public/ # Copy files from builder -COPY --link --from=builder /app/.next/standalone ./ -COPY --link --from=builder /app/.next/static/ ./.next/static/ +COPY --link --from=builder --chown=1000:1000 /app/.next/standalone ./ +COPY --link --from=builder --chown=1000:1000 /app/.next/static/ ./.next/static/ +COPY --link --chmod=755 docker-entrypoint.sh /usr/local/bin/ + +RUN apk add --no-cache su-exec ENV PORT 3000 EXPOSE $PORT @@ -63,4 +62,5 @@ EXPOSE $PORT HEALTHCHECK --interval=10s --timeout=3s --start-period=20s \ CMD wget --no-verbose --tries=1 --spider --no-check-certificate http://localhost:$PORT/api/healthcheck || exit 1 +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["node", "server.js"] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5603d7e5..bf443461 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,8 +2,22 @@ set -e +# Default to root, so old installations won't break +export PUID=${PUID:-0} +export PGID=${PGID:-0} + # This is in attempt to preserve the original behavior of the Dockerfile, # while also supporting the lscr.io /config directory [ ! -d "/app/config" ] && ln -s /config /app/config -node server.js +# Set privileges for /app but only if pid 1 user is root and we are dropping privileges. +# If container is run as an unprivileged user, it means owner already handled ownership setup on their own. +# Running chown in that case (as non-root) will cause error +[ "$(id -u)" == "0" ] && [ "${PUID}" != "0" ] && chown -R ${PUID}:${PGID} /app + +# Drop privileges (when asked to) if root, otherwise run as current user +if [ "$(id -u)" == "0" ] && [ "${PUID}" != "0" ]; then + su-exec ${PUID}:${PGID} "$@" +else + exec "$@" +fi From c74b46712b9a0b8f347a0617ae8a69816ba38c63 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sun, 22 Jan 2023 18:30:38 +0100 Subject: [PATCH 43/45] Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ --- public/locales/ar/common.json | 3 --- public/locales/bg/common.json | 3 --- public/locales/ca/common.json | 3 --- public/locales/cs/common.json | 3 --- public/locales/da/common.json | 3 --- public/locales/de/common.json | 3 --- public/locales/eo/common.json | 3 --- public/locales/es/common.json | 3 --- public/locales/fi/common.json | 3 --- public/locales/fr/common.json | 3 --- public/locales/he/common.json | 3 --- public/locales/hi/common.json | 3 --- public/locales/hr/common.json | 3 --- public/locales/hu/common.json | 3 --- public/locales/it/common.json | 3 --- public/locales/ja/common.json | 3 --- public/locales/lv/common.json | 3 --- public/locales/ms/common.json | 3 --- public/locales/nb-NO/common.json | 3 --- public/locales/nl/common.json | 3 --- public/locales/pl/common.json | 3 --- public/locales/pt-BR/common.json | 3 --- public/locales/pt/common.json | 3 --- public/locales/ro/common.json | 3 --- public/locales/ru/common.json | 3 --- public/locales/sr/common.json | 3 --- public/locales/sv/common.json | 3 --- public/locales/te/common.json | 3 --- public/locales/tr/common.json | 3 --- public/locales/uk/common.json | 3 --- public/locales/vi/common.json | 3 --- public/locales/yue/common.json | 3 --- public/locales/zh-CN/common.json | 3 --- public/locales/zh-Hant/common.json | 3 --- 34 files changed, 102 deletions(-) diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index 1c69a469..94a4525a 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 050f7c9f..e20e0a25 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index 5540b487..db7cdd5c 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 094c8cf0..1edeab46 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/da/common.json b/public/locales/da/common.json index 2e5391a7..eadf268f 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/de/common.json b/public/locales/de/common.json index 795c5767..9cbd6f2a 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index f0750357..783533bf 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 5cade675..5b7ea7b0 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -415,9 +415,6 @@ "queued": "A la espera", "series": "Serie" }, - "octoPrint": { - "job_completion": "Conclusión" - }, "octoprint": { "temp_bed": "Bed temp", "printer_state": "Status", diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index af8a04a9..02ef5c8d 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index bc76b2c2..c8b60225 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -415,9 +415,6 @@ "queued": "En attente", "series": "Séries" }, - "octoPrint": { - "job_completion": "Achèvement" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 21577cac..993f3afd 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 1752cb98..3cd43358 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index 5d981740..886b0791 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index 70d00aec..c77aa79a 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 20a9c541..b53bfc93 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index 9589e378..bc493fcb 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "temp_bed": "Bed temp", "printer_state": "Status", diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 7329287e..4c9b7487 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -415,9 +415,6 @@ "print_progress": "Progress", "layers": "Layers" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index 096c956e..04144e8a 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json index f3d981ca..22fe7057 100644 --- a/public/locales/nb-NO/common.json +++ b/public/locales/nb-NO/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index f632179b..4fc76d08 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index 8bccfdd8..d23d3970 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -415,9 +415,6 @@ "queued": "Zakolejkowane", "series": "Seria" }, - "octoPrint": { - "job_completion": "Ukończenie" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json index e6f524f3..bfad7706 100644 --- a/public/locales/pt-BR/common.json +++ b/public/locales/pt-BR/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 4be6454a..218967d1 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -424,9 +424,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index 5b5d89a8..a1f9983d 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index 2c741aba..e0ba440c 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index 7b362ecc..a299df63 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index e90ff86f..14249d45 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/te/common.json b/public/locales/te/common.json index 01bdbb53..61fb4601 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index b1cfbf0e..401a069f 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 189b3a0d..35238330 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -415,9 +415,6 @@ "queued": "У черзі", "series": "Серії" }, - "octoPrint": { - "job_completion": "Завершення" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 609318fa..c2c4f8ec 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index 6ee13704..b3186da0 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index 12b72076..48d01b82 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -415,9 +415,6 @@ "queued": "Queued", "series": "Series" }, - "octoPrint": { - "job_completion": "Completion" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index d2b4951e..53ea1ef5 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -415,9 +415,6 @@ "queued": "已加入佇列", "series": "影集" }, - "octoPrint": { - "job_completion": "完成度" - }, "octoprint": { "printer_state": "Status", "temp_tool": "Tool temp", From ca4b5b131da082a19f4e94e49b827f2a5d558e72 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:03:56 -0800 Subject: [PATCH 44/45] Allow specifying wan interface on opnsense widget --- src/utils/config/service-helpers.js | 6 +++++- src/widgets/opnsense/component.jsx | 8 +++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 28f4d76d..2024e10d 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -214,7 +214,8 @@ export function cleanServiceGroups(groups) { defaultinterval, namespace, // kubernetes widget app, - podSelector + podSelector, + wan // opnsense widget } = cleanedService.widget; cleanedService.widget = { @@ -237,6 +238,9 @@ export function cleanServiceGroups(groups) { if (app) cleanedService.widget.app = app; if (podSelector) cleanedService.widget.podSelector = podSelector; } + if (type === "opnsense") { + if (wan) cleanedService.widget.wan = wan; + } } return cleanedService; diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 53396b31..61753b47 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -33,16 +33,14 @@ export default function Component({ service }) { const cpu = 100 - parseFloat(cpuIdle); const memory = activityData.headers[3].match(/Mem: (.+) Active,/)[1]; - const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; - const wanDownload = interfaceData.interfaces.wan['bytes received']; + const wan = widget.wan ? interfaceData.interfaces[widget.wan] : interfaceData.interfaces.wan; return ( - - - + {wan && } + {wan && } ); } From c8116fc9e8f6a30e249bc0ece49c99c86019ebdd Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 22 Jan 2023 14:23:14 -0800 Subject: [PATCH 45/45] Better error output for docker integration --- src/pages/api/docker/stats/[...service].js | 24 ++++++++++----------- src/pages/api/docker/status/[...service].js | 8 +++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/pages/api/docker/stats/[...service].js b/src/pages/api/docker/stats/[...service].js index 82604f8c..84e90065 100644 --- a/src/pages/api/docker/stats/[...service].js +++ b/src/pages/api/docker/stats/[...service].js @@ -1,16 +1,18 @@ import Docker from "dockerode"; import getDockerArguments from "utils/config/docker"; +import createLogger from "utils/logger"; + +const logger = createLogger("dockerStatsService"); export default async function handler(req, res) { const { service } = req.query; const [containerName, containerServer] = service; if (!containerName && !containerServer) { - res.status(400).send({ + return res.status(400).send({ error: "docker query parameters are required", }); - return; } try { @@ -23,10 +25,9 @@ export default async function handler(req, res) { // bad docker connections can result in a object? // in any case, this ensures the result is the expected array if (!Array.isArray(containers)) { - res.status(500).send({ + return res.status(500).send({ error: "query failed", }); - return; } const containerNames = containers.map((container) => container.Names[0].replace(/^\//, "")); @@ -36,10 +37,9 @@ export default async function handler(req, res) { const container = docker.getContainer(containerName); const stats = await container.stats({ stream: false }); - res.status(200).json({ + return res.status(200).json({ stats, }); - return; } // Try with a service deployed in Docker Swarm, if enabled @@ -61,19 +61,19 @@ export default async function handler(req, res) { const container = docker.getContainer(taskContainerId); const stats = await container.stats({ stream: false }); - res.status(200).json({ + return res.status(200).json({ stats, }); - return; } } - res.status(200).send({ + return res.status(200).send({ error: "not found", }); - } catch { - res.status(500).send({ - error: {message: "Unknown error"}, + } catch (e) { + logger.error(e); + return res.status(500).send({ + error: {message: e?.message ?? "Unknown error"}, }); } } diff --git a/src/pages/api/docker/status/[...service].js b/src/pages/api/docker/status/[...service].js index fa54e6f3..f232eb98 100644 --- a/src/pages/api/docker/status/[...service].js +++ b/src/pages/api/docker/status/[...service].js @@ -1,6 +1,9 @@ import Docker from "dockerode"; import getDockerArguments from "utils/config/docker"; +import createLogger from "utils/logger"; + +const logger = createLogger("dockerStatusService"); export default async function handler(req, res) { const { service } = req.query; @@ -68,9 +71,10 @@ export default async function handler(req, res) { return res.status(200).send({ error: "not found", }); - } catch { + } catch (e) { + logger.error(e); return res.status(500).send({ - error: "unknown error", + error: {message: e?.message ?? "Unknown error"}, }); } }