Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-20 23:05:15 +03:00
Code Issues Wiki Activity

translate the (Legacy) bit, and only show it where needed

Browse source
This commit is contained in:
Kyle K 2019-08-24 20:40:59 +00:00
parent c46631d7a2
commit f7275c25f3
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
locales/en/messages.json
View file

@ -2757,6 +2757,13 @@
"firmwareFlasherFailedToLoadOnlineFirmware": { "firmwareFlasherFailedToLoadOnlineFirmware": {
"message": "Failed to load remote firmware" "message": "Failed to load remote firmware"
}, },
"firmwareFlasherFailedToLoadUnifiedConfig": {
"message": "Failed to load remote config for {{remote_file}}"
},
"firmwareFlasherLegacyLabel": {
"message": "{{target}} (Legacy)",
"description": "If we have a Unified target and a old style target available, we are labeling the older one"
},
"firmwareFlasherNoFirmwareSelected": { "firmwareFlasherNoFirmwareSelected": {
"message": "<b>No firmware selected to load</b>" "message": "<b>No firmware selected to load</b>"
}, },

23
src/js/tabs/firmware_flasher.js
View file

@ -250,6 +250,7 @@ TABS.firmware_flasher.initialize = function (callback) {
let releases = {}; let releases = {};
let unifiedConfigs = {}; let unifiedConfigs = {};
let items = {}; let items = {};
let baseTargets = {};
data.forEach(function(target) { data.forEach(function(target) {
let targetName = target.name; let targetName = target.name;
if (targetName.endsWith('.config')) { if (targetName.endsWith('.config')) {
@ -258,16 +259,23 @@ TABS.firmware_flasher.initialize = function (callback) {
return; return;
} }
unifiedConfigs[targetName]=target.download_url; unifiedConfigs[targetName]=target.download_url;
items[targetName] = target.download_url; items[targetName] = "something";
}); });
Object.keys(builds).forEach(function (key) { Object.keys(builds).forEach(function (key) {
// unifiedTargets is our list above of 4 targets
if (unifiedTargets.includes(key)) { if (unifiedTargets.includes(key)) {
items[key] = "something"; items[key] = "something";
releases[key] = builds[key]; releases[key] = builds[key];
} else { } else {
var legacyKey = key + " (Legacy)"; var legacyKey = key + " (Legacy)";
items[legacyKey] = "something"; if (unifiedConfigs[key] === undefined) {
releases[legacyKey] = builds[key]; items[key] = "something";
releases[key] = builds[key];
} else {
items[legacyKey] = "i18nplz";
baseTargets[legacyKey] = key;
releases[legacyKey] = builds[key];
}
} }
}); });
$('select[name="board"]').empty() $('select[name="board"]').empty()
@ -281,7 +289,10 @@ TABS.firmware_flasher.initialize = function (callback) {
Object.keys(items) Object.keys(items)
.sort() .sort()
.forEach(function(target, i) { .forEach(function(target, i) {
var select_e = $("<option value='{0}'>{0}</option>".format(target)); //console.log(items);console.log('target', items[target]);
var select_e = $("<option value='{0}'>{1}</option>".format(target,
items[target] === "i18nplz" ? i18n.getMessage("firmwareFlasherLegacyLabel",
{target: baseTargets[target]}) : target));
boards_e.append(select_e); boards_e.append(select_e);
}); });
TABS.firmware_flasher.releases = releases; TABS.firmware_flasher.releases = releases;
@ -462,7 +473,9 @@ TABS.firmware_flasher.initialize = function (callback) {
targetConfig = undefined; targetConfig = undefined;
isConfigLocal = false; isConfigLocal = false;
unifiedConfig= undefined; unifiedConfig= undefined;
GUI.log('failed to load a unified config'); let baseFileName = TABS.firmware_flasher.unifiedConfigs[target].reverse()[0];
GUI.log(i18n.getMessage('firmwareFlasherFailedToLoadUnifiedConfig',
{remote_file: baseFileName}));
}); });
} else { } else {
console.log('We have the config cached for', target); console.log('We have the config cached for', target);