gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

chore(desktop): use translation

Browse Source
This commit is contained in:
Elian Doran 2025-09-16 18:24:44 +03:00
parent 06254442c9
commit f607c9793d
No known key found for this signature in database
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/desktop/src/main.ts
View File

@ -1,4 +1,5 @@
import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js"; import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js";
import { t } from "i18next";
import electron from "electron"; import electron from "electron";
import sqlInit from "@triliumnext/server/src/services/sql_init.js"; 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(); const isPrimaryInstance = (await import("electron")).app.requestSingleInstanceLock();
if (!isPrimaryInstance) { if (!isPrimaryInstance) {
console.info("There's already an instance running, focusing that instance instead."); console.info(t("desktop.instance_already_running"));
process.exit(0); process.exit(0);
} }
// this is to disable electron warning spam in the dev console (local development only) // this is to disable electron warning spam in the dev console (local development only)
process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true"; process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
await initializeTranslations();
const startTriliumServer = (await import("@triliumnext/server/src/www.js")).default; const startTriliumServer = (await import("@triliumnext/server/src/www.js")).default;
await startTriliumServer(); await startTriliumServer();
console.log("Server loaded"); console.log("Server loaded");

3
apps/server/src/assets/translations/en/server.json
View File

@ -428,5 +428,8 @@
"sql_init": { "sql_init": {
"db_not_initialized_desktop": "DB not initialized, please follow on-screen instructions.", "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." "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."
} }
} }