diff --git a/lang/ui.ca.json b/lang/ui.ca.json index 5c75e89e7..ab082f358 100644 --- a/lang/ui.ca.json +++ b/lang/ui.ca.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Connecta una micro:bit de recollida de dades o importa mostres de dades", "description": "Empty data samples page text" diff --git a/lang/ui.en.json b/lang/ui.en.json index 38e066a61..1e89044bf 100644 --- a/lang/ui.en.json +++ b/lang/ui.en.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Connect a data collection micro:bit or import data samples", "description": "Empty data samples page text" diff --git a/lang/ui.es-es.json b/lang/ui.es-es.json index fcd67e79d..05e50e203 100644 --- a/lang/ui.es-es.json +++ b/lang/ui.es-es.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Conecta una colección de datos de micro:bit o importa muestras de datos", "description": "Empty data samples page text" diff --git a/lang/ui.fr.json b/lang/ui.fr.json index eef0d870b..7c784c922 100644 --- a/lang/ui.fr.json +++ b/lang/ui.fr.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Connecter un micro:bit de collecte de données ou importer des échantillons de données", "description": "Empty data samples page text" diff --git a/lang/ui.ja.json b/lang/ui.ja.json index 0b76e7177..057b7fd0a 100644 --- a/lang/ui.ja.json +++ b/lang/ui.ja.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "データ収集用micro:bitを接続 または データサンプルのインポート", "description": "Empty data samples page text" diff --git a/lang/ui.ko.json b/lang/ui.ko.json index 10c76cbdb..08c7612b0 100644 --- a/lang/ui.ko.json +++ b/lang/ui.ko.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "데이터 수집 micro:bit에 연결하기 또는 데이터 샘플 가져오기를 하세요.", "description": "Empty data samples page text" diff --git a/lang/ui.lol.json b/lang/ui.lol.json index 67bcb25df..c26af88f1 100644 --- a/lang/ui.lol.json +++ b/lang/ui.lol.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "crwdns362772:0crwdne362772:0", "description": "Empty data samples page text" diff --git a/lang/ui.nl.json b/lang/ui.nl.json index 15976656f..4d7aa2d49 100644 --- a/lang/ui.nl.json +++ b/lang/ui.nl.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Verbind een micro:bit die gegevens verzamelt of importeer data samples", "description": "Empty data samples page text" diff --git a/lang/ui.pl.json b/lang/ui.pl.json index 02f14dd83..8afaa5348 100644 --- a/lang/ui.pl.json +++ b/lang/ui.pl.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Podłącz micro:bit zbierający dane lub importuj próbki danych", "description": "Empty data samples page text" diff --git a/lang/ui.pt-br.json b/lang/ui.pt-br.json index 1b954a29d..cf9aca667 100644 --- a/lang/ui.pt-br.json +++ b/lang/ui.pt-br.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "Conecte um micro:bit de coleta de dados ou importe as amostras de dados", "description": "Empty data samples page text" diff --git a/lang/ui.zh-tw.json b/lang/ui.zh-tw.json index d3959f4dd..21068e724 100644 --- a/lang/ui.zh-tw.json +++ b/lang/ui.zh-tw.json @@ -371,14 +371,14 @@ "defaultMessage": "If needed, change the pattern below to match.", "description": "Native Bluetooth pattern dialog subtitle" }, + "connect-native-start-battery-check": { + "defaultMessage": "Connect the battery pack, then check the light on the back of the micro:bit is on.", + "description": "Instruction to check the micro:bit is powered on via the battery pack" + }, "connect-native-start-heading": { - "defaultMessage": "What you need to connect", + "defaultMessage": "Connect micro:bit battery pack", "description": "Connection dialog heading" }, - "connect-native-start-requirements1": { - "defaultMessage": "micro:bit with battery pack", - "description": "Label for image of a micro:bit and battery pack" - }, "connect-or-import": { "defaultMessage": "連線數據收集用的 micro:bit匯入數據樣本", "description": "Empty data samples page text" diff --git a/src/components/DataConnectionDialogs.tsx b/src/components/DataConnectionDialogs.tsx index 0d064b291..ef9a53c5e 100644 --- a/src/components/DataConnectionDialogs.tsx +++ b/src/components/DataConnectionDialogs.tsx @@ -7,9 +7,13 @@ import { DataConnectionStep, DataConnectionType, isDataConnectionDialogOpen, + useDataConnectionActions, } from "../data-connection-flow"; +import { DataConnectionState } from "../data-connection-flow/data-connection-types"; +import { bluetoothUniversalHex } from "../device/get-hex-file"; +import { isAndroid } from "../platform"; import { useStore } from "../store"; -import { useDataConnectionActions } from "../data-connection-flow"; +import BluetoothConnectingDialog from "./BluetoothConnectingDialog"; import PermissionErrorDialog from "./BluetoothPermissionErrorDialog"; import BrokenFirmwareDialog from "./BrokenFirmwareDialog"; import ConnectBatteryDialog from "./ConnectBatteryDialog"; @@ -25,8 +29,11 @@ import DownloadProgressDialog, { import EnterBluetoothPatternDialog from "./EnterBluetoothPatternDialog"; import LoadingDialog from "./LoadingDialog"; import ManualFlashingDialog from "./ManualFlashingDialog"; +import NativeBluetoothConnectBatteryDialog from "./NativeBluetoothConnectBatteryDialog"; import NativeBluetoothErrorDialog from "./NativeBluetoothErrorDialog"; +import NativeBluetoothPairingLostDialog from "./NativeBluetoothPairingLostDialog"; import ResetToBluetoothModeDialog from "./ResetToBluetoothModeDialog"; +import ResetToBluetoothModeTroubleshootDialog from "./ResetToBluetoothModeTroubleshootDialog"; import SelectMicrobitBluetoothDialog from "./SelectMicrobitBluetoothDialog"; import SelectMicrobitUsbDialog, { getHeadingId as getSelectMicrobitUsbHeadingId, @@ -35,12 +42,6 @@ import TryAgainDialog from "./TryAgainDialog"; import UnsupportedMicrobitDialog from "./UnsupportedMicrobitDialog"; import WebUsbBluetoothUnsupportedDialog from "./WebUsbBluetoothUnsupportedDialog"; import WhatYouWillNeedDialog from "./WhatYouWillNeedDialog"; -import { bluetoothUniversalHex } from "../device/get-hex-file"; -import { isAndroid } from "../platform"; -import { DataConnectionState } from "../data-connection-flow/data-connection-types"; -import NativeBluetoothPairingLostDialog from "./NativeBluetoothPairingLostDialog"; -import ResetToBluetoothModeTroubleshootDialog from "./ResetToBluetoothModeTroubleshootDialog"; -import BluetoothConnectingDialog from "./BluetoothConnectingDialog"; const getDeviceType = (state: DataConnectionState): ConnectionErrorDeviceType => state.type === DataConnectionType.Radio @@ -62,9 +63,18 @@ const DataConnectionDialogs = () => { switch (state.step) { case DataConnectionStep.StartOver: case DataConnectionStep.Start: { + if (state.type === DataConnectionType.NativeBluetooth) { + return ( + + ); + } return ( { + reconnect: boolean; +} + +const NativeBluetoothConnectBatteryDialog = ({ + reconnect, + ...props +}: NativeBluetoothConnectBatteryDialogProps) => { + return ( + + + {reconnect && ( + + + + )} + + + + + + + ); +}; + +export default NativeBluetoothConnectBatteryDialog; diff --git a/src/components/WhatYouWillNeedDialog.tsx b/src/components/WhatYouWillNeedDialog.tsx index c947df70b..6938e1092 100644 --- a/src/components/WhatYouWillNeedDialog.tsx +++ b/src/components/WhatYouWillNeedDialog.tsx @@ -7,8 +7,6 @@ import { Button, Grid, GridItem, Image, Text, VStack } from "@chakra-ui/react"; import { FormattedMessage } from "react-intl"; import batteryPackImage from "../images/stylised-battery-pack.svg"; import microbitImage from "../images/stylised-microbit-black.svg"; -import microbitWithBatteryPack from "../images/microbit-with-battery-pack.svg"; -import bluetoothSymbol from "../images/bluetooth-symbol.svg"; import twoMicrobitsImage from "../images/stylised-two-microbits-black.svg"; import usbCableImage from "../images/stylised-usb-cable.svg"; import computerImage from "../images/stylised_computer.svg"; @@ -18,20 +16,9 @@ import ConnectContainerDialog, { } from "./ConnectContainerDialog"; import ExternalLink from "./ExternalLink"; import { useDeployment } from "../deployment"; -import { DataConnectionType } from "../data-connection-flow"; -const itemsConfig: Record< - DataConnectionType, - Array<{ - imgSrc: string; - titleId: string; - subtitleId?: string; - width?: string; - height?: string; - mobileMaxHeight?: string; - }> -> = { - [DataConnectionType.Radio]: [ +const itemsConfig = { + radio: [ { imgSrc: twoMicrobitsImage, titleId: "connect-radio-start-requirements1", @@ -52,7 +39,7 @@ const itemsConfig: Record< subtitleId: "connect-with-batteries", }, ], - [DataConnectionType.WebBluetooth]: [ + bluetooth: [ { imgSrc: microbitImage, titleId: "connect-bluetooth-start-requirements1", @@ -72,21 +59,6 @@ const itemsConfig: Record< subtitleId: "connect-with-batteries", }, ], - [DataConnectionType.NativeBluetooth]: [ - { - imgSrc: microbitWithBatteryPack, - titleId: "connect-native-start-requirements1", - width: "250px", - height: "148px", - }, - { - imgSrc: bluetoothSymbol, - titleId: "connect-bluetooth-enabled", - width: "148px", - height: "148px", - mobileMaxHeight: "50vw", - }, - ], }; export interface WhatYouWillNeedDialogProps @@ -95,7 +67,7 @@ export interface WhatYouWillNeedDialogProps "children" | "onBack" | "headingId" > { reconnect: boolean; - type: DataConnectionType; + type: "radio" | "bluetooth"; onLinkClick: (() => void) | undefined; } @@ -106,26 +78,22 @@ const WhatYouWillNeedDialog = ({ ...props }: WhatYouWillNeedDialogProps) => { const { supportLinks } = useDeployment(); - const simpleType: string = { - [DataConnectionType.NativeBluetooth]: "native", - [DataConnectionType.Radio]: "radio", - [DataConnectionType.WebBluetooth]: "bluetooth", - }[type]; - const otherSimpleType = simpleType === "radio" ? "bluetooth" : "radio"; return ( {onLinkClick && ( )} @@ -145,46 +113,34 @@ const WhatYouWillNeedDialog = ({ )} 2 ? "1fr 1fr" : "1fr", - md: `repeat(${itemsConfig[type].length}, 1fr)`, - }} - gap={{ base: 6, md: 16 }} - p={{ base: "15px", md: "30px" }} + templateColumns={`repeat(${itemsConfig[type].length}, 1fr)`} + gap={16} + p="30px" > - {itemsConfig[type].map( - ({ imgSrc, width, height, mobileMaxHeight, titleId, subtitleId }) => { - const defaultMobileMaxHeight = - itemsConfig[type].length > 2 ? "25vw" : undefined; - return ( - - - - - - + {itemsConfig[type].map(({ imgSrc, titleId, subtitleId }) => { + return ( + + + + + + + + {subtitleId && ( + + - {subtitleId && ( - - - - )} - + )} - - ); - } - )} + + + ); + })} ); diff --git a/src/e2e/app/connection-dialogs.ts b/src/e2e/app/connection-dialogs.ts index 293e08635..c43c2d501 100644 --- a/src/e2e/app/connection-dialogs.ts +++ b/src/e2e/app/connection-dialogs.ts @@ -28,7 +28,7 @@ export const dialogTitles: { connectBluetooth: "Connect to micro:bit using Web Bluetooth", }, nativeBluetooth: { - whatYouNeed: "What you need to connect", + connectBattery: "Connect micro:bit battery pack", resetToBluetooth: "Reset to Bluetooth mode", copyPattern: "Copy pattern", confirmPattern: "Confirm this pattern matches your micro:bit", diff --git a/src/e2e/native-bluetooth.spec.ts b/src/e2e/native-bluetooth.spec.ts index 292522c2e..dcddf8c7a 100644 --- a/src/e2e/native-bluetooth.spec.ts +++ b/src/e2e/native-bluetooth.spec.ts @@ -47,7 +47,7 @@ test.describe("native bluetooth", () => { // 1. What you need await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await captureDialog(page, "connection-01-what-you-need"); @@ -123,7 +123,7 @@ test.describe("native bluetooth", () => { const connectionDialogs2 = await dataSamplesPage.connect(); await connectionDialogs2.waitForText( - connectionDialogs2.types.nativeBluetooth.whatYouNeed + connectionDialogs2.types.nativeBluetooth.connectBattery ); await connectionDialogs2.clickNext(); await connectionDialogs2.waitForText( @@ -154,7 +154,7 @@ test.describe("native bluetooth", () => { await connectionDialogs.setBluetoothAvailability("disabled"); await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); @@ -183,7 +183,7 @@ test.describe("native bluetooth", () => { await connectionDialogs.setBluetoothAvailability("permission-denied"); await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); @@ -209,7 +209,7 @@ test.describe("native bluetooth", () => { await connectionDialogs.setBluetoothAvailability("disabled"); await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); await connectionDialogs.expectBluetoothDisabledDialog(); @@ -235,7 +235,7 @@ test.describe("native bluetooth", () => { ]); await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); await connectionDialogs.waitForText( @@ -264,7 +264,7 @@ test.describe("native bluetooth", () => { // Complete the connection flow await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); await connectionDialogs.waitForText( @@ -313,7 +313,7 @@ test.describe("native bluetooth", () => { ]); await connectionDialogs.waitForText( - connectionDialogs.types.nativeBluetooth.whatYouNeed + connectionDialogs.types.nativeBluetooth.connectBattery ); await connectionDialogs.clickNext(); await connectionDialogs.waitForText( diff --git a/src/messages/ui.ca.json b/src/messages/ui.ca.json index dda231184..c71b86b55 100644 --- a/src/messages/ui.ca.json +++ b/src/messages/ui.ca.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.en.json b/src/messages/ui.en.json index afef710f0..a6ff464f7 100644 --- a/src/messages/ui.en.json +++ b/src/messages/ui.en.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.es-es.json b/src/messages/ui.es-es.json index 81a47e7df..89c9d0ed1 100644 --- a/src/messages/ui.es-es.json +++ b/src/messages/ui.es-es.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.fr.json b/src/messages/ui.fr.json index 52fb5bf83..a3864f324 100644 --- a/src/messages/ui.fr.json +++ b/src/messages/ui.fr.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.ja.json b/src/messages/ui.ja.json index ee655b791..cbbe2484f 100644 --- a/src/messages/ui.ja.json +++ b/src/messages/ui.ja.json @@ -677,16 +677,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.ko.json b/src/messages/ui.ko.json index 22f442c52..8e99e222f 100644 --- a/src/messages/ui.ko.json +++ b/src/messages/ui.ko.json @@ -677,16 +677,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.lol.json b/src/messages/ui.lol.json index 307f5a64b..972e25dd0 100644 --- a/src/messages/ui.lol.json +++ b/src/messages/ui.lol.json @@ -675,16 +675,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.nl.json b/src/messages/ui.nl.json index d129faa1c..45d8baba7 100644 --- a/src/messages/ui.nl.json +++ b/src/messages/ui.nl.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.pl.json b/src/messages/ui.pl.json index 3ab73a72d..04301f0cc 100644 --- a/src/messages/ui.pl.json +++ b/src/messages/ui.pl.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.pt-br.json b/src/messages/ui.pt-br.json index f9bf7ec44..437c3ce5f 100644 --- a/src/messages/ui.pt-br.json +++ b/src/messages/ui.pt-br.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [ diff --git a/src/messages/ui.zh-tw.json b/src/messages/ui.zh-tw.json index 38bd7f064..2f27b5d2d 100644 --- a/src/messages/ui.zh-tw.json +++ b/src/messages/ui.zh-tw.json @@ -685,16 +685,16 @@ "value": "If needed, change the pattern below to match." } ], - "connect-native-start-heading": [ + "connect-native-start-battery-check": [ { "type": 0, - "value": "What you need to connect" + "value": "Connect the battery pack, then check the light on the back of the micro:bit is on." } ], - "connect-native-start-requirements1": [ + "connect-native-start-heading": [ { "type": 0, - "value": "micro:bit with battery pack" + "value": "Connect micro:bit battery pack" } ], "connect-or-import": [