diff --git a/src/about/AboutDialog.tsx b/src/about/AboutDialog.tsx index a53d5651..7450d20a 100644 --- a/src/about/AboutDialog.tsx +++ b/src/about/AboutDialog.tsx @@ -11,6 +11,7 @@ import { appVersion, changelogUrl, legoDisclaimer, + legoRegisteredTrademark, pybricksCopyright, pybricksWebsiteUrl, } from '../app/constants'; @@ -41,7 +42,11 @@ const AboutDialog: React.VoidFunctionComponent = ({

- {i18n.translate('description')} + + {i18n.translate('description', { + lego: legoRegisteredTrademark, + })} +

{`v${firmwareVersion} (${appName} v${appVersion})`}

{pybricksCopyright}

diff --git a/src/about/translations/en.json b/src/about/translations/en.json index f7b56d99..00374d18 100644 --- a/src/about/translations/en.json +++ b/src/about/translations/en.json @@ -1,6 +1,6 @@ { "title": "About {appName}", - "description": "MicroPython for LEGO® Powered Up smart hubs.", + "description": "MicroPython for {lego} Powered Up smart hubs.", "licenseButton": { "label": "Software Licenses" }, "changelogButton": { "label": "Changelog" }, "websiteButton": { "label": "Pybricks Website" } diff --git a/src/app/constants.ts b/src/app/constants.ts index 53dd604c..25110864 100644 --- a/src/app/constants.ts +++ b/src/app/constants.ts @@ -50,11 +50,12 @@ export const pybricksUsbLinuxUdevRulesUrl = export const pybricksBleFirmwareRestoreVideoUrl = 'https://pybricks.com/install/technic-boost-city/#restoring-the-original-firmware'; -export const pybricksDfuRestoreUrl = 'https://dfu.pybricks.com'; - /** Pybricks copyright statement. */ export const pybricksCopyright = 'Copyright (c) 2020-2022 The Pybricks Authors'; +/** The LEGO name with registered trademark symbol. */ +export const legoRegisteredTrademark = 'LEGO®'; + // https://www.lego.com/en-us/legal/notices-and-policies/fair-play/ /** LEGO "fair play" disclaimer */ export const legoDisclaimer = diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index 9c805a48..eb7a784b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -14,6 +14,7 @@ import { useTernaryDarkMode } from 'usehooks-ts'; import AboutDialog from '../about/AboutDialog'; import { appCheckForUpdate, appReload, appShowInstallPrompt } from '../app/actions'; import { + legoRegisteredTrademark, pybricksBugReportsUrl, pybricksGitterUrl, pybricksProjectsUrl, @@ -106,7 +107,9 @@ const Settings: React.VoidFunctionComponent = () => { id="pb-settings-flash-official-button" minimal={true} icon="download" - label={i18n.translate('firmware.flashLegoButton.label')} + label={i18n.translate('firmware.flashLegoButton.label', { + lego: legoRegisteredTrademark, + })} onPress={() => dispatch(firmwareRestoreOfficialDialogShow())} /> diff --git a/src/settings/translations/en.json b/src/settings/translations/en.json index 1a7dfcab..ceb1862f 100644 --- a/src/settings/translations/en.json +++ b/src/settings/translations/en.json @@ -20,7 +20,7 @@ "label": "Install Pybricks Firmware" }, "flashLegoButton": { - "label": "Restore Official LEGO® Firmware" + "label": "Restore Official {lego} Firmware" } }, "help": { diff --git a/src/tour/Tour.tsx b/src/tour/Tour.tsx index 10f948e7..9baf5b29 100644 --- a/src/tour/Tour.tsx +++ b/src/tour/Tour.tsx @@ -15,7 +15,7 @@ import Joyride, { import { useDispatch } from 'react-redux'; import { useEffectOnce, useLocalStorage, useTernaryDarkMode } from 'usehooks-ts'; import { Activity, useActivitiesSelectedActivity } from '../activities/hooks'; -import { appName } from '../app/constants'; +import { appName, legoRegisteredTrademark } from '../app/constants'; import { useSelector } from '../reducers'; import { tourStart, tourStop } from './actions'; import { useI18n } from './i18n'; @@ -77,7 +77,13 @@ const FlashPybricksFirmwareStep = React.memo(function FlashPybricksFirmwareStep( const RestoreOfficialFirmwareStep = React.memo(function RestoreOfficialFirmwareStep() { const i18n = useI18n(); - return

{i18n.translate('steps.restoreOfficialFirmware.message')}

; + return ( +

+ {i18n.translate('steps.restoreOfficialFirmware.message', { + lego: legoRegisteredTrademark, + })} +

+ ); }); const ConnectToHubStep = React.memo(function ConnectToHubStep() { diff --git a/src/tour/translations/en.json b/src/tour/translations/en.json index aa16ecba..be314a35 100644 --- a/src/tour/translations/en.json +++ b/src/tour/translations/en.json @@ -21,7 +21,7 @@ "message": "{appName} requires a special firmware to be flashed to your hub in order to run the program on the hub." }, "restoreOfficialFirmware": { - "message": "You can always restore the official LEGO® firmware after using the special Pybricks firmware." + "message": "You can always restore the official {lego} firmware after using the special Pybricks firmware." }, "connectToHub": { "message": "One you have flashed the Pybricks firmware, click the Bluetooth button to connect to the hub."