merge-requests/237/merge
Christian Bayer 2022-09-15 07:05:01 -04:00 zatwierdzone przez Tag
rodzic 690309ef66
commit ac70f956b6
2 zmienionych plików z 43 dodań i 20 usunięć

Wyświetl plik

@ -1,17 +1,18 @@
let languages = {
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
cnt: "i18n/cn-t.json",
de: "i18n/de.json",
ja: "i18n/ja.json"
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
cnt: "i18n/cn-t.json",
de: "i18n/de.json",
ja: "i18n/ja.json"
};
function loadi18n() {
$.i18n().load(languages).done(function () {
$.i18n().locale = g_appSettings.locale;
});
function loadi18n()
{
$.i18n().load(languages).done(function ()
{
$.i18n().locale = g_appSettings.locale;
});
}
function renderI18n(locale)
@ -26,17 +27,21 @@ function changeLocale()
renderI18n(g_appSettings.locale);
}
function loadChildWindowI18n() {
$.i18n().load(languages).done(function () {
renderI18n(window.opener.g_appSettings.locale);
});
function loadChildWindowI18n()
{
$.i18n().load(languages).done(function ()
{
renderI18n(window.opener.g_appSettings.locale);
});
}
function loadRosteri18n() {
$.i18n().load(languages).done(function () {
renderI18n(window.opener.g_appSettings.locale);
addControls();
});
function loadRosteri18n()
{
$.i18n().load(languages).done(function ()
{
renderI18n(window.opener.g_appSettings.locale);
addControls();
});
}
function renderLocale()

Wyświetl plik

@ -166,6 +166,24 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
callObj.style.call = "class='dxCaller'";
}
}
// award tracker overrides
let awardTrackerOverrides = {
call: false,
grids: false,
dxcc: false,
states: false,
cnty: false,
cqz: false,
px: false,
cont: false
};
if (g_rosterSettings.reference == LOGBOOK_AWARD_TRACKER)
{
for (let key in awardTracker)
{
awardTrackerOverrides[awardTracker[key].rule.type] = true;
}
}
// Hunting for callsigns
if (huntCallsign.checked)