diff --git a/assets/lang/en_US.json b/assets/lang/en-US.json similarity index 100% rename from assets/lang/en_US.json rename to assets/lang/en-US.json diff --git a/src/ipc.ts b/src/ipc.ts index 92079ec..830a2f1 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -1,7 +1,7 @@ //ipc stuff import {app, ipcMain, shell, desktopCapturer} from "electron"; import {createTabsGuest, mainWindow} from "./window"; -import {setConfigBulk, getVersion, getConfig, setLang} from "./utils"; +import {setConfigBulk, getVersion, getConfig, setLang, getLang} from "./utils"; import {customTitlebar, tabs} from "./main"; import {createSettingsWindow} from "./settings/main"; export function registerIpc() { @@ -14,6 +14,9 @@ export function registerIpc() { ipcMain.on("setLang", (event, lang: string) => { setLang(lang); }); + ipcMain.on("getLang", (event, object: string) => { + getLang(object); + }); ipcMain.on("open-external-link", (event, href: string) => { shell.openExternal(href); }); diff --git a/src/settings/main.ts b/src/settings/main.ts index 53a46d4..4167f62 100644 --- a/src/settings/main.ts +++ b/src/settings/main.ts @@ -1,5 +1,5 @@ import {BrowserWindow, shell, ipcMain} from "electron"; -import {getConfig, setConfigBulk, Settings} from "../utils"; +import {getConfig, setConfigBulk, Settings, getLang} from "../utils"; import path from "path"; var settingsWindow: BrowserWindow; var instance: number = 0; @@ -31,6 +31,9 @@ export function createSettingsWindow() { ipcMain.handle("getSetting", (event, toGet: string) => { return getConfig(toGet); }); + ipcMain.handle("getLang", (event, toGet: string) => { + return getLang(toGet); + }); settingsWindow.webContents.setWindowOpenHandler(({url}) => { shell.openExternal(url); return {action: "deny"}; @@ -38,6 +41,7 @@ export function createSettingsWindow() { settingsWindow.loadURL(`file://${__dirname}/settings.html`); settingsWindow.on("close", (event: Event) => { ipcMain.removeHandler("getSetting"); + ipcMain.removeHandler("getLang"); ipcMain.removeAllListeners("saveSettings"); instance = 0; }); diff --git a/src/settings/preload.ts b/src/settings/preload.ts index 0c90a53..38c986d 100644 --- a/src/settings/preload.ts +++ b/src/settings/preload.ts @@ -2,6 +2,10 @@ import {contextBridge, ipcRenderer} from "electron"; console.log("ArmCord Settings"); contextBridge.exposeInMainWorld("settings", { save: (...args: any) => ipcRenderer.send("saveSettings", ...args), + getLang: (toGet: string) => + ipcRenderer.invoke("getLang", toGet).then((result) => { + return result; + }), get: (toGet: string) => ipcRenderer.invoke("getSetting", toGet).then((result) => { return result; diff --git a/src/settings/settings.html b/src/settings/settings.html index c57151c..e352741 100644 --- a/src/settings/settings.html +++ b/src/settings/settings.html @@ -14,7 +14,7 @@ -

ArmCord theme:

+

ArmCord theme:


@@ -24,19 +24,19 @@

- +

- +

- +
@@ -47,7 +47,7 @@ -

Discord channel:

+

Discord channel:

-

Client mod:

+

Client mod:

-

Performance mode:

+

Performance mode:

- + - +