mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

one step forward, 2 steps backwards

Matthew Chambers 2022-08-15 20:19:09 -05:00
rodzic 903319452b
commit 78aaaed2ad
6 zmienionych plików z 74 dodań i 92 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
package.nw/GridTracker.html
Wyświetl plik

@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script src="./lib/datepicker.js"></script> <script src="./lib/datepicker.js"></script>
<script src="./lib/callsigns.js" type="text/javascript"></script> <script src="./lib/callsigns.js" type="text/javascript"></script>
<script src="node_modules/jquery/dist/jquery.js"></script> <script src="node_modules/jquery/dist/jquery.js"></script>
<script src="./lib/i18n.js"></script>
<script src="./lib/CLDRPluralRuleParser.js"></script> <script src="./lib/CLDRPluralRuleParser.js"></script>
<script src="./lib/jquery.i18n.js"></script> <script src="./lib/jquery.i18n.js"></script>
<script src="./lib/jquery.i18n.messagestore.js"></script> <script src="./lib/jquery.i18n.messagestore.js"></script>

20
package.nw/gt_roster.html
Wyświetl plik

@ -21,14 +21,15 @@
<link id="roster" rel="stylesheet" href="./lib/style_roster.css" /> <link id="roster" rel="stylesheet" href="./lib/style_roster.css" />
<script src="./lib/protos.js" type="text/javascript"></script> <script src="./lib/protos.js" type="text/javascript"></script>
<script src="./lib/third-party.js" type="text/javascript"></script> <script src="./lib/third-party.js" type="text/javascript"></script>
<script src="node_modules/jquery/dist/jquery.js"></script> <script src="node_modules/jquery/dist/jquery.js" type="text/javascript"></script>
<script src="./lib/CLDRPluralRuleParser.js"></script> <script src="./lib/CLDRPluralRuleParser.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.js"></script> <script src="./lib/jquery.i18n.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.messagestore.js"></script> <script src="./lib/jquery.i18n.messagestore.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.fallbacks.js"></script> <script src="./lib/jquery.i18n.fallbacks.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.parser.js"></script> <script src="./lib/jquery.i18n.parser.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.emitter.js"></script> <script src="./lib/jquery.i18n.emitter.js" type="text/javascript"></script>
<script src="./lib/jquery.i18n.language.js"></script> <script src="./lib/jquery.i18n.language.js" type="text/javascript"></script>
<script src="./lib/i18n.js" type="text/javascript"></script>
<script src="./lib/roster.js " type="text/javascript"></script> <script src="./lib/roster.js " type="text/javascript"></script>
<script src="./lib/roster/prepareRosterSettings.js" type="text/javascript"></script> <script src="./lib/roster/prepareRosterSettings.js" type="text/javascript"></script>
<script src="./lib/roster/processRosterFiltering.js" type="text/javascript"></script> <script src="./lib/roster/processRosterFiltering.js" type="text/javascript"></script>
@ -39,7 +40,8 @@
<script src="./lib/roster/rosterColumns.js" type="text/javascript"></script> <script src="./lib/roster/rosterColumns.js" type="text/javascript"></script>
<script src="./lib/roster/rosterColumnFunctions.js" type="text/javascript"></script> <script src="./lib/roster/rosterColumnFunctions.js" type="text/javascript"></script>
<script src="./lib/roster/sendAlerts.js" type="text/javascript"></script> <script src="./lib/roster/sendAlerts.js" type="text/javascript"></script>
<script src="./lib/screens.js"></script> <script src="./lib/screens.js" type="text/javascript"></script>
<script src="./lib/alerts.js" type="text/javascript"></script>
</head> </head>
<body onload="init()" class="roster" oncontextmenu="return handleContextMenu(event);"> <body onload="init()" class="roster" oncontextmenu="return handleContextMenu(event);">
<div id="MainCallRoster"> <div id="MainCallRoster">

2
package.nw/i18n/en.json
Wyświetl plik

@ -518,7 +518,7 @@
"roster.secondary.wanted.callsign": "Callsign", "roster.secondary.wanted.callsign": "Callsign",
"roster.secondary.wanted.grid": "Grid", "roster.secondary.wanted.grid": "Grid",
"roster.secondary.wanted.dxcc": "DXCC", "roster.secondary.wanted.dxcc": "DXCC",
"roster.secodnary.wanted.qrz": "QRZ", "roster.secondary.wanted.qrz": "QRZ",
"roster.secondary.wanted.wpx": "WPX", "roster.secondary.wanted.wpx": "WPX",
"roster.secondary.wanted.pota": "POTA", "roster.secondary.wanted.pota": "POTA",
"roster.secondary.wanted.OAMS": "OAMS", "roster.secondary.wanted.OAMS": "OAMS",

44
package.nw/lib/gt.js
Wyświetl plik

@ -2588,6 +2588,7 @@ function openCallRosterWindow(show = true)
{ {
console.error(e); console.error(e);
} }
lockNewWindows(); lockNewWindows();
} }
else else
@ -13582,20 +13583,6 @@ function startupVersionInit()
} }
} }
function loadi18n()
{
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
de: "i18n/de.json"
}).done(function ()
{
$.i18n().locale = g_appSettings.locale;
});
}
function startupButtonsAndInputs() function startupButtonsAndInputs()
{ {
try try
@ -13686,34 +13673,6 @@ function postInit()
openCallRosterWindow(false); openCallRosterWindow(false);
openConditionsWindow(false); openConditionsWindow(false);
showMessaging(false); showMessaging(false);
renderI18n();
}
function renderI18n()
{
$("body").i18n();
// render call roster window strings
if (g_callRosterWindowHandle)
{
try
{
g_callRosterWindowHandle.window.close();
g_callRosterWindowHandle = null;
openCallRosterWindow(false);
}
catch (e)
{
console.error(e);
}
}
}
function changeLocale()
{
g_appSettings.locale = languageLocale.value;
$.i18n().locale = g_appSettings.locale;
renderI18n();
} }
document.addEventListener("dragover", function (event) document.addEventListener("dragover", function (event)
@ -13749,6 +13708,7 @@ var g_startupTable = [
[initSoundCards, "Sounds Initialized"], [initSoundCards, "Sounds Initialized"],
[loadPortSettings, "Loaded Network Settings"], [loadPortSettings, "Loaded Network Settings"],
[loadLookupDetails, "Callsign Lookup Details Loaded"], [loadLookupDetails, "Callsign Lookup Details Loaded"],
[renderLocale, "Rendering Locale"],
[startupEventsAndTimers, "Set Events and Timers"], [startupEventsAndTimers, "Set Events and Timers"],
[registerHotKeys, "Registered Hotkeys"], [registerHotKeys, "Registered Hotkeys"],
[gtChatSystemInit, "Chat System Initialized"], [gtChatSystemInit, "Chat System Initialized"],

45
package.nw/lib/i18n.js 100644
Wyświetl plik

@ -0,0 +1,45 @@
function loadi18n()
{
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
de: "i18n/de.json"
}).done(function ()
{
$.i18n().locale = g_appSettings.locale;
});
}
function renderI18n(locale)
{
$.i18n().locale = locale;
$("body").i18n();
}
function changeLocale()
{
g_appSettings.locale = languageLocale.value;
renderI18n(g_appSettings.locale);
}
function loadRosteri18n()
{
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
de: "i18n/de.json"
}).done(function ()
{
renderI18n(window.opener.g_appSettings.locale);
addControls();
});
}
function renderLocale()
{
renderI18n(g_appSettings.locale);
}

40
package.nw/lib/roster.js
Wyświetl plik

@ -1005,7 +1005,7 @@ function setVisual()
resize(); resize();
} }
function wantedChanged(element) function wantedChagned(element)
{ {
g_rosterSettings.wanted[element.id] = element.checked; g_rosterSettings.wanted[element.id] = element.checked;
@ -1517,20 +1517,19 @@ function init()
g_callsignDatabaseDXCC = window.opener.g_callsignDatabaseDXCC; g_callsignDatabaseDXCC = window.opener.g_callsignDatabaseDXCC;
g_callsignDatabaseUS = window.opener.g_callsignDatabaseUS; g_callsignDatabaseUS = window.opener.g_callsignDatabaseUS;
g_callsignDatabaseUSplus = window.opener.g_callsignDatabaseUSplus; g_callsignDatabaseUSplus = window.opener.g_callsignDatabaseUSplus;
loadAwardJson(); loadAwardJson();
updateWorked(); updateWorked();
// addAllAwards(); // addAllAwards();
window.addEventListener("message", receiveMessage, false); window.addEventListener("message", receiveMessage, false);
lockNewWindows(); lockNewWindows();
loadi18n(); loadRosteri18n()
if (window.opener.g_mapSettings.offlineMode == false) { if (window.opener.g_mapSettings.offlineMode == false)
{
getBuffer( getBuffer(
"https://storage.googleapis.com/gt_app/callsigns/manifest.json", "https://storage.googleapis.com/gt_app/callsigns/manifest.json",
manifestResult, manifestResult,
@ -1539,21 +1538,20 @@ function init()
80 80
); );
} }
loadSettings(); loadSettings();
window.opener.setRosterSpot(g_rosterSettings.columns.Spot); window.opener.setRosterSpot(g_rosterSettings.columns.Spot);
// addControls();
for (let key in g_rosterSettings.wanted) for (let key in g_rosterSettings.wanted)
{ {
if (document.getElementById(key)) if (document.getElementById(key))
{ document.getElementById(key).checked = g_rosterSettings.wanted[key]; } { document.getElementById(key).checked = g_rosterSettings.wanted[key]; }
} }
} }
function addControls() { function addControls()
{
g_menu = new nw.Menu(); g_menu = new nw.Menu();
g_compactMenu = new nw.Menu(); g_compactMenu = new nw.Menu();
@ -3486,27 +3484,3 @@ function listShortInstances()
} }
return shortInstances; return shortInstances;
} }
function loadi18n()
{
console.log("load i18n");
$.i18n().load(
{
en: "i18n/en.json",
es: "i18n/es.json",
cn: "i18n/cn.json",
de: "i18n/de.json"
}).done(function () {
renderI18n('de');
addControls();
});
}
function renderI18n(locale)
{
console.log("render i18n");
$.i18n().locale = locale;
$("body").i18n();
}