diff --git a/_regroup_monorepo/apps/server/translations/cn/server.json b/apps/server/src/assets/translations/cn/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/cn/server.json rename to apps/server/src/assets/translations/cn/server.json diff --git a/_regroup_monorepo/apps/server/translations/de/server.json b/apps/server/src/assets/translations/de/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/de/server.json rename to apps/server/src/assets/translations/de/server.json diff --git a/_regroup_monorepo/apps/server/translations/en/server.json b/apps/server/src/assets/translations/en/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/en/server.json rename to apps/server/src/assets/translations/en/server.json diff --git a/_regroup_monorepo/apps/server/translations/es/server.json b/apps/server/src/assets/translations/es/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/es/server.json rename to apps/server/src/assets/translations/es/server.json diff --git a/_regroup_monorepo/apps/server/translations/fr/server.json b/apps/server/src/assets/translations/fr/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/fr/server.json rename to apps/server/src/assets/translations/fr/server.json diff --git a/_regroup_monorepo/apps/server/translations/pt_br/server.json b/apps/server/src/assets/translations/pt_br/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/pt_br/server.json rename to apps/server/src/assets/translations/pt_br/server.json diff --git a/_regroup_monorepo/apps/server/translations/ro/server.json b/apps/server/src/assets/translations/ro/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/ro/server.json rename to apps/server/src/assets/translations/ro/server.json diff --git a/_regroup_monorepo/apps/server/translations/tw/server.json b/apps/server/src/assets/translations/tw/server.json similarity index 100% rename from _regroup_monorepo/apps/server/translations/tw/server.json rename to apps/server/src/assets/translations/tw/server.json diff --git a/apps/server/src/services/i18n.ts b/apps/server/src/services/i18n.ts index 2cbe3baa1..183edc4a3 100644 --- a/apps/server/src/services/i18n.ts +++ b/apps/server/src/services/i18n.ts @@ -80,11 +80,12 @@ export async function initializeTranslations() { // Initialize translations await i18next.use(Backend).init({ + debug: true, lng: getCurrentLanguage(), fallbackLng: "en", ns: "server", backend: { - loadPath: join(resourceDir, "translations/{{lng}}/{{ns}}.json") + loadPath: join(resourceDir, "assets/translations/{{lng}}/{{ns}}.json") } }); } diff --git a/apps/server/src/services/utils.ts b/apps/server/src/services/utils.ts index fc041f312..246742b61 100644 --- a/apps/server/src/services/utils.ts +++ b/apps/server/src/services/utils.ts @@ -285,13 +285,13 @@ export function envToBoolean(val: string | undefined) { /** * Returns the directory for resources. On Electron builds this corresponds to the `resources` subdirectory inside the distributable package. - * On development builds, this simply refers to the root directory of the application. + * On development builds, this simply refers to the src directory of the application. * * @returns the resource dir. */ export function getResourceDir() { if (isElectron && !isDev) return process.resourcesPath; - return join(dirname(fileURLToPath(import.meta.url)), "..", ".."); + return join(dirname(fileURLToPath(import.meta.url)), ".."); } // TODO: Deduplicate with src/public/app/services/utils.ts