From 4a2366a13cae3516039fa10aea841cb6800964d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Mon, 17 Dec 2018 19:48:37 +0100 Subject: [PATCH] Use wording perf update type --- src/components/SettingsPage/sections/Help.js | 5 +---- src/components/modals/UpdateFirmware/Installing.js | 5 +++-- .../modals/UpdateFirmware/steps/02-step-flash-mcu.js | 6 +++--- static/i18n/en/app.json | 7 +++++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/components/SettingsPage/sections/Help.js b/src/components/SettingsPage/sections/Help.js index 15eba3c4..10949ceb 100644 --- a/src/components/SettingsPage/sections/Help.js +++ b/src/components/SettingsPage/sections/Help.js @@ -73,10 +73,7 @@ class SectionHelp extends PureComponent { > - + diff --git a/src/components/modals/UpdateFirmware/Installing.js b/src/components/modals/UpdateFirmware/Installing.js index 5a06c152..e3fff13d 100644 --- a/src/components/modals/UpdateFirmware/Installing.js +++ b/src/components/modals/UpdateFirmware/Installing.js @@ -11,9 +11,10 @@ import type { T } from 'types/common' type Props = { t: T, progress: number, + installing: string, } -function Installing({ t, progress }: Props) { +function Installing({ t, progress, installing }: Props) { return ( @@ -21,7 +22,7 @@ function Installing({ t, progress }: Props) { - {t('manager.modal.installing')} + {t(`manager.modal.steps.${installing}`)} diff --git a/src/components/modals/UpdateFirmware/steps/02-step-flash-mcu.js b/src/components/modals/UpdateFirmware/steps/02-step-flash-mcu.js index 308a58b8..500a022a 100644 --- a/src/components/modals/UpdateFirmware/steps/02-step-flash-mcu.js +++ b/src/components/modals/UpdateFirmware/steps/02-step-flash-mcu.js @@ -43,13 +43,13 @@ const Separator = styled(Box).attrs({ type Props = StepProps type State = { - installing: boolean, + installing: ?string, progress: number, } class StepFlashMcu extends PureComponent { state = { - installing: false, + installing: null, progress: 0, } @@ -92,7 +92,7 @@ class StepFlashMcu extends PureComponent { const { t } = this.props return installing ? ( - + ) : ( diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 9a5868d8..633e2eba 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -258,9 +258,12 @@ }, "modal": { "steps": { - "updateMCU": "MCU update" + "updateMCU": "MCU update", + "osu": "Installing OSU...", + "flash-mcu": "MCU updating...", + "flash-bootloader": "Bootloader updating...", + "firmware": "Firmware updating..." }, - "installing": "Firmware updating...", "confirmIdentifier": "Verify the identifier", "confirmIdentifierText": "Verify that the identifier on your device is the same as the identifier below. Press the right button and enter your PIN code to confirm", "identifier": "Identifier",