Skip to content

Commit 8a6727a

Browse files
committed
Reuse existing localization
1 parent d5213a5 commit 8a6727a

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

locales/en/messages.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,6 @@
582582
"firmwareUpgradeRequired": {
583583
"message": "The firmware on this device needs upgrading to a newer version. Use CLI for backup before flashing. CLI backup/restore procedure is in the documentation.<br />Alternatively download and use an old version of the app if you are not ready to upgrade."
584584
},
585-
"API_VERSION_NOT_YET_SUPPORTED": {
586-
"message": "This firmware version ($1) is <span class=\"message-negative\">not yet supported (max $2)</span>."
587-
},
588585
"resetToCustomDefaultsDialog": {
589586
"message": "There are custom defaults for this board available. Normally, a board will not work properly unless custom defaults are applied.<br />Do you want to apply the custom defaults for this board?"
590587
},
@@ -598,7 +595,7 @@
598595
"message": "<span class=\"message-negative\"><strong>You need to fix these problems before attempting to fly your aircraft</span></strong>."
599596
},
600597
"reportProblemsDialogAPI_VERSION_MAX_SUPPORTED": {
601-
"message": "<span class=\"message-negative\"><strong>The app version used ($3) does not support firmware $4</strong></span>.<br>$t(configuratorUpdateHelp.message)"
598+
"message": "<span class=\"message-negative\"><strong>The app version used ($1) does not support firmware $2</strong></span>.<br>$t(configuratorUpdateHelp.message)"
602599
},
603600
"reportProblemsDialogMOTOR_PROTOCOL_DISABLED": {
604601
"message": "<strong>there is no motor output protocol selected</strong>.<br>Please select a motor output protocol appropriate for your ESCs in '$t(configurationEscFeatures.message)' on the '$t(tabMotorTesting.message)' tab.<br>$t(escProtocolDisabledMessage.message)"

src/js/data_storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const API_VERSION_1_48 = "1.48.0";
88
const CONFIGURATOR = {
99
// all versions are specified and compared using semantic versioning http://semver.org/
1010
API_VERSION_ACCEPTED: API_VERSION_1_44,
11-
API_VERSION_MAX_SUPPORTED: API_VERSION_1_48,
11+
API_VERSION_MAX_SUPPORTED: API_VERSION_1_46,
1212

1313
connectionValid: false,
1414
connectionValidCliOnly: false,

src/js/serial_backend.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ function onOpen(openInfo) {
344344
)
345345
) {
346346
showVersionMismatchAndCli(
347-
i18n.getMessage("API_VERSION_NOT_YET_SUPPORTED", [
348-
FC.CONFIG.apiVersion,
347+
i18n.getMessage("reportProblemsDialogAPI_VERSION_MAX_SUPPORTED", [
348+
CONFIGURATOR.getDisplayVersion(),
349349
CONFIGURATOR.API_VERSION_MAX_SUPPORTED,
350350
]),
351351
);

0 commit comments

Comments
 (0)