change locales

Bombe · Jan 17, 2023 · 457ba83 · 457ba83
1 parent a34f5b5
commit 457ba83
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/src/js/eve-server.js b/src/js/eve-server.js
@@ -35,7 +35,7 @@ async function getServerStatus() {
   playerCount.text('')
 
   const locale = getLocale()
-  let status = locale.serverStatus.unknown,
+  let status = 'N/A',
   players = 'N/A',
   cssClass = 'text-warning fw-bold';
 
@@ -47,23 +47,20 @@ async function getServerStatus() {
     if (res.statusCode == 504) {
       status = locale.serverStatus.offline
       cssClass = 'text-danger fw-bold'
-      players = 'N/A'
     } else if (res.statusCode == 200) {
       status = locale.serverStatus.online
       players = res.body.players
       cssClass = 'text-success fw-bold'
     }
-    console.log(status, players, cssClass)
   }
-    
-    serverStatus.text(status)
-    serverStatus.attr('class', cssClass)
-    playerCount.text(players)
+
+  serverStatus.text(status)
+  serverStatus.attr('class', cssClass)
+  playerCount.text(players)
   playerCount.attr('class', cssClass)
 }
 
 module.exports = {
-  urls,
   changeServer,
   getServerStatus,
 }
diff --git a/src/js/utils.js b/src/js/utils.js
@@ -3,7 +3,7 @@ const $ = require('jquery')
 const AppConfig = require('../configuration')
 const { changeLanguage } = require('./change-language')
 const { changeServer } = require('./eve-server')
-const { openFolder, readDefaultFolders, setSelectedFolder, readSettingFiles, overwrite } = require('./eve-folder')
+const { openFolder, setSelectedFolder, readSettingFiles, overwrite } = require('./eve-folder')
 const { editDescription } = require('./edit-description')
 const { join } = require('path')
 const { readdir } = require('node:fs/promises')
@@ -25,7 +25,7 @@ function init() {
 }
 
 async function initSelects() {
-  // load languages
+  // load locale files
   const locales = (await readdir(localePath, { withFileTypes: true }))
     .filter(dirent => dirent.isFile() && dirent.name.endsWith('.json'))
     .map(dirent => join(localePath, dirent.name))
@@ -60,20 +60,18 @@ async function initSelects() {
 function bindEvents() {
   languageSelect.on('change', () => {
     const selectedLang = languageSelect.val()
-    // AppConfig.saveSettings('language', selectedLang)
     changeLanguage(selectedLang)
   })
 
   serverSelect.on('change', () => {
     const selectedServer = serverSelect.val()
-    // AppConfig.saveSettings('server', selectedServer)
     changeServer(selectedServer)
   })
 
   folderSelect.on('change', () => {
     const selectedFolder = folderSelect.val()
     const server = serverSelect.val()
-    AppConfig.saveSettings('savedFolder.' + server, selectedFolder)
+    AppConfig.saveSettings(`savedFolder.${server}`, selectedFolder)
     readSettingFiles()
   })
 

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -32,7 +32,6 @@
     "cancel": "Cancel"
   },
   "serverStatus": {
-    "unknown": "Unknown",
     "online": "Online",
     "offline": "Offline"
   }

diff --git a/src/locales/zh-CHT.json b/src/locales/zh-CHT.json
@@ -32,7 +32,6 @@
     "cancel": "取消"
   },
   "serverStatus": {
-    "unknown": "未知",
     "online": "線上",
     "offline": "離線"
   }

diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
@@ -32,7 +32,6 @@
     "cancel": "取消"
   },
   "serverStatus": {
-    "unknown": "未知",
     "online": "在线",
     "offline": "离线"
   }