From f607c9793d450ed8b5f87932c9c4488bd127c90d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 16 Sep 2025 18:24:44 +0300 Subject: [PATCH] chore(desktop): use translation --- apps/desktop/src/main.ts | 6 ++++-- apps/server/src/assets/translations/en/server.json | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index bb44b93e8..8e2d63c88 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -1,4 +1,5 @@ import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js"; +import { t } from "i18next"; import electron from "electron"; import sqlInit from "@triliumnext/server/src/services/sql_init.js"; @@ -73,16 +74,17 @@ async function main() { } }); + await initializeTranslations(); + const isPrimaryInstance = (await import("electron")).app.requestSingleInstanceLock(); if (!isPrimaryInstance) { - console.info("There's already an instance running, focusing that instance instead."); + console.info(t("desktop.instance_already_running")); process.exit(0); } // this is to disable electron warning spam in the dev console (local development only) process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true"; - await initializeTranslations(); const startTriliumServer = (await import("@triliumnext/server/src/www.js")).default; await startTriliumServer(); console.log("Server loaded"); diff --git a/apps/server/src/assets/translations/en/server.json b/apps/server/src/assets/translations/en/server.json index f7db941a6..2fcbe5464 100644 --- a/apps/server/src/assets/translations/en/server.json +++ b/apps/server/src/assets/translations/en/server.json @@ -428,5 +428,8 @@ "sql_init": { "db_not_initialized_desktop": "DB not initialized, please follow on-screen instructions.", "db_not_initialized_server": "DB not initialized, please visit setup page - http://[your-server-host]:{{port}} to see instructions on how to initialize Trilium." + }, + "desktop": { + "instance_already_running": "There's already an instance running, focusing that instance instead." } }