From f020604812da3b338f2a00778c35d52768da26bc Mon Sep 17 00:00:00 2001 From: Ilja Kartashov Date: Tue, 21 Nov 2023 13:39:46 +0100 Subject: [PATCH] Add support for log files with unknown size --- src/locales/c.json | 1 + src/locales/source/cs.json | 3 ++- src/locales/source/de.json | 3 ++- src/locales/source/en.json | 1 + src/locales/source/es.json | 3 ++- src/locales/source/fr.json | 3 ++- src/locales/source/it.json | 3 ++- src/locales/source/kr.json | 5 +++-- src/locales/source/lt.json | 3 ++- src/locales/source/nl.json | 3 ++- src/locales/source/pl.json | 3 ++- src/locales/source/sk.json | 3 ++- src/printer/components/settings/logs.js | 11 +++++++---- 13 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/locales/c.json b/src/locales/c.json index e0284fae..b25453db 100644 --- a/src/locales/c.json +++ b/src/locales/c.json @@ -84,6 +84,7 @@ "home.link": "", "home.title": "", "logs.empty-file": "", + "logs.file-size-unknown": "", "logs.file-too-large": "", "logs.not-selected": "", "logs.select-file-placeholder": "", diff --git a/src/locales/source/cs.json b/src/locales/source/cs.json index 5ae3c836..7a130bb5 100644 --- a/src/locales/source/cs.json +++ b/src/locales/source/cs.json @@ -271,5 +271,6 @@ "btn.check-updates": "Kontrola aktualizací", "btn.upgrade": "Aktualizovat", "conn.error_status": "Chyba", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/de.json b/src/locales/source/de.json index a38736a5..886fa385 100644 --- a/src/locales/source/de.json +++ b/src/locales/source/de.json @@ -285,5 +285,6 @@ "conn.error_status": "Fehler", "msg.file-exists.overwrite-it": "Möchten Sie sie überschreiben?", "msg.file-exists.title": "Datei existiert bereits", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/en.json b/src/locales/source/en.json index 9d277dfd..e65af647 100644 --- a/src/locales/source/en.json +++ b/src/locales/source/en.json @@ -74,6 +74,7 @@ "home.title": "Printer Status", "logs.empty-file": "Log file is empty!", "logs.file-too-large": "Log files of size larger than {{size}} are available only for downloading.", + "logs.file-size-unknown": "The log file is of an unknown size and therefore is available only for downloading", "logs.not-selected": "No log file is selected!", "logs.select-file": "Select File", "logs.select-file-placeholder": "Select log file", diff --git a/src/locales/source/es.json b/src/locales/source/es.json index d6bfa683..ef0f342c 100644 --- a/src/locales/source/es.json +++ b/src/locales/source/es.json @@ -266,5 +266,6 @@ "conn.error_status": "Error", "msg.file-exists.overwrite-it": "¿Quieres sobrescribirlo?", "msg.file-exists.title": "El archivo ya existe", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/fr.json b/src/locales/source/fr.json index e5dceb9b..ab8b7ab5 100644 --- a/src/locales/source/fr.json +++ b/src/locales/source/fr.json @@ -277,5 +277,6 @@ "msg.file-exists.overwrite-it": "Voulez-vous l'écraser ?", "msg.file-exists.title": "Le fichier existe déjà", "conn.error_status": "Erreur", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/it.json b/src/locales/source/it.json index 5e2eae2c..f2e01485 100644 --- a/src/locales/source/it.json +++ b/src/locales/source/it.json @@ -266,5 +266,6 @@ "conn.error_status": "Errore", "msg.file-exists.overwrite-it": "Vuoi sovrascriverlo?", "msg.file-exists.title": "File già esistente", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/kr.json b/src/locales/source/kr.json index a6b6f706..1e5f48ff 100644 --- a/src/locales/source/kr.json +++ b/src/locales/source/kr.json @@ -275,5 +275,6 @@ "conn.error_status": "에러", "msg.file-exists.overwrite-it": "덮어쓰시겠습니까?", "msg.file-exists.title": "파일이 이미 존재합니다.", - "conn.printer.not-supported": "" -} + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" +} \ No newline at end of file diff --git a/src/locales/source/lt.json b/src/locales/source/lt.json index 5e2bd355..51ea9b4c 100644 --- a/src/locales/source/lt.json +++ b/src/locales/source/lt.json @@ -274,5 +274,6 @@ "conn.error_status": "", "msg.file-exists.overwrite-it": "", "msg.file-exists.title": "", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/nl.json b/src/locales/source/nl.json index b994b205..12387f72 100644 --- a/src/locales/source/nl.json +++ b/src/locales/source/nl.json @@ -274,5 +274,6 @@ "msg.file-exists": "", "msg.file-exists.overwrite-it": "", "msg.file-exists.title": "", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/pl.json b/src/locales/source/pl.json index 71bcdc07..d49119e2 100644 --- a/src/locales/source/pl.json +++ b/src/locales/source/pl.json @@ -266,5 +266,6 @@ "conn.error_status": "Błąd", "msg.file-exists.overwrite-it": "Czy chcesz go nadpisać?", "msg.file-exists.title": "Plik już istnieje", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/locales/source/sk.json b/src/locales/source/sk.json index 6bba03f9..85027466 100644 --- a/src/locales/source/sk.json +++ b/src/locales/source/sk.json @@ -277,5 +277,6 @@ "conn.error_status": "", "msg.file-exists.overwrite-it": "", "msg.file-exists.title": "", - "conn.printer.not-supported": "" + "conn.printer.not-supported": "", + "logs.file-size-unknown": "" } \ No newline at end of file diff --git a/src/printer/components/settings/logs.js b/src/printer/components/settings/logs.js index 1b46f17c..9f05d9d8 100644 --- a/src/printer/components/settings/logs.js +++ b/src/printer/components/settings/logs.js @@ -58,9 +58,8 @@ function showLogContent(filename) { }) } -function showLogExceedSizeLimit() { +function showLogLimitMessage(message) { const ul = document.querySelector("ul.logs"); - const message = translate("logs.file-too-large", { size: formatData("size", sizeLimit) }); if (ul) { ul.innerHTML = createLi(message); } @@ -78,8 +77,12 @@ const update = () => { if (file) { if (!selectedFileDate || file.date > selectedFileDate) { selectedFileDate = file.date; - if (file.size > sizeLimit) { - showLogExceedSizeLimit(); + if (file.size === null) { + showLogLimitMessage(translate("logs.file-size-unknown")); + } else if (file.size > sizeLimit) { + showLogLimitMessage( + translate("logs.file-too-large", { size: formatData("size", sizeLimit) }) + ); } else { showLogContent(selectedFileName); }