mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-23 16:25:22 +03:00
switch languages without an app restart (#1555)
switch languages without an app restart
This commit is contained in:
Michael Keller
GitHub
commit
7e371ee49e
11 changed files with 189 additions and 119 deletions
|
|
@ -30,14 +30,30 @@ i18n.init = function(cb) {
|
|||
console.error('Error loading i18n ' + err);
|
||||
} else {
|
||||
console.log('i18n system loaded');
|
||||
var detectedLanguage = i18n.getMessage('language_' + getValidLocale("DEFAULT"));
|
||||
i18n.addResources({"detectedLanguage": detectedLanguage });
|
||||
}
|
||||
if (cb !== undefined) {
|
||||
cb();
|
||||
}
|
||||
});
|
||||
});
|
||||
// This function should do the same things that the i18n.localizePage function below does.
|
||||
i18next.on('languageChanged', function (newLang) {
|
||||
var translate = function(messageID) {
|
||||
return i18n.getMessage(messageID);
|
||||
};
|
||||
i18n.localizePage(true);
|
||||
updateStatusBarVersion();
|
||||
});
|
||||
}
|
||||
|
||||
i18n.changeLanguage = function(languageSelected) {
|
||||
ConfigStorage.set({'userLanguageSelect': languageSelected});
|
||||
i18next.changeLanguage(getValidLocale(languageSelected));
|
||||
i18n.selectedLanguage = languageSelected;
|
||||
GUI.log(i18n.getMessage('language_changed'));
|
||||
}
|
||||
i18n.getMessage = function(messageID, parameters) {
|
||||
|
||||
var translatedString;
|
||||
|
|
@ -79,44 +95,58 @@ i18n.existsMessage = function(key) {
|
|||
* Helper functions, don't depend of the i18n framework
|
||||
*/
|
||||
|
||||
i18n.localizePage = function() {
|
||||
i18n.localizePage = function(forceReTranslate) {
|
||||
|
||||
var localized = 0;
|
||||
|
||||
var translate = function(messageID) {
|
||||
localized++;
|
||||
|
||||
return i18n.getMessage(messageID);
|
||||
};
|
||||
|
||||
$('[i18n]:not(.i18n-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
if (forceReTranslate) {
|
||||
$('[i18n]').each(function() {
|
||||
var element = $(this);
|
||||
element.html(translate(element.attr('i18n')));
|
||||
});
|
||||
$('[i18n_title]').each(function() {
|
||||
var element = $(this);
|
||||
element.attr('title', translate(element.attr('i18n_title')));
|
||||
});
|
||||
$('[i18n_value]').each(function() {
|
||||
var element = $(this);
|
||||
element.val(translate(element.attr('i18n_value')));
|
||||
});
|
||||
$('[i18n_placeholder]').each(function() {
|
||||
var element = $(this);
|
||||
element.attr('placeholder', translate(element.attr('i18n_placeholder')));
|
||||
});
|
||||
} else {
|
||||
|
||||
element.html(translate(element.attr('i18n')));
|
||||
element.addClass('i18n-replaced');
|
||||
});
|
||||
$('[i18n]:not(.i18n-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
element.html(translate(element.attr('i18n')));
|
||||
element.addClass('i18n-replaced');
|
||||
});
|
||||
|
||||
$('[i18n_title]:not(.i18n_title-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
$('[i18n_title]:not(.i18n_title-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
element.attr('title', translate(element.attr('i18n_title')));
|
||||
element.addClass('i18n_title-replaced');
|
||||
});
|
||||
|
||||
element.attr('title', translate(element.attr('i18n_title')));
|
||||
element.addClass('i18n_title-replaced');
|
||||
});
|
||||
|
||||
$('[i18n_value]:not(.i18n_value-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
|
||||
element.val(translate(element.attr('i18n_value')));
|
||||
element.addClass('i18n_value-replaced');
|
||||
});
|
||||
|
||||
$('[i18n_placeholder]:not(.i18n_placeholder-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
|
||||
element.attr('placeholder', translate(element.attr('i18n_placeholder')));
|
||||
element.addClass('i18n_placeholder-replaced');
|
||||
});
|
||||
$('[i18n_value]:not(.i18n_value-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
element.val(translate(element.attr('i18n_value')));
|
||||
element.addClass('i18n_value-replaced');
|
||||
});
|
||||
|
||||
$('[i18n_placeholder]:not(.i18n_placeholder-replaced)').each(function() {
|
||||
var element = $(this);
|
||||
element.attr('placeholder', translate(element.attr('i18n_placeholder')));
|
||||
element.addClass('i18n_placeholder-replaced');
|
||||
});
|
||||
}
|
||||
return localized;
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +159,8 @@ function getStoredUserLocale(cb) {
|
|||
var userLanguage = 'DEFAULT';
|
||||
if (result.userLanguageSelect) {
|
||||
userLanguage = result.userLanguageSelect
|
||||
}
|
||||
}
|
||||
i18n.selectedLanguage = userLanguage;
|
||||
|
||||
userLanguage = getValidLocale(userLanguage);
|
||||
|
||||
|
|
|
|||
|
|
@ -121,12 +121,6 @@ function startProcess() {
|
|||
checkForConfiguratorUpdates();
|
||||
}
|
||||
|
||||
ConfigStorage.get('logopen', function (result) {
|
||||
if (result.logopen) {
|
||||
$("#showlog").trigger('click');
|
||||
}
|
||||
});
|
||||
|
||||
// log webgl capability
|
||||
// it would seem the webgl "enabling" through advanced settings will be ignored in the future
|
||||
// and webgl will be supported if gpu supports it by default (canary 40.0.2175.0), keep an eye on this one
|
||||
|
|
@ -385,29 +379,6 @@ function startProcess() {
|
|||
DarkTheme.setConfig(checked);
|
||||
}).change();
|
||||
|
||||
ConfigStorage.get('userLanguageSelect', function (result) {
|
||||
|
||||
var userLanguage_e = $('div.userLanguage select');
|
||||
var languagesAvailables = i18n.getLanguagesAvailables();
|
||||
userLanguage_e.append('<option value="DEFAULT">' + i18n.getMessage('language_default') + '</option>');
|
||||
userLanguage_e.append('<option disabled>------</option>');
|
||||
languagesAvailables.forEach(function(element) {
|
||||
var languageName = i18n.getMessage('language_' + element);
|
||||
userLanguage_e.append('<option value="' + element + '">' + languageName + '</option>');
|
||||
});
|
||||
|
||||
if (result.userLanguageSelect) {
|
||||
userLanguage_e.val(result.userLanguageSelect);
|
||||
}
|
||||
|
||||
userLanguage_e.change(function () {
|
||||
var languageSelected = $(this).val();
|
||||
|
||||
// Select the new language, a restart is required
|
||||
ConfigStorage.set({'userLanguageSelect': languageSelected});
|
||||
});
|
||||
});
|
||||
|
||||
function close_and_cleanup(e) {
|
||||
if (e.type == 'click' && !$.contains($('div#options-window')[0], e.target) || e.type == 'keyup' && e.keyCode == 27) {
|
||||
$(document).unbind('click keyup', close_and_cleanup);
|
||||
|
|
@ -529,6 +500,12 @@ function startProcess() {
|
|||
$(this).data('state', state);
|
||||
});
|
||||
|
||||
ConfigStorage.get('logopen', function (result) {
|
||||
if (result.logopen) {
|
||||
$("#showlog").trigger('click');
|
||||
}
|
||||
});
|
||||
|
||||
ConfigStorage.get('permanentExpertMode', function (result) {
|
||||
if (result.permanentExpertMode) {
|
||||
$('input[name="expertModeCheckbox"]').prop('checked', true);
|
||||
|
|
|
|||
|
|
@ -174,7 +174,9 @@ PortHandler.update_port_select = function (ports) {
|
|||
$('div#port-picker #port').append($("<option/>", {value: ports[i], text: ports[i], data: {isManual: false}}));
|
||||
}
|
||||
|
||||
$('div#port-picker #port').append($("<option/>", {value: 'manual', text: i18n.getMessage('portsSelectManual'), data: {isManual: true}}));
|
||||
$('div#port-picker #port').append($("<option/>", {value: 'manual', i18n: 'portsSelectManual', data: {isManual: true}}));
|
||||
i18n.localizePage();
|
||||
|
||||
};
|
||||
|
||||
PortHandler.port_detected = function(name, code, timeout, ignore_timeout) {
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
$('div.release_info').slideDown();
|
||||
|
||||
} else {
|
||||
self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
|
||||
self.flashingMessage('firmwareFlasherHexCorrupted', self.FLASH_MESSAGE_TYPES.INVALID);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -252,7 +252,7 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
function buildBuildTypeOptionsList() {
|
||||
buildType_e.empty();
|
||||
buildTypesToShow.forEach((build, index) => {
|
||||
buildType_e.append($("<option value='{0}' selected>{1}</option>".format(index, build.tag ? i18n.getMessage(build.tag) : build.title)))
|
||||
buildType_e.append($("<option value='{0}' {1}>{2}</option>".format(index,build.tag ? 'i18n="' + build.tag + '" ' : '', build.tag ? i18n.getMessage(build.tag) : build.title)))
|
||||
});
|
||||
$('select[name="build_type"]').val($('select[name="build_type"] option:first').val());
|
||||
}
|
||||
|
|
@ -300,16 +300,17 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
var build_type = $(this).val();
|
||||
|
||||
$('select[name="board"]').empty()
|
||||
.append($("<option value='0'>{0}</option>".format(i18n.getMessage('firmwareFlasherOptionLabelSelectBoard'))));
|
||||
.append($("<option value='0' i18n='firmwareFlasherOptionLabelSelectBoard'></option>"));
|
||||
|
||||
$('select[name="firmware_version"]').empty()
|
||||
.append($("<option value='0'>{0}</option>".format(i18n.getMessage('firmwareFlasherOptionLabelSelectFirmwareVersion'))));
|
||||
.append($("<option value='0' i18n='firmwareFlasherOptionLabelSelectFirmwareVersion'></option>"));
|
||||
|
||||
if (!GUI.connect_lock) {
|
||||
buildTypesToShow[build_type].loader();
|
||||
}
|
||||
|
||||
chrome.storage.local.set({'selected_build_type': build_type});
|
||||
i18n.localizePage();
|
||||
});
|
||||
|
||||
$('select[name="board"]').change(function() {
|
||||
|
|
@ -317,7 +318,7 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
var target = $(this).val();
|
||||
|
||||
if (!GUI.connect_lock) {
|
||||
self.flashingMessage(i18n.getMessage('firmwareFlasherLoadFirmwareFile'), self.FLASH_MESSAGE_TYPES.NEUTRAL)
|
||||
self.flashingMessage('firmwareFlasherLoadFirmwareFile', self.FLASH_MESSAGE_TYPES.NEUTRAL)
|
||||
.flashProgress(0);
|
||||
|
||||
$('div.git_info').slideUp();
|
||||
|
|
@ -401,7 +402,7 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
|
||||
self.flashingMessage(i18n.getMessage('firmwareFlasherFirmwareLocalLoaded', parsed_hex.bytes_total), self.FLASH_MESSAGE_TYPES.NEUTRAL);
|
||||
} else {
|
||||
self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
|
||||
self.flashingMessage('firmwareFlasherHexCorrupted', self.FLASH_MESSAGE_TYPES.INVALID);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -454,9 +455,10 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
}
|
||||
|
||||
function failed_to_load() {
|
||||
$('span.progressLabel').text(i18n.getMessage('firmwareFlasherFailedToLoadOnlineFirmware'));
|
||||
$('span.progressLabel').attr('i18n','firmwareFlasherFailedToLoadOnlineFirmware').removeClass('i18n-replaced');
|
||||
$("a.load_remote_file").removeClass('disabled');
|
||||
$("a.load_remote_file").text(i18n.getMessage('firmwareFlasherButtonLoadOnline'));
|
||||
i18n.localizePage();
|
||||
}
|
||||
|
||||
var summary = $('select[name="firmware_version"] option:selected').data('summary');
|
||||
|
|
@ -466,7 +468,8 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
$("a.load_remote_file").addClass('disabled');
|
||||
$.get(summary.url, onLoadSuccess).fail(failed_to_load);
|
||||
} else {
|
||||
$('span.progressLabel').text(i18n.getMessage('firmwareFlasherFailedToLoadOnlineFirmware'));
|
||||
$('span.progressLabel').attr('i18n','firmwareFlasherFailedToLoadOnlineFirmware').removeClass('i18n-replaced');
|
||||
i18n.localizePage();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -512,7 +515,8 @@ TABS.firmware_flasher.initialize = function (callback) {
|
|||
STM32DFU.connect(usbDevices, parsed_hex, options);
|
||||
}
|
||||
} else {
|
||||
$('span.progressLabel').text(i18n.getMessage('firmwareFlasherFirmwareNotLoaded'));
|
||||
$('span.progressLabel').attr('i18n','firmwareFlasherFirmwareNotLoaded').removeClass('i18n-replaced');
|
||||
i18n.localizePage();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -740,7 +744,13 @@ TABS.firmware_flasher.flashingMessage = function(message, type) {
|
|||
break;
|
||||
}
|
||||
if (message != null) {
|
||||
progressLabel_e.html(message);
|
||||
if (i18next.exists(message)) {
|
||||
progressLabel_e.attr('i18n',message).removeClass('i18n-replaced');
|
||||
i18n.localizePage();
|
||||
} else {
|
||||
progressLabel_e.removeAttr('i18n');
|
||||
progressLabel_e.html(message);
|
||||
}
|
||||
}
|
||||
|
||||
return self;
|
||||
|
|
|
|||
|
|
@ -2,18 +2,51 @@
|
|||
|
||||
TABS.landing = {};
|
||||
TABS.landing.initialize = function (callback) {
|
||||
var self = this;
|
||||
var self = this;
|
||||
|
||||
if (GUI.active_tab != 'landing') {
|
||||
GUI.active_tab = 'landing';
|
||||
if (GUI.active_tab != 'landing') {
|
||||
GUI.active_tab = 'landing';
|
||||
}
|
||||
|
||||
$('#content').load("./tabs/landing.html", function () {
|
||||
function showLang(newLang) {
|
||||
var bottomSection = $('.languageSwitcher');
|
||||
bottomSection.find('a').each(function(index) {
|
||||
var element = $(this);
|
||||
var languageSelected = element.attr('lang');
|
||||
if (newLang == languageSelected) {
|
||||
element.removeClass('selected_language');
|
||||
element.addClass('selected_language');
|
||||
} else {
|
||||
element.removeClass('selected_language');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$('#content').load("./tabs/landing.html", function () {
|
||||
// translate to user-selected language
|
||||
i18n.localizePage();
|
||||
|
||||
GUI.content_ready(callback);
|
||||
var bottomSection = $('.languageSwitcher');
|
||||
bottomSection.html(' <span i18n="language_choice_message"></span>');
|
||||
bottomSection.append(' <a href="#" i18n="language_default_pretty" lang="DEFAULT"></a>');
|
||||
var languagesAvailables = i18n.getLanguagesAvailables();
|
||||
languagesAvailables.forEach(function(element) {
|
||||
bottomSection.append(' <a href="#" lang="' + element + '" i18n="language_' + element + '"></a>');
|
||||
});
|
||||
bottomSection.find('a').each(function(index) {
|
||||
var element = $(this);
|
||||
element.click(function(){
|
||||
var element = $(this);
|
||||
var languageSelected = element.attr('lang');
|
||||
if (!languageSelected) { return; }
|
||||
if (i18n.selectedLanguage != languageSelected) {
|
||||
i18n.changeLanguage(languageSelected);
|
||||
showLang(languageSelected);
|
||||
}
|
||||
});
|
||||
});
|
||||
showLang(i18n.selectedLanguage);
|
||||
// translate to user-selected language
|
||||
i18n.localizePage();
|
||||
|
||||
GUI.content_ready(callback);
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue