Skip to content

Commit 7277ddb

Browse files
laurensvalkdlech
authored andcommitted
firmware/dfuWindows: Split properties step.
There may be one of three situations, so split to a bullet list. Also update a few other strings.
1 parent a7a0f52 commit 7277ddb

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

src/firmware/bootloaderInstructions/translations/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"learnMore": "Learn more."
66
},
77
"windows": {
8-
"message": "If you have never used Pybricks with USB on Windows, you may need to manually install a USB driver before you can connect to the device. {instructions}",
8+
"message": "Are you using Pybricks on this computer for the first time? You may need to manually install the USB driver for this hub type. {instructions}",
99
"instructions": "Click for instructions."
1010
}
1111
},

src/firmware/dfuWindowsDriverInstallDialog/DfuWindowsDriverInstallDialog.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,15 @@ const Step2: React.VoidFunctionComponent<HubTypeProps> = ({ hub }) => {
150150
properties: <em>{i18n.translate('step.2.properties')}</em>,
151151
})}
152152
</p>
153+
<ul>
154+
<li>
155+
{i18n.translate('step.2.listedWithWarning', {
156+
properties: <em>{i18n.translate('step.2.properties')}</em>,
157+
})}
158+
</li>
159+
<li>{i18n.translate('step.2.listedWithoutWarning')}</li>
160+
<li>{i18n.translate('step.2.notListed')}</li>
161+
</ul>
153162
</div>
154163
</div>
155164
);

src/firmware/dfuWindowsDriverInstallDialog/dfuWindowsDriverInstallDialog.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
.pb-dfu-windows-driver-install-dialog {
77
& .#{bp.$ns}-multistep-dialog-panels {
8-
min-height: bp.$pt-grid-size * 75;
8+
min-height: bp.$pt-grid-size * 77;
99

1010
& .#{bp.$ns}-multistep-dialog-left-panel {
1111
display: none;

src/firmware/dfuWindowsDriverInstallDialog/translations/en.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
},
99
"step": {
1010
"1": {
11-
"message": "Right-click the Windows {startMenu} to open the context menu, then click {deviceManager} to open the Windows Device Manager.",
11+
"message": "Right-click the Windows {startMenu}, then click {deviceManager}.",
1212
"startMenu": "Start Menu",
1313
"deviceManager": "Device Manager"
1414
},
1515
"2": {
16-
"message": "In the Device Manager window, look for {dfuUsbHubName} under {otherDevices}. If it is there, right-click it and select {properties}. If it is not there, then the driver is already installed and you do not need to continue.",
16+
"message": "Look for {dfuUsbHubName} under {otherDevices}.",
1717
"otherDevices": "Other Devices",
18-
"properties": "Properties"
18+
"properties": "Properties",
19+
"listedWithWarning": "If it is listed with a warning sign, right-click it and select {properties}.",
20+
"listedWithoutWarning": "If it is listed somewhere else without a warning sign, then the driver is already installed. You may close this window.",
21+
"notListed": "If you don't see it at all, make sure the hub is in DFU update mode (see video on the previous page) and try again."
1922
},
2023
"3": {
2124
"message": "In the {properties} dialog, click the {updateDriver} button.",
@@ -44,7 +47,7 @@
4447
"next": "Next"
4548
},
4649
"8": {
47-
"message": "A warning dialog will open stating that the driver is not recommended. Click the {yes} button to use the driver anyway. The the driver is compatible.",
50+
"message": "A warning dialog says that the driver is not recommended. Click {yes} to proceed anyway. The driver is compatible.",
4851
"yes": "Yes"
4952
},
5053
"9": {

0 commit comments

Comments
 (0)