From 78aaaed2ade1094add163d5850bef6ab1b2226fb Mon Sep 17 00:00:00 2001 From: Matthew Chambers Date: Mon, 15 Aug 2022 20:19:09 -0500 Subject: [PATCH] one step forward, 2 steps backwards --- package.nw/GridTracker.html | 1 + package.nw/gt_roster.html | 22 +++++++++------- package.nw/i18n/en.json | 2 +- package.nw/lib/gt.js | 44 ++----------------------------- package.nw/lib/i18n.js | 45 ++++++++++++++++++++++++++++++++ package.nw/lib/roster.js | 52 ++++++++++--------------------------- 6 files changed, 74 insertions(+), 92 deletions(-) create mode 100644 package.nw/lib/i18n.js diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 81497ac..7f4bae0 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html index 1d86a83..b469aa3 100644 --- a/package.nw/gt_roster.html +++ b/package.nw/gt_roster.html @@ -21,15 +21,16 @@ - - - - - - - - - + + + + + + + + + + @@ -39,7 +40,8 @@ - + +
diff --git a/package.nw/i18n/en.json b/package.nw/i18n/en.json index d8ebe41..21ba62c 100644 --- a/package.nw/i18n/en.json +++ b/package.nw/i18n/en.json @@ -518,7 +518,7 @@ "roster.secondary.wanted.callsign": "Callsign", "roster.secondary.wanted.grid": "Grid", "roster.secondary.wanted.dxcc": "DXCC", - "roster.secodnary.wanted.qrz": "QRZ", + "roster.secondary.wanted.qrz": "QRZ", "roster.secondary.wanted.wpx": "WPX", "roster.secondary.wanted.pota": "POTA", "roster.secondary.wanted.OAMS": "OAMS", diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index d77c247..9cbf023 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -2588,6 +2588,7 @@ function openCallRosterWindow(show = true) { console.error(e); } + lockNewWindows(); } 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() { try @@ -13686,34 +13673,6 @@ function postInit() openCallRosterWindow(false); openConditionsWindow(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) @@ -13749,6 +13708,7 @@ var g_startupTable = [ [initSoundCards, "Sounds Initialized"], [loadPortSettings, "Loaded Network Settings"], [loadLookupDetails, "Callsign Lookup Details Loaded"], + [renderLocale, "Rendering Locale"], [startupEventsAndTimers, "Set Events and Timers"], [registerHotKeys, "Registered Hotkeys"], [gtChatSystemInit, "Chat System Initialized"], diff --git a/package.nw/lib/i18n.js b/package.nw/lib/i18n.js new file mode 100644 index 0000000..2332a85 --- /dev/null +++ b/package.nw/lib/i18n.js @@ -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); +} diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 7ac5690..2a92ede 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -1005,7 +1005,7 @@ function setVisual() resize(); } -function wantedChanged(element) +function wantedChagned(element) { g_rosterSettings.wanted[element.id] = element.checked; @@ -1517,43 +1517,41 @@ function init() g_callsignDatabaseDXCC = window.opener.g_callsignDatabaseDXCC; g_callsignDatabaseUS = window.opener.g_callsignDatabaseUS; g_callsignDatabaseUSplus = window.opener.g_callsignDatabaseUSplus; - loadAwardJson(); updateWorked(); - // addAllAwards(); window.addEventListener("message", receiveMessage, false); lockNewWindows(); - loadi18n(); + loadRosteri18n() - if (window.opener.g_mapSettings.offlineMode == false) { + if (window.opener.g_mapSettings.offlineMode == false) + { getBuffer( - "https://storage.googleapis.com/gt_app/callsigns/manifest.json", - manifestResult, - null, - "http", - 80 + "https://storage.googleapis.com/gt_app/callsigns/manifest.json", + manifestResult, + null, + "http", + 80 ); } - loadSettings(); window.opener.setRosterSpot(g_rosterSettings.columns.Spot); + // addControls(); for (let key in g_rosterSettings.wanted) { if (document.getElementById(key)) { document.getElementById(key).checked = g_rosterSettings.wanted[key]; } } - } -function addControls() { - +function addControls() +{ g_menu = new nw.Menu(); g_compactMenu = new nw.Menu(); @@ -1619,7 +1617,7 @@ function addControls() { item = new nw.MenuItem({ type: "normal", - label: $.i18n( "roster.menu.RosterMode"), + label: $.i18n("roster.menu.RosterMode"), click: function () { g_rosterSettings.compact = false; @@ -3486,27 +3484,3 @@ function listShortInstances() } 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(); -} \ No newline at end of file