From a0a2308ba52f072fbb4cc8d62152d8d8f74d3ddc Mon Sep 17 00:00:00 2001 From: henryk86 <166761451+henryk86@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:38:46 +0100 Subject: [PATCH 01/13] fixed typos (https://github.com/toniebox-reverse-engineering/teddycloud/issues/285 & https://github.com/toniebox-reverse-engineering/teddycloud/issues/286 ) --- .../tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx | 2 +- src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx b/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx index a5492a3e..41ba93f5 100644 --- a/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx +++ b/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx @@ -301,7 +301,7 @@ export const CC3200BoxFlashingPage = () => { {t("tonieboxes.cc3200BoxFlashing.installingBootloader.firstInstallation.installPreloaderText1")} - + {t("tonieboxes.cc3200BoxFlashing.installingBootloader.firstInstallation.installPreloaderText2")} diff --git a/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx b/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx index f7e994ec..9d1fb6d3 100644 --- a/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx +++ b/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx @@ -1568,8 +1568,8 @@ teddycloud --esp32-extract data/firmware/` + 
                                                                 {`mv ${certDirWithMac}/CLIENT.DER ${certDirWithMac}/client.der
-mv ${certDirWithMac}/PRIVATE.DER ${certDir}/${certDirWithMac}/private.der
-mv ${certDirWithMac}/CA.DER ${certDir}/${certDirWithMac}/ca.der`}
+mv ${certDirWithMac}/PRIVATE.DER ${certDirWithMac}/private.der
+mv ${certDirWithMac}/CA.DER ${certDirWithMac}/ca.der`}
From 93463a5be3042697fc4ced6ddaa8f324a2797974 Mon Sep 17 00:00:00 2001 From: dgenzer <31155936+dgenzer@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:06:28 +0100 Subject: [PATCH 02/13] ESP32: Hide Baudrate if HTTPS is not available - fix #195 Co-authored-by: 0xbadbee --- .../boxsetup/esp32/ESP32BoxFlashingPage.tsx | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx b/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx index f7e994ec..9bd1730e 100644 --- a/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx +++ b/src/pages/tonieboxes/boxsetup/esp32/ESP32BoxFlashingPage.tsx @@ -1925,30 +1925,32 @@ cp ${certDirWithMac}/ca.der ${certDir}/ca.der`} }} >

{t(`tonieboxes.esp32BoxFlashing.title`)}

- -
- {t("tonieboxes.esp32BoxFlashing.baudRate")} -
- {" "} - - - - + {httpsActive && ( + +
+ {t("tonieboxes.esp32BoxFlashing.baudRate")} +
+ {" "} + + + + + )} {!httpsActive ? ( <> From 900e76cb7e9b2ac217e52eb9176978a5b0d5b741 Mon Sep 17 00:00:00 2001 From: henryk86 <166761451+henryk86@users.noreply.github.com> Date: Sat, 1 Feb 2025 09:21:33 +0100 Subject: [PATCH 03/13] updated TonieboxIcon --- src/components/utils/TonieboxIcon.tsx | 37 ++++----------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/src/components/utils/TonieboxIcon.tsx b/src/components/utils/TonieboxIcon.tsx index c35d5a3a..5fed2b1d 100644 --- a/src/components/utils/TonieboxIcon.tsx +++ b/src/components/utils/TonieboxIcon.tsx @@ -1,36 +1,9 @@ export const TonieboxIcon = () => ( - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + ); From f2a207fd02b152565c1ab526b9b3ed401076a0ea Mon Sep 17 00:00:00 2001 From: dgenzer <31155936+dgenzer@users.noreply.github.com> Date: Sat, 1 Feb 2025 23:52:29 +0100 Subject: [PATCH 04/13] added number of currently selected dirs/files --- src/components/utils/FileBrowser.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/utils/FileBrowser.tsx b/src/components/utils/FileBrowser.tsx index 8ffdb477..0f7b0475 100644 --- a/src/components/utils/FileBrowser.tsx +++ b/src/components/utils/FileBrowser.tsx @@ -20,6 +20,7 @@ import { Form, Empty, Tag, + Flex, } from "antd"; import { CloseOutlined, @@ -2091,6 +2092,12 @@ export const FileBrowser: React.FC<{ })} rowClassName={rowClassName} rowSelection={{ + columnTitle: (checkbox) => ( + + {checkbox} + { selectedRowKeys.length > 0 && <>({selectedRowKeys.length}) } + + ), selectedRowKeys, onChange: onSelectChange, getCheckboxProps: (record: Record) => ({ From 133901964a4c899146523faed49edf6e9a96f474 Mon Sep 17 00:00:00 2001 From: dgenzer <31155936+dgenzer@users.noreply.github.com> Date: Sat, 1 Feb 2025 23:53:26 +0100 Subject: [PATCH 05/13] added number of selections to tooltips + translations --- public/translations/de.json | 6 +++--- public/translations/en.json | 6 +++--- public/translations/es.json | 6 +++--- public/translations/fr.json | 6 +++--- src/components/utils/FileBrowser.tsx | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/translations/de.json b/public/translations/de.json index 32e046f0..9f99410f 100644 --- a/public/translations/de.json +++ b/public/translations/de.json @@ -211,12 +211,12 @@ }, "date": "Datum", "delete": "Löschen", - "deleteMultiple": "Markierte Zeilen löschen", + "deleteMultiple": "{{selectedRowCount}} markierte Zeilen löschen", "encodeFiles": { "addFiles": "Dateien hinzufügen", "cancel": "Abbrechen", "encode": "Konvertieren", - "encodeFiles": "Markierte Dateien in eine taf-Datei konvertieren. Nur die folgenden Dateitypen werden berücksichtigt: ", + "encodeFiles": "{{selectedRowCount}} markierte Dateien in eine taf-Datei konvertieren. Nur die folgenden Dateitypen werden berücksichtigt: ", "encoding": "Kodierung", "encodingFailed": "Konvertierung fehlgeschlagen!", "encodingFailedDetails": "Kodierung der Dateien \"{{file}}\" fehlgeschlagen: ", @@ -358,7 +358,7 @@ "move": "Verschieben", "moveTo": "nach" }, - "moveMultiple": "Markierte Dateien verschieben (nur Dateien, Ordner werden übersprungen!)", + "moveMultiple": "{{selectedRowCount}} markierte Dateien verschieben (nur Dateien, Ordner werden übersprungen!)", "name": "Name", "playFile": "Abspielen", "rename": "Umbenennen", diff --git a/public/translations/en.json b/public/translations/en.json index 15d9cb36..7ad48196 100644 --- a/public/translations/en.json +++ b/public/translations/en.json @@ -211,12 +211,12 @@ }, "date": "Date", "delete": "Delete", - "deleteMultiple": "Delete selected rows", + "deleteMultiple": "Delete {{selectedRowCount}} selected rows", "encodeFiles": { "addFiles": "Add files", "cancel": "Cancel", "encode": "Encode", - "encodeFiles": "Encode selected files into a taf file. Only the following file types will be considered: ", + "encodeFiles": "Encode {{selectedRowCount}} selected files into a taf file. Only the following file types will be considered: ", "encoding": "Encoding", "encodingFailed": "Encoding failed!", "encodingFailedDetails": "Encoded files \"{{file}}\" failed: ", @@ -358,7 +358,7 @@ "move": "Move", "moveTo": "to" }, - "moveMultiple": "Move selected files (files only, folders are skipped!)", + "moveMultiple": "Move {{selectedRowCount}} selected files (files only, folders are skipped!)", "name": "Name", "playFile": "Play", "rename": "Rename", diff --git a/public/translations/es.json b/public/translations/es.json index 4cfa7b70..9b84205f 100644 --- a/public/translations/es.json +++ b/public/translations/es.json @@ -211,12 +211,12 @@ }, "date": "Fecha", "delete": "Eliminar", - "deleteMultiple": "Eliminar filas seleccionadas", + "deleteMultiple": "{{selectedRowCount}} filas seleccionadas para eliminar", "encodeFiles": { "addFiles": "Agregar archivos", "cancel": "Cancelar", "encode": "Codificar", - "encodeFiles": "Codificar los archivos seleccionados en un archivo taf. Solo se considerarán los siguientes tipos de archivos: ", + "encodeFiles": "{{selectedRowCount}} archivos seleccionados para codificar en un archivo taf. Solo se considerarán los siguientes tipos de archivos: ", "encoding": "Codificación", "encodingFailed": "¡Falló la codificación!", "encodingFailedDetails": "Error al codificar los archivos \"{{file}}\": ", @@ -358,7 +358,7 @@ "move": "Mover", "moveTo": "a" }, - "moveMultiple": "Mover archivos seleccionados (¡solo archivos, se omiten las carpetas!)", + "moveMultiple": "{{selectedRowCount}} archivos seleccionados para mover (¡solo archivos, se omiten las carpetas!)", "name": "Nombre", "playFile": "Reproducir", "rename": "Renombrar", diff --git a/public/translations/fr.json b/public/translations/fr.json index a0d27640..9e65fc7f 100644 --- a/public/translations/fr.json +++ b/public/translations/fr.json @@ -211,12 +211,12 @@ }, "date": "Date", "delete": "Supprimer", - "deleteMultiple": "Supprimer les lignes sélectionnées", + "deleteMultiple": "{{selectedRowCount}} lignes sélectionnées à supprimer", "encodeFiles": { "addFiles": "Ajouter des fichiers", "cancel": "Annuler", "encode": "Encoder", - "encodeFiles": "Encoder les fichiers sélectionnés en un fichier taf. Seuls les types de fichiers suivants seront pris en compte : ", + "encodeFiles": "{{selectedRowCount}} fichiers sélectionnés à encoder dans un fichier taf. Seuls les types de fichiers suivants seront pris en compte : ", "encoding": "Encodage", "encodingFailed": "Échec de l'encodage !", "encodingFailedDetails": "Échec de l'encodage des fichiers \"{{file}}\" : ", @@ -358,7 +358,7 @@ "move": "Déplacer", "moveTo": "vers" }, - "moveMultiple": "Déplacer les fichiers sélectionnés (fichiers uniquement, les dossiers sont ignorés!)", + "moveMultiple": "{{selectedRowCount}} fichiers sélectionnés à déplacer (fichiers uniquement, les dossiers sont ignorés !)", "name": "Nom", "playFile": "Lire", "rename": "Renommer", diff --git a/src/components/utils/FileBrowser.tsx b/src/components/utils/FileBrowser.tsx index 0f7b0475..b042a9e3 100644 --- a/src/components/utils/FileBrowser.tsx +++ b/src/components/utils/FileBrowser.tsx @@ -1976,7 +1976,7 @@ export const FileBrowser: React.FC<{ {special === "library" && files.filter((item) => selectedRowKeys.includes(item.name) && !item.isDir) .length > 0 ? ( - + } @@ -1992,7 +1992,7 @@ export const FileBrowser: React.FC<{ ) : ( "" )} - + } @@ -2017,7 +2017,7 @@ export const FileBrowser: React.FC<{ From 6ec9058d822a4dfbe1208c16bfc83c95c2a0eca4 Mon Sep 17 00:00:00 2001 From: dgenzer <31155936+dgenzer@users.noreply.github.com> Date: Sun, 2 Feb 2025 00:06:46 +0100 Subject: [PATCH 06/13] added count of files + dirs in the recent directory --- src/components/utils/FileBrowser.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/utils/FileBrowser.tsx b/src/components/utils/FileBrowser.tsx index b042a9e3..1385eb42 100644 --- a/src/components/utils/FileBrowser.tsx +++ b/src/components/utils/FileBrowser.tsx @@ -1955,9 +1955,12 @@ export const FileBrowser: React.FC<{ "" )}
-
+
+
{t("tonies.currentPath")}
{generateBreadcrumbs(path, handleBreadcrumbClick)} +
+
({files.filter(x => x.name != "..").length})
Date: Sun, 9 Feb 2025 12:33:10 +0100 Subject: [PATCH 07/13] gh-204 + gh-203 added tracklength to taf-header info modal and display content as yaml --- package-lock.json | 14 ++++-- package.json | 1 + public/translations/de.json | 1 + public/translations/en.json | 1 + public/translations/es.json | 1 + public/translations/fr.json | 1 + src/components/utils/FileBrowser.tsx | 71 +++++++++++++++++++++------- src/types/fileBrowserTypes.tsx | 1 + 8 files changed, 72 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d507630..92bba328 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,6 +37,7 @@ }, "devDependencies": { "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@types/js-yaml": "^4.0.9", "@types/react-syntax-highlighter": "^15.5.13", "concurrently": "^8.2.2", "cross-env": "^7.0.3" @@ -1808,6 +1809,13 @@ "pretty-format": "^29.0.0" } }, + "node_modules/@types/js-yaml": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", + "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "22.8.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz", @@ -4526,9 +4534,9 @@ } }, "node_modules/vite": { - "version": "5.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", - "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "license": "MIT", "dependencies": { "esbuild": "^0.21.3", diff --git a/package.json b/package.json index e10c0e8f..dcde49d8 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ }, "devDependencies": { "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@types/js-yaml": "^4.0.9", "@types/react-syntax-highlighter": "^15.5.13", "concurrently": "^8.2.2", "cross-env": "^7.0.3" diff --git a/public/translations/de.json b/public/translations/de.json index 9f99410f..95f06d35 100644 --- a/public/translations/de.json +++ b/public/translations/de.json @@ -1441,6 +1441,7 @@ "title": "System Sounds" }, "tafHeaderOf": "TAF-Header von ", + "tafHeaderInvalid": "Ungültige TAF", "tap": { "navigationTitle": "WIP: Audio Playlists", "title": "WIP: Tonie Audio Playlists" diff --git a/public/translations/en.json b/public/translations/en.json index 7ad48196..476b3623 100644 --- a/public/translations/en.json +++ b/public/translations/en.json @@ -1441,6 +1441,7 @@ "title": "System Sounds" }, "tafHeaderOf": "TAF-Header of ", + "tafHeaderInvalid": "Invalid TAF", "tap": { "navigationTitle": "WIP: Audio Playlists", "title": "WIP: Tonie Audio Playlists" diff --git a/public/translations/es.json b/public/translations/es.json index 9b84205f..7da99d8e 100644 --- a/public/translations/es.json +++ b/public/translations/es.json @@ -1441,6 +1441,7 @@ "title": "Sonidos del sistema" }, "tafHeaderOf": "TAF-Header de ", + "tafHeaderInvalid": "TAF no válido", "tap": { "navigationTitle": "WIP: Listas de reproducción de audio", "title": "WIP: Listas de reproducción de audio de Tonie" diff --git a/public/translations/fr.json b/public/translations/fr.json index 9e65fc7f..14598f9a 100644 --- a/public/translations/fr.json +++ b/public/translations/fr.json @@ -1441,6 +1441,7 @@ "title": "Sons du système" }, "tafHeaderOf": "En-tête TAF de ", + "tafHeaderInvalid": "TAF invalide", "tap": { "navigationTitle": "WIP: Listes de lecture audio", "title": "WIP: Listes de lecture audio de Tonie" diff --git a/src/components/utils/FileBrowser.tsx b/src/components/utils/FileBrowser.tsx index 1385eb42..259c2acf 100644 --- a/src/components/utils/FileBrowser.tsx +++ b/src/components/utils/FileBrowser.tsx @@ -22,6 +22,7 @@ import { Tag, Flex, } from "antd"; +import yaml from "js-yaml"; import { CloseOutlined, CloudServerOutlined, @@ -135,7 +136,7 @@ export const FileBrowser: React.FC<{ const [isTafMetaEditorModalOpen, setIsTafMetaEditorModalOpen] = useState(false); const [tafMetaEditorKey, setTafMetaEditorKey] = useState(0); - const [currentRecordTafHeader, setCurrentRecordTafHeader] = useState(); + const [currentRecordYaml, setCurrentRecordYaml] = useState(""); const [isTafHeaderModalOpen, setIsTafHeaderModalOpen] = useState(false); const [isUnchangedOrEmpty, setIsUnchangedOrEmpty] = useState(true); @@ -397,6 +398,20 @@ export const FileBrowser: React.FC<{ /> ); + // other functions + const transformTafHeaderToYaml = (jsonData: RecordTafHeader) => { + const transformedData = [ + { + "audio-id": jsonData.audioId, + hash: jsonData.sha1Hash, + size: jsonData.size, + tracks: jsonData.trackSeconds?.length, + confidence: 0, + }, + ]; + return yaml.dump(transformedData).trim(); + }; + // information model functions const showInformationModal = (record: any) => { if (!record.isDir && record.tonieInfo?.tracks) { @@ -455,10 +470,13 @@ export const FileBrowser: React.FC<{ // taf header viewer functions const showTafHeader = (file: string, recordTafHeader: RecordTafHeader) => { - const currentRecordTafHeader: RecordTafHeader = recordTafHeader; - const { trackSeconds, ...currentRecordTafHeaderCopy } = currentRecordTafHeader; setFilterFieldAutoFocus(false); - setCurrentRecordTafHeader(currentRecordTafHeaderCopy); + + if (recordTafHeader.valid) { + setCurrentRecordYaml(transformTafHeaderToYaml(recordTafHeader)); + } else { + setCurrentRecordYaml(t("tonies.tafHeaderInvalid")); + } setCurrentFile(file); setIsTafHeaderModalOpen(true); }; @@ -480,8 +498,10 @@ export const FileBrowser: React.FC<{ onCancel={closeTafHeader} width={700} > - {currentRecordTafHeader ? ( - + {currentRecordYaml ? ( + <> + + ) : ( "Loading..." )} @@ -1955,12 +1975,20 @@ export const FileBrowser: React.FC<{ "" )}
-
-
-
{t("tonies.currentPath")}
- {generateBreadcrumbs(path, handleBreadcrumbClick)} +
+
+
{t("tonies.currentPath")}
+ {generateBreadcrumbs(path, handleBreadcrumbClick)}
-
({files.filter(x => x.name != "..").length})
+
({files.filter((x) => x.name != "..").length})
selectedRowKeys.includes(item.name) && !item.isDir) .length > 0 ? ( - +
{confirmHideTonieModal} diff --git a/src/pages/community/ChangelogPage.tsx b/src/pages/community/ChangelogPage.tsx index 743e0641..1f0f55fa 100644 --- a/src/pages/community/ChangelogPage.tsx +++ b/src/pages/community/ChangelogPage.tsx @@ -29,6 +29,7 @@ export const ChangelogPage = () => { "gui: show number of selected entries / total files in library/content view https://github.com/toniebox-reverse-engineering/teddycloud_web/issues/199", "gui: hide baudrate selection if not necessary https://github.com/toniebox-reverse-engineering/teddycloud_web/issues/195", "gui: added support previous set hostname in esp32 flash process https://github.com/toniebox-reverse-engineering/teddycloud_web/issues/189", + "gui: added download possibility to taf files as *.ogg file within Tonie/tag Information modal and filebrowser https://github.com/toniebox-reverse-engineering/teddycloud_web/issues/207", "gui: Some refactoring", ], commits: [ From bb5333b5619b07c559928e91f63f08fe927078dc Mon Sep 17 00:00:00 2001 From: henryk86 <166761451+henryk86@users.noreply.github.com> Date: Sun, 2 Mar 2025 17:53:03 +0100 Subject: [PATCH 12/13] extended Changelog --- src/pages/community/ChangelogPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/community/ChangelogPage.tsx b/src/pages/community/ChangelogPage.tsx index 1f0f55fa..29fffbfe 100644 --- a/src/pages/community/ChangelogPage.tsx +++ b/src/pages/community/ChangelogPage.tsx @@ -21,6 +21,7 @@ export const ChangelogPage = () => { "Add field2/field6 of the toniebox settings with unknown functionality", "Always set Toniebox settings, if cloud not enabled or had error", "Save used domains sent via rtnl", + "Implemented tbs_tag_removed for CC3200 + ESP32 (new mqtt event, more details: https://github.com/toniebox-reverse-engineering/teddycloud/pull/309)", "Disable keep-alive for boxine upstream https://github.com/toniebox-reverse-engineering/teddycloud/issues/310", "Added hide flag to dirs https://github.com/toniebox-reverse-engineering/teddycloud/issues/234", "gui: added track count to taf header viewer https://github.com/toniebox-reverse-engineering/teddycloud_web/issues/203", From d24276e8d0972477d988449c566879974795d02a Mon Sep 17 00:00:00 2001 From: SciLor Date: Mon, 3 Mar 2025 18:54:08 +0000 Subject: [PATCH 13/13] make clear that c2.der is the source file --- public/translations/de.json | 2 +- public/translations/en.json | 2 +- public/translations/es.json | 2 +- public/translations/fr.json | 2 +- src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/translations/de.json b/public/translations/de.json index 86b72509..70156008 100644 --- a/public/translations/de.json +++ b/public/translations/de.json @@ -913,7 +913,7 @@ "dumpCertificatesLink": "Hier findest du die Anleitung zum Entnehmen von Zertifikaten", "flashCAreplacement": "CA-Ersatz für TeddyCloud flashen", "flashCAreplacementIntro": "Es wird empfohlen, das Ersatz-CA-Zertifikat nach /cert/c2.der zu flashen und den Hackiebox-NG-Bootloader mit dem altCA.305-Patch zu verwenden (weitere Details in den nächsten Schritten). Dadurch kannst du nahtlos zwischen dem Originalzertifikat und deinem Ersatzzertifikat wechseln.", - "flashCAreplacementOutro": "Stelle sicher, dass du den richtigen Pfad zur Datei ca.der ausgewählt hast.", + "flashCAreplacementOutro": "Stelle sicher, dass du den richtigen Pfad zur Datei c2.der ausgewählt hast.", "flashCAreplacementText": "Um die heruntergeladene c2.der-Datei (siehe oben) auf deine Toniebox zu schreiben, verwende den folgenden Befehl:", "hint": "Es gibt derzeit keine direkte Unterstützung, um deine CC3200 Toniebox mit TeddyCloud zu flashen, aber hier findest du eine Schritt-für-Schritt-Anleitung:", "hint2": "Bitte folge dann dem CC3200-Pfad:", diff --git a/public/translations/en.json b/public/translations/en.json index 38589f75..54e59552 100644 --- a/public/translations/en.json +++ b/public/translations/en.json @@ -913,7 +913,7 @@ "dumpCertificatesLink": "Find instructions for dumping certificates here", "flashCAreplacement": "Flash CA replacement for TeddyCloud", "flashCAreplacementIntro": "It is recommended to flash the replacement CA to /cert/c2.der and use the Hackiebox-NG bootloader with the altCA.305 patch (more details provided in the next steps). This setup enables you to switch seamlessly between the original certificate and your replacement certificate.", - "flashCAreplacementOutro": "Ensure that you have selected the correct path to the ca.der file.", + "flashCAreplacementOutro": "Ensure that you have selected the correct path to the c2.der file.", "flashCAreplacementText": "To write the downloaded c2.der file (refer to the steps above) to your Toniebox, use the following command:", "hint": "There is currently no direct support of flashing your CC3200 Toniebox with TeddyCloud, but you will find a step by step guidance here:", "hint2": "Please follow then the CC3200 path:", diff --git a/public/translations/es.json b/public/translations/es.json index 06bd816b..c82e969d 100644 --- a/public/translations/es.json +++ b/public/translations/es.json @@ -913,7 +913,7 @@ "dumpCertificatesLink": "Encuentra las instrucciones para extraer certificados aquí", "flashCAreplacement": "Flashear reemplazo CA para TeddyCloud", "flashCAreplacementIntro": "Se recomienda flashear el certificado CA de reemplazo en /cert/c2.der y usar el bootloader Hackiebox-NG con el parche altCA.305 (más detalles en los siguientes pasos). Esto te permitirá cambiar fácilmente entre el certificado original y tu certificado de reemplazo.", - "flashCAreplacementOutro": "Asegúrate de haber seleccionado la ruta correcta al archivo ca.der.", + "flashCAreplacementOutro": "Asegúrate de haber seleccionado la ruta correcta al archivo c2.der.", "flashCAreplacementText": "Para escribir el archivo c2.der descargado (consulta los pasos anteriores) en tu Toniebox, utiliza el siguiente comando:", "hint": "Actualmente no hay soporte directo para flashear tu Toniebox CC3200 con TeddyCloud, pero encontrarás una guía paso a paso aquí:", "hint2": "Sigue luego el camino para CC3200:", diff --git a/public/translations/fr.json b/public/translations/fr.json index 26374772..db71792a 100644 --- a/public/translations/fr.json +++ b/public/translations/fr.json @@ -913,7 +913,7 @@ "dumpCertificatesLink": "Trouve les instructions pour extraire les certificats ici", "flashCAreplacement": "Flasher le remplacement CA pour TeddyCloud", "flashCAreplacementIntro": "Il est recommandé de flasher le certificat CA de remplacement dans /cert/c2.der et d'utiliser le bootloader Hackiebox-NG avec le patch altCA.305 (plus de détails dans les étapes suivantes). Cela te permettra de basculer facilement entre le certificat original et ton certificat de remplacement.", - "flashCAreplacementOutro": "Assure-toi d'avoir sélectionné le bon chemin vers le fichier ca.der.", + "flashCAreplacementOutro": "Assure-toi d'avoir sélectionné le bon chemin vers le fichier c2.der.", "flashCAreplacementText": "Pour écrire le fichier c2.der téléchargé (voir les étapes ci-dessus) sur ta Toniebox, utilise la commande suivante :", "hint": "Il n'y a actuellement pas de support direct pour flasher votre CC3200 Toniebox avec TeddyCloud, mais vous trouverez ici un guide étape par étape :", "hint2": "Veuillez suivre ensuite le chemin CC3200 :", diff --git a/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx b/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx index 2dd0e0bc..16525454 100644 --- a/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx +++ b/src/pages/tonieboxes/boxsetup/cc3200/CC3200BoxFlashingPage.tsx @@ -468,7 +468,7 @@ export const CC3200BoxFlashingPage = () => {

{t("tonieboxes.cc3200BoxFlashing.flashCAreplacement")}

{t("tonieboxes.cc3200BoxFlashing.flashCAreplacementIntro")} {t("tonieboxes.cc3200BoxFlashing.flashCAreplacementText")} - + {t("tonieboxes.cc3200BoxFlashing.flashCAreplacementOutro")} );