cleanup, stats.js references translated (but still not verified... where does it say valid/invalid?

merge-requests/237/merge
Christian Bayer 2022-09-14 22:33:45 -04:00 zatwierdzone przez Tag
rodzic bd1204c18a
commit 690309ef66
6 zmienionych plików z 37 dodań i 41 usunięć

Wyświetl plik

@ -1157,7 +1157,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<select id="languageLocale" value="en" onchange="changeLocale();">
<option value="en">English</option>
<option value="cn">简体中文</option>
<option value="hk">繁體中文</option>
<option value="cnt">繁體中文</option>
<option value="de">Deutsch</option>
<option value="es">Español</option>
<option value="ja">日本語</option>

Wyświetl plik

@ -20,6 +20,13 @@
<title>Statistics</title>
<link rel="stylesheet" href="./lib/style.css" />
<script src="./lib/protos.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.messagestore.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.fallbacks.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.parser.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.emitter.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.language.js" type="text/javascript"></script>
<script src="./lib/i18n.js" type="text/javascript"></script>
<script src="./lib/stats.js"></script>
<script src="./lib/screens.js"></script>
</head>

Wyświetl plik

@ -2616,14 +2616,6 @@ function openCallRosterWindow(show = true)
});
}
);
try
{
// g_callRosterWindowHandle.window.loadRosteri18n();
}
catch (e)
{
console.error(e);
}
lockNewWindows();
}
@ -2648,7 +2640,6 @@ function openCallRosterWindow(show = true)
g_callRosterWindowHandle.hide();
}
}
// g_callRosterWindowHandle.window.loadRosteri18n();
}
catch (e)
{

Wyświetl plik

@ -1,17 +1,17 @@
function loadi18n()
{
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
hk: "i18n/hk.json",
de: "i18n/de.json",
ja: "i18n/ja.json"
}).done(function ()
{
$.i18n().locale = g_appSettings.locale;
});
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"
};
function loadi18n() {
$.i18n().load(languages).done(function () {
$.i18n().locale = g_appSettings.locale;
});
}
function renderI18n(locale)
@ -26,20 +26,17 @@ function changeLocale()
renderI18n(g_appSettings.locale);
}
function loadRosteri18n()
{
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
de: "i18n/de.json",
js: "i18n/ja.json"
}).done(function ()
{
renderI18n(window.opener.g_appSettings.locale);
addControls();
});
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 renderLocale()

Wyświetl plik

@ -98,14 +98,14 @@ function ValidateCallsign(inputText, validDiv)
{
inputText.style.color = "#FF0";
inputText.style.backgroundColor = "green";
if (validDiv) validDiv.innerHTML = "Valid!";
if (validDiv) validDiv.innerHTML = $.i18n("stats.Validate.Valid");
return true;
}
else
{
inputText.style.color = "#000";
inputText.style.backgroundColor = "yellow";
if (validDiv) validDiv.innerHTML = "Invalid!";
if (validDiv) validDiv.innerHTML = $.i18n("stats.Validate.Invalid");
return false;
}
}
@ -113,7 +113,7 @@ function ValidateCallsign(inputText, validDiv)
{
inputText.style.color = "#000";
inputText.style.backgroundColor = "yellow";
if (validDiv) validDiv.innerHTML = "Invalid!";
if (validDiv) validDiv.innerHTML = $.i18n("stats.Validate.Invalid");
return false;
}
}
@ -126,6 +126,7 @@ function validateCallByElement(elementString)
function init()
{
openInfoTab(event, "workedBoxDiv", "showWorkedBox");
loadChildWindowI18n();
}
function addTextToClipboard(data)