diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl index 8a7328ce5..f9bc29eda 100644 --- a/gui/public/i18n/en/translation.ftl +++ b/gui/public/i18n/en/translation.ftl @@ -1249,7 +1249,7 @@ firmware_tool-build_step-description = firmware_tool-flashing_step = Flashing firmware_tool-flashing_step-description = Your trackers are flashing, please follow the instructions on the screen -firmware_tool-flashing_step-warning = Do not unplug or restart the tracker during the upload process unless told to, it may make your board unusable +firmware_tool-flashing_step-warning-v2 = Do not unplug or turn off the tracker during the upload process unless told to, it may make your board unusable firmware_tool-flashing_step-flash_more = Flash more trackers firmware_tool-flashing_step-exit = Exit @@ -1265,7 +1265,7 @@ firmware_tool-build-ERROR = Unable to build the firmware ## Firmware update status firmware_update-status-DOWNLOADING = Downloading the firmware -firmware_update-status-NEED_MANUAL_REBOOT = Please restart the tracker +firmware_update-status-NEED_MANUAL_REBOOT-v2 = Please turn your tracker off and on again firmware_update-status-AUTHENTICATING = Authenticating with the mcu firmware_update-status-UPLOADING = Uploading the firmware firmware_update-status-SYNCING_WITH_MCU = Syncing with the mcu diff --git a/gui/src/components/firmware-tool/DeviceCard.tsx b/gui/src/components/firmware-tool/DeviceCard.tsx index 405d934ec..d765928c1 100644 --- a/gui/src/components/firmware-tool/DeviceCard.tsx +++ b/gui/src/components/firmware-tool/DeviceCard.tsx @@ -1,7 +1,10 @@ import { CHECKBOX_CLASSES } from '@/components/commons/Checkbox'; import { ProgressBar } from '@/components/commons/ProgressBar'; import { Typography } from '@/components/commons/Typography'; -import { firmwareUpdateErrorStatus } from '@/hooks/firmware-tool'; +import { + firmwareUpdateErrorStatus, + firmwareUpdateStatusLabel, +} from '@/hooks/firmware-tool'; import { useLocalization } from '@fluent/react'; import classNames from 'classnames'; import { Control, Controller } from 'react-hook-form'; @@ -42,9 +45,7 @@ export function DeviceCardContent({ deviceNames, status }: DeviceCardProps) { {status !== undefined ? ( - {l10n.getString( - 'firmware_update-status-' + FirmwareUpdateStatus[status] - )} + {l10n.getString(firmwareUpdateStatusLabel[status])} ) : ( // placeholder so the size of the component does not change if there is no status diff --git a/gui/src/components/firmware-tool/FlashingStep.tsx b/gui/src/components/firmware-tool/FlashingStep.tsx index 3c7f33bcc..b8fc9137e 100644 --- a/gui/src/components/firmware-tool/FlashingStep.tsx +++ b/gui/src/components/firmware-tool/FlashingStep.tsx @@ -171,7 +171,7 @@ export function FlashingStep({
{shouldShowRebootWarning && ( - + Warning )} diff --git a/gui/src/components/firmware-update/FirmwareUpdate.tsx b/gui/src/components/firmware-update/FirmwareUpdate.tsx index d137b6427..222491186 100644 --- a/gui/src/components/firmware-update/FirmwareUpdate.tsx +++ b/gui/src/components/firmware-update/FirmwareUpdate.tsx @@ -343,7 +343,7 @@ export function FirmwareUpdate() { )} {shouldShowRebootWarning && ( - + Warning )} diff --git a/gui/src/hooks/firmware-tool.ts b/gui/src/hooks/firmware-tool.ts index 40580736c..002b98939 100644 --- a/gui/src/hooks/firmware-tool.ts +++ b/gui/src/hooks/firmware-tool.ts @@ -82,6 +82,32 @@ export const firmwareUpdateErrorStatus = [ FirmwareUpdateStatus.ERROR_UPLOAD_FAILED, ]; +export const firmwareUpdateStatusLabel: Record = { + [FirmwareUpdateStatus.DOWNLOADING]: 'firmware_update-status-DOWNLOADING', + [FirmwareUpdateStatus.NEED_MANUAL_REBOOT]: + 'firmware_update-status-NEED_MANUAL_REBOOT-v2', + [FirmwareUpdateStatus.AUTHENTICATING]: 'firmware_update-status-AUTHENTICATING', + [FirmwareUpdateStatus.UPLOADING]: 'firmware_update-status-UPLOADING', + [FirmwareUpdateStatus.SYNCING_WITH_MCU]: 'firmware_update-status-SYNCING_WITH_MCU', + [FirmwareUpdateStatus.REBOOTING]: 'firmware_update-status-REBOOTING', + [FirmwareUpdateStatus.PROVISIONING]: 'firmware_update-status-PROVISIONING', + [FirmwareUpdateStatus.DONE]: 'firmware_update-status-DONE', + [FirmwareUpdateStatus.ERROR_DEVICE_NOT_FOUND]: + 'firmware_update-status-ERROR_DEVICE_NOT_FOUND', + [FirmwareUpdateStatus.ERROR_TIMEOUT]: 'firmware_update-status-ERROR_TIMEOUT', + [FirmwareUpdateStatus.ERROR_DOWNLOAD_FAILED]: + 'firmware_update-status-ERROR_DOWNLOAD_FAILED', + [FirmwareUpdateStatus.ERROR_AUTHENTICATION_FAILED]: + 'firmware_update-status-ERROR_AUTHENTICATION_FAILED', + [FirmwareUpdateStatus.ERROR_UPLOAD_FAILED]: + 'firmware_update-status-ERROR_UPLOAD_FAILED', + [FirmwareUpdateStatus.ERROR_PROVISIONING_FAILED]: + 'firmware_update-status-ERROR_PROVISIONING_FAILED', + [FirmwareUpdateStatus.ERROR_UNSUPPORTED_METHOD]: + 'firmware_update-status-ERROR_UNSUPPORTED_METHOD', + [FirmwareUpdateStatus.ERROR_UNKNOWN]: 'firmware_update-status-ERROR_UNKNOWN', +}; + export interface FirmwareToolContext { selectBoard: (boardType: CreateBoardConfigDTO['type']) => Promise; selectVersion: (version: CreateBuildFirmwareDTO['version']) => void;