Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 00:35:26 +03:00
Code Issues Wiki Activity

i18next uses : to denote a namespace for messages. Get rid of… (#1817)

Browse source 
i18next uses `:` to denote a namespace for messages. Get rid of warnings.
This commit is contained in:
Michael Keller 2019-11-12 19:27:07 +13:00 • committed by GitHub
commit bafc683183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ TABS.firmware_flasher.initialize = function (callback) {
show_loaded_hex(summary) show_loaded_hex(summary)
} else { } else {
self.flashingMessage('firmwareFlasherHexCorrupted', self.FLASH_MESSAGE_TYPES.INVALID); self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
} }
}); });
} }
@ -515,7 +515,7 @@ TABS.firmware_flasher.initialize = function (callback) {
TABS.firmware_flasher.bareBoard = undefined; TABS.firmware_flasher.bareBoard = undefined;
console.log('board changed to', target); console.log('board changed to', target);
self.flashingMessage('firmwareFlasherLoadFirmwareFile', self.FLASH_MESSAGE_TYPES.NEUTRAL) self.flashingMessage(i18n.getMessage('firmwareFlasherLoadFirmwareFile'), self.FLASH_MESSAGE_TYPES.NEUTRAL)
.flashProgress(0); .flashProgress(0);
$('div.git_info').slideUp(); $('div.git_info').slideUp();
@ -683,7 +683,7 @@ TABS.firmware_flasher.initialize = function (callback) {
flashingMessageLocal(); flashingMessageLocal();
} else { } else {
self.flashingMessage('firmwareFlasherHexCorrupted', self.FLASH_MESSAGE_TYPES.INVALID); self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
} }
}); });
} else { } else {
@ -694,7 +694,7 @@ TABS.firmware_flasher.initialize = function (callback) {
self.isConfigLocal = true; self.isConfigLocal = true;
flashingMessageLocal(); flashingMessageLocal();
} catch(err) { } catch(err) {
self.flashingMessage('firmwareFlasherConfigCorrupted', self.FLASH_MESSAGE_TYPES.INVALID); self.flashingMessage(i18n.getMessage('firmwareFlasherConfigCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
GUI.log(i18n.getMessage('firmwareFlasherConfigCorruptedLogMessage')); GUI.log(i18n.getMessage('firmwareFlasherConfigCorruptedLogMessage'));
} }
} }
@ -1009,6 +1009,8 @@ TABS.firmware_flasher.initialize = function (callback) {
}); });
self.flashingMessage(i18n.getMessage('firmwareFlasherLoadFirmwareFile'), self.FLASH_MESSAGE_TYPES.NEUTRAL);
$(document).keypress(function (e) { $(document).keypress(function (e) {
if (e.which == 13) { // enter if (e.which == 13) { // enter
// Trigger regular Flashing sequence // Trigger regular Flashing sequence
@ -1082,13 +1084,7 @@ TABS.firmware_flasher.flashingMessage = function(message, type) {
break; break;
} }
if (message != null) { if (message != null) {
if (i18next.exists(message)) { progressLabel_e.html(message);
progressLabel_e.attr('i18n',message).removeClass('i18n-replaced');
i18n.localizePage();
} else {
progressLabel_e.removeAttr('i18n');
progressLabel_e.html(message);
}
} }
return self; return self;

2
src/tabs/firmware_flasher.html
View file

@ -136,7 +136,7 @@
<div class="content_toolbar"> <div class="content_toolbar">
<div class="info"><a name="progressbar"></a> <div class="info"><a name="progressbar"></a>
<progress class="progress" value="0" min="0" max="100"></progress> <progress class="progress" value="0" min="0" max="100"></progress>
<span class="progressLabel" i18n="firmwareFlasherLoadFirmwareFile"></span> <span class="progressLabel"></span>
</div> </div>
<div class="btn"> <div class="btn">
<a class="flash_firmware disabled" href="#progressbar" i18n="firmwareFlasherFlashFirmware"></a> <a class="flash_firmware disabled" href="#progressbar" i18n="firmwareFlasherFlashFirmware"></a>