From 19d52beb2b79434913a9dfe059d41e6de10099c9 Mon Sep 17 00:00:00 2001
From: Kamesuta <kamesuta@gmail.com>
Date: Wed, 27 Sep 2023 00:28:33 +0900
Subject: [PATCH] Fix mojang/microsoft status icon is undefined

---
 app/assets/js/scripts/landing.js | 6 +++---
 app/assets/lang/en_US.toml       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js
index 7d65ed60..b675cea9 100644
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@@ -202,7 +202,7 @@ const refreshMojangStatuses = async function(){
         const service = statuses[i]
 
         const tooltipHTML = `<div class="mojangStatusContainer">
-            <span class="mojangStatusIcon" style="color: ${MojangRestAPI.statusToHex(service.status)};">${Lang.queryEJS('landing.mojangStatus.icon')}</span>
+            <span class="mojangStatusIcon" style="color: ${MojangRestAPI.statusToHex(service.status)};">${Lang.queryJS('landing.mojangStatus.icon')}</span>
             <span class="mojangStatusName">${service.name}</span>
         </div>`
         if(service.essential){
@@ -335,7 +335,7 @@ async function asyncSystemScan(effectiveJavaOptions, launchAfter = true){
             $('#overlayContent').fadeOut(250, () => {
                 //$('#overlayDismiss').toggle(false)
                 setOverlayContent(
-                    Lang.queryJS('landing.systemScan.javaRequired'),
+                    Lang.queryJS('landing.systemScan.javaRequired', { 'major': effectiveJavaOptions.suggestedMajor }),
                     Lang.queryJS('landing.systemScan.javaRequiredMessage', { 'major': effectiveJavaOptions.suggestedMajor }),
                     Lang.queryJS('landing.systemScan.javaRequiredDismiss'),
                     Lang.queryJS('landing.systemScan.javaRequiredCancel')
@@ -621,7 +621,7 @@ async function dlAsync(login = true) {
                 DiscordWrapper.initRPC(distro.rawDistribution.discord, serv.rawServer.discord)
                 hasRPC = true
                 proc.on('close', (code, signal) => {
-                    loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.shuttingDownRPC'))
+                    loggerLaunchSuite.info('Shutting down Discord Rich Presence..')
                     DiscordWrapper.shutdownRPC()
                     hasRPC = false
                     proc = null
diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml
index d6522528..397db6c7 100644
--- a/app/assets/lang/en_US.toml
+++ b/app/assets/lang/en_US.toml
@@ -235,7 +235,6 @@ preparingToLaunch = "Preparing to launch.."
 launchingGame = "Launching game.."
 launchWrapperNotDownloaded = "The main file, LaunchWrapper, failed to download properly. As a result, the game cannot launch.<br><br>To fix this issue, temporarily turn off your antivirus software and launch the game again.<br><br>If you have time, please <a href=\"https://github.com/dscalzi/HeliosLauncher/issues\">submit an issue</a> and let us know what antivirus software you use. We'll contact them and try to straighten things out."
 doneEnjoyServer = "Done. Enjoy the server!"
-shuttingDownRPC = "Shutting down Discord Rich Presence.."
 checkConsoleForDetails = "Please check the console (CTRL + Shift + i) for more details."
 
 [js.landing.news]