From 0a69189b9b1f3aa3de4b6657d58fc53b63b50ebe Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 9 Oct 2024 22:04:00 +0300 Subject: [PATCH 1/4] i18n: Reach 100% for Romanian --- src/public/translations/ro/translation.json | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json index 2dc2acdab..ee3b02370 100644 --- a/src/public/translations/ro/translation.json +++ b/src/public/translations/ro/translation.json @@ -1369,5 +1369,27 @@ }, "title_bar_buttons": { "window-on-top": "Menține fereastra mereu vizibilă" + }, + "note_detail": { + "could_not_find_typewidget": "Nu s-a putut găsi widget-ul corespunzător tipului „{{type}}”" + }, + "note_title": { + "placeholder": "introduceți titlul notiței aici..." + }, + "search_result": { + "no_notes_found": "Nu au fost găsite notițe pentru parametrii de căutare dați.", + "search_not_executed": "Căutarea n-a fost rulată încă. Clic pe butonul „Căutare” de deasupra pentru a vedea rezultatele." + }, + "show_floating_buttons_button": { + "button_title": "Afișează butoanele" + }, + "spacer": { + "configure_launchbar": "Configurează bara de lansare" + }, + "sql_result": { + "no_rows": "Niciun rând nu a fost identificat pentru această interogare" + }, + "sql_table_schemas": { + "tables": "Tabele" } } From 849a6a3aef6e589907e0f04578ce419918f41f7d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 13 Oct 2024 14:24:46 +0300 Subject: [PATCH 2/4] electron: Solve server translation loading on macOS --- forge.config.cjs | 11 ++++++++--- src/services/i18n.ts | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/forge.config.cjs b/forge.config.cjs index 192bcbe3d..91730ed43 100644 --- a/forge.config.cjs +++ b/forge.config.cjs @@ -10,7 +10,13 @@ module.exports = { overwrite: true, asar: true, icon: "./images/app-icons/icon", - extraResource: getExtraResourcesForPlatform(), + extraResource: [ + // Moved to root + ...getExtraResourcesForPlatform(), + + // Moved to resources (TriliumNext Notes.app/Contents/Resources on macOS) + "translations/" + ], afterComplete: [(buildPath, _electronVersion, platform, _arch, callback) => { const extraResources = getExtraResourcesForPlatform(); for (const resource of extraResources) { @@ -77,8 +83,7 @@ module.exports = { function getExtraResourcesForPlatform() { let resources = [ 'dump-db/', - './bin/tpl/anonymize-database.sql', - 'translations/' + './bin/tpl/anonymize-database.sql' ]; const scripts = ['trilium-portable', 'trilium-safe-mode', 'trilium-no-cert-check'] switch (process.platform) { diff --git a/src/services/i18n.ts b/src/services/i18n.ts index 5754bc4eb..d7620cffd 100644 --- a/src/services/i18n.ts +++ b/src/services/i18n.ts @@ -2,19 +2,34 @@ import i18next from "i18next"; import Backend from "i18next-fs-backend"; import options from "./options.js"; import sql_init from "./sql_init.js"; +import { fileURLToPath } from "url"; +import { dirname, join } from "path"; +import utils from "./utils.js"; +import env from "./env.js"; export async function initializeTranslations() { + const resourceDir = getResourceDir(); + // Initialize translations await i18next.use(Backend).init({ lng: getCurrentLanguage(), fallbackLng: "en", ns: "server", + debug: true, backend: { - loadPath: "translations/{{lng}}/{{ns}}.json" + loadPath: join(resourceDir, "translations/{{lng}}/{{ns}}.json") } }); } +function getResourceDir() { + if (utils.isElectron() && !env.isDev()) { + return process.resourcesPath; + } else { + return join(dirname(fileURLToPath(import.meta.url)), "..", ".."); + } +} + function getCurrentLanguage() { let language; if (sql_init.isDbInitialized()) { From 75d019863f106ec71a39c510e5cf6ad7a1fca37a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 13 Oct 2024 14:40:07 +0300 Subject: [PATCH 3/4] server: Disable debug mode for i18n --- src/services/i18n.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/i18n.ts b/src/services/i18n.ts index d7620cffd..3498045bd 100644 --- a/src/services/i18n.ts +++ b/src/services/i18n.ts @@ -15,7 +15,6 @@ export async function initializeTranslations() { lng: getCurrentLanguage(), fallbackLng: "en", ns: "server", - debug: true, backend: { loadPath: join(resourceDir, "translations/{{lng}}/{{ns}}.json") } From cddc9a7b6a48318a9b702dd3dd0d239c16d64e73 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 13 Oct 2024 14:43:14 +0300 Subject: [PATCH 4/4] i18n: Mark mind map as beta --- src/public/translations/en/translation.json | 2 +- src/public/translations/es/translation.json | 2 +- src/public/translations/ro/translation.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json index 049413d34..965f0d2f5 100644 --- a/src/public/translations/en/translation.json +++ b/src/public/translations/en/translation.json @@ -1327,7 +1327,7 @@ "mermaid-diagram": "Mermaid Diagram", "canvas": "Canvas", "web-view": "Web View", - "mind-map": "Mind Map", + "mind-map": "Mind Map (Beta)", "file": "File", "image": "Image", "launcher": "Launcher", diff --git a/src/public/translations/es/translation.json b/src/public/translations/es/translation.json index 0f8c72fd1..c4de8b404 100644 --- a/src/public/translations/es/translation.json +++ b/src/public/translations/es/translation.json @@ -1317,7 +1317,7 @@ "mermaid-diagram": "Diagrama Mermaid", "canvas": "Lienzo", "web-view": "Vista Web", - "mind-map": "Mapa Mental", + "mind-map": "Mapa Mental (beta)", "file": "Archivo", "image": "Imagen", "launcher": "Lanzador", diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json index 17b3d5ac3..d856ddaa1 100644 --- a/src/public/translations/ro/translation.json +++ b/src/public/translations/ro/translation.json @@ -1291,7 +1291,7 @@ "canvas": "Schiță", "code": "Cod sursă", "mermaid-diagram": "Diagramă Mermaid", - "mind-map": "Hartă mentală", + "mind-map": "Hartă mentală (beta)", "note-map": "Hartă notițe", "relation-map": "Hartă relații", "render-note": "Randare notiță",