From 37123d848190a336c0631236febaa2792de3510c Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Fri, 12 May 2023 17:08:18 +0200 Subject: Updated 8 files, deleted 2 files and renamed 4 files (automated) --- client/commands.js | 17 ++++- client/i18n.js | 8 +-- client/index.html | 24 +++++-- client/main.js | 35 ++++++++- launcher/client/main.js | 20 ++++++ launcher/client/package.json | 2 +- launcher/server/operators.json | 1 - launcher/server/ops.json | 1 - server/server.js | 60 +++++++++------- shared/lang/de-DE.json | 157 ---------------------------------------- shared/lang/de.json | 158 +++++++++++++++++++++++++++++++++++++++++ shared/lang/en-US.json | 157 ---------------------------------------- shared/lang/en.json | 158 +++++++++++++++++++++++++++++++++++++++++ shared/lang/es-ES.json | 157 ---------------------------------------- shared/lang/es.json | 158 +++++++++++++++++++++++++++++++++++++++++ shared/lang/fr-FR.json | 157 ---------------------------------------- shared/lang/fr.json | 158 +++++++++++++++++++++++++++++++++++++++++ utilities/autotranslate.js | 4 +- 18 files changed, 763 insertions(+), 669 deletions(-) delete mode 100644 launcher/server/operators.json delete mode 100644 launcher/server/ops.json delete mode 100644 shared/lang/de-DE.json create mode 100644 shared/lang/de.json delete mode 100644 shared/lang/en-US.json create mode 100644 shared/lang/en.json delete mode 100644 shared/lang/es-ES.json create mode 100644 shared/lang/es.json delete mode 100644 shared/lang/fr-FR.json create mode 100644 shared/lang/fr.json diff --git a/client/commands.js b/client/commands.js index 5f27c29..84b37d2 100644 --- a/client/commands.js +++ b/client/commands.js @@ -10,6 +10,19 @@ commands = { localStorage.setItem("username", userName); systemMessage(sl("commands/nick/other", [["%2", oldUserName], ["%1", argument]]), l("commands/nick/self").replace("%1", argument)); }, + "lang": (argument, _) => { + if (require('fs').existsSync("../shared/lang/" + argument.trim().replaceAll("/", "-") + ".json")) { + localStorage.setItem("language", argument.trim()); + } else { + localStorage.setItem("language", "en"); + } + + location.reload(); + }, + "switch": async (argument, _) => { + await updateServer(); + location.reload(); + }, "background": (argument, _) => { if (argument.trim() === "") argument = null; @@ -166,9 +179,9 @@ commands = { }, "version": (_1, _2) => { if (window.connected) { - localSystemMessage(l("commands/version/localchat") + " " + stripHTML(window.version) + "
" + l("commands/version/node") + " " + process.versions.node + "
" + l("commands/version/chrome") + " " + process.versions.chrome + "
" + l("commands/version/electron") + " " + process.versions.electron + "
" + l("commands/version/server") + " " + stripHTML(window.serverVersion), true); + localSystemMessage(l("commands/version/localchat") + " " + stripHTML(window.version) + "
" + l("commands/version/launcher") + " " + stripHTML(window.launcherVersion) + "
" + l("commands/version/node") + " " + process.versions.node + "
" + l("commands/version/chrome") + " " + process.versions.chrome + "
" + l("commands/version/electron") + " " + process.versions.electron + "
" + l("commands/version/server") + " " + stripHTML(window.serverVersion), true); } else { - localSystemMessage(l("commands/version/localchat") + " " + stripHTML(window.version) + "
" + l("commands/version/node") + " " + process.versions.node + "
" + l("commands/version/chrome") + " " + process.versions.chrome + "
" + l("commands/version/electron") + " " + process.versions.electron, true); + localSystemMessage(l("commands/version/localchat") + " " + stripHTML(window.version) + "
" + l("commands/version/launcher") + " " + stripHTML(window.launcherVersion) + "
" + l("commands/version/node") + " " + process.versions.node + "
" + l("commands/version/chrome") + " " + process.versions.chrome + "
" + l("commands/version/electron") + " " + process.versions.electron, true); } }, "changelog": (_1, _2) => { diff --git a/client/i18n.js b/client/i18n.js index 64bd06c..09e2d3b 100644 --- a/client/i18n.js +++ b/client/i18n.js @@ -15,13 +15,13 @@ function mergeRecursive(obj1, obj2) { } function loadLang() { - let language = window.betaVersion ? (localStorage.getItem("language") ?? "en-US") : "en-US"; + let language = window.betaVersion ? (localStorage.getItem("language") ?? "en") : "en"; window.langName = language; delete window.lang; - window.lang = mergeRecursive(require('../shared/lang/en-US.json'), require('../shared/lang/' + language.replaceAll("/", "-") + ".json")); + window.lang = mergeRecursive(require('../shared/lang/en.json'), require('../shared/lang/' + language.replaceAll("/", "-") + ".json")); - if (language === "en-US") { + if (language === "en") { document.getElementById("oobe-language-badge").style.display = ""; } else { document.getElementById("oobe-language-badge").style.display = "none"; @@ -72,5 +72,5 @@ if (localStorage.getItem("oobe-" + version) === "1") { document.getElementById("oobe").style.display = "none"; connect(); } else { - document.getElementById("oobe-dropdown-language").value = localStorage.getItem("language") ?? "en-US"; + document.getElementById("oobe-dropdown-language").value = localStorage.getItem("language") ?? "en"; } \ No newline at end of file diff --git a/client/index.html b/client/index.html index 177fc15..d64159f 100755 --- a/client/index.html +++ b/client/index.html @@ -3,7 +3,7 @@