From c4c8fe23a9999f29685d58729b01334965130120 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 16:29:44 +0200
Subject: [PATCH 01/10] fix(website): pages not prerendered

---
 apps/website/src/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 8cbea3d0e..92455792a 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -69,7 +69,7 @@ export function LocaleProvider({ children }) {
 
   return (
     <LocaleContext.Provider value={localeId}>
-      {loaded && children}
+      {children}
     </LocaleContext.Provider>
   );
 }

From 86aaa97809b90f72ffabadad79cdd103f653fae1 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 16:30:03 +0200
Subject: [PATCH 02/10] fix(website): language-specific pages not properly
 determined

---
 apps/website/src/i18n.spec.ts | 1 +
 apps/website/src/i18n.ts      | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/website/src/i18n.spec.ts b/apps/website/src/i18n.spec.ts
index eab06ba5a..fcc8d790a 100644
--- a/apps/website/src/i18n.spec.ts
+++ b/apps/website/src/i18n.spec.ts
@@ -19,6 +19,7 @@ describe("swapLocale", () => {
         expect(swapLocaleInUrl("/ro/get-started", "ro")).toStrictEqual("/ro/get-started");
         expect(swapLocaleInUrl("/en/get-started", "ro")).toStrictEqual("/ro/get-started");
         expect(swapLocaleInUrl("/ro/", "en")).toStrictEqual("/en/");
+        expect(swapLocaleInUrl("/ro", "en")).toStrictEqual("/en");
     });
 });
 
diff --git a/apps/website/src/i18n.ts b/apps/website/src/i18n.ts
index 435245217..10608e571 100644
--- a/apps/website/src/i18n.ts
+++ b/apps/website/src/i18n.ts
@@ -35,7 +35,13 @@ export function mapLocale(locale: string) {
 export function swapLocaleInUrl(url: string, newLocale: string) {
     const components = url.split("/");
     if (components.length === 2) {
-        return `/${newLocale}${url}`;
+        const potentialLocale = components[1];
+        const correspondingLocale = LOCALES.find(l => l.id === potentialLocale);
+        if (correspondingLocale) {
+            return `/${newLocale}`;
+        } else {
+            return `/${newLocale}${url}`;
+        }
     } else {
         components[1] = newLocale;
         return components.join("/");

From dbfa94a9ee45a7fef43cd97c90df35f85d7bad34 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 16:35:26 +0200
Subject: [PATCH 03/10] fix(website): missing suspense

---
 apps/website/src/components/Header.tsx |  5 +++-
 apps/website/src/index.tsx             | 37 ++++++++++++++------------
 apps/website/src/pages/Home/index.tsx  |  5 +++-
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/apps/website/src/components/Header.tsx b/apps/website/src/components/Header.tsx
index 352e52fba..ce28ffd49 100644
--- a/apps/website/src/components/Header.tsx
+++ b/apps/website/src/components/Header.tsx
@@ -11,6 +11,7 @@ import menuIcon from "../assets/boxicons/bx-menu.svg?raw";
 import { LocaleContext } from "..";
 import { useTranslation } from "react-i18next";
 import { swapLocaleInUrl } from "../i18n";
+import { Suspense } from "preact/compat";
 
 interface HeaderLink {
     url: string;
@@ -78,7 +79,9 @@ export function Header(props: {repoStargazersCount: number}) {
                     />
                 </div>
 
-                <DownloadButton />
+                <Suspense fallback={<div class="loading-screen">Loading...</div>}>
+                    <DownloadButton />
+                </Suspense>
 
             </div>
 		</header>
diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 92455792a..1aafe8367 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -13,30 +13,33 @@ import { default as i18next, changeLanguage } from 'i18next';
 import { extractLocaleFromUrl, LOCALES, mapLocale } from './i18n';
 import HttpApi from 'i18next-http-backend';
 import { initReactI18next } from "react-i18next";
+import { Suspense } from 'preact/compat';
 
 export const LocaleContext = createContext('en');
 
 export function App(props: {repoStargazersCount: number}) {
 	return (
-		<LocationProvider>
-            <LocaleProvider>
-                <Header repoStargazersCount={props.repoStargazersCount} />
-                <main>
-                    <Router>
-                        <Route path="/" component={Home} />
-                        <Route path="/get-started" component={GetStarted} />
-                        <Route path="/support-us" component={SupportUs} />
+        <LocationProvider>
+                <LocaleProvider>
+                    <Suspense fallback={<div class="loading-screen">Loading...</div>}>
+                        <Header repoStargazersCount={props.repoStargazersCount} />
+                        <main>
+                            <Router>
+                                <Route path="/" component={Home} />
+                                <Route path="/get-started" component={GetStarted} />
+                                <Route path="/support-us" component={SupportUs} />
 
-                        <Route path="/:locale:/" component={Home} />
-                        <Route path="/:locale:/get-started" component={GetStarted} />
-                        <Route path="/:locale:/support-us" component={SupportUs} />
+                                <Route path="/:locale:/" component={Home} />
+                                <Route path="/:locale:/get-started" component={GetStarted} />
+                                <Route path="/:locale:/support-us" component={SupportUs} />
 
-                        <Route default component={NotFound} />
-                    </Router>
-                </main>
-                <Footer />
-            </LocaleProvider>
-		</LocationProvider>
+                                <Route default component={NotFound} />
+                            </Router>
+                        </main>
+                        <Footer />
+                    </Suspense>
+                </LocaleProvider>
+            </LocationProvider>
 	);
 }
 
diff --git a/apps/website/src/pages/Home/index.tsx b/apps/website/src/pages/Home/index.tsx
index b26d43621..02b97bbdc 100644
--- a/apps/website/src/pages/Home/index.tsx
+++ b/apps/website/src/pages/Home/index.tsx
@@ -33,6 +33,7 @@ import presentationIcon from "../../assets/boxicons/bx-slideshow.svg?raw";
 import { getPlatform } from '../../download-helper.js';
 import { useEffect, useState } from 'preact/hooks';
 import { Trans, useTranslation } from 'react-i18next';
+import { Suspense } from 'preact/compat';
 
 export function Home() {
     usePageTitle("");
@@ -79,7 +80,9 @@ function HeroSection() {
                 <p>{t("hero_section.subtitle")}</p>
 
                 <div className="download-wrapper">
-                    <DownloadButton big />
+                    <Suspense fallback={<div class="loading-screen">Loading...</div>}>
+                        <DownloadButton big />
+                    </Suspense>
                     <Button href="./get-started/" className="mobile-only" text={t("hero_section.get_started")} />
                     <div className="additional-options">
                         <Button iconSvg={gitHubIcon} outline text={t("hero_section.github")} href="https://github.com/TriliumNext/Trilium/" openExternally />

From d5ce01a65ba108f28933f557f4d55f241b7b0590 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 16:45:52 +0200
Subject: [PATCH 04/10] Revert "fix(website): missing suspense"

This reverts commit dbfa94a9ee45a7fef43cd97c90df35f85d7bad34.
---
 apps/website/src/components/Header.tsx |  5 +---
 apps/website/src/index.tsx             | 37 ++++++++++++--------------
 apps/website/src/pages/Home/index.tsx  |  5 +---
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/apps/website/src/components/Header.tsx b/apps/website/src/components/Header.tsx
index ce28ffd49..352e52fba 100644
--- a/apps/website/src/components/Header.tsx
+++ b/apps/website/src/components/Header.tsx
@@ -11,7 +11,6 @@ import menuIcon from "../assets/boxicons/bx-menu.svg?raw";
 import { LocaleContext } from "..";
 import { useTranslation } from "react-i18next";
 import { swapLocaleInUrl } from "../i18n";
-import { Suspense } from "preact/compat";
 
 interface HeaderLink {
     url: string;
@@ -79,9 +78,7 @@ export function Header(props: {repoStargazersCount: number}) {
                     />
                 </div>
 
-                <Suspense fallback={<div class="loading-screen">Loading...</div>}>
-                    <DownloadButton />
-                </Suspense>
+                <DownloadButton />
 
             </div>
 		</header>
diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 1aafe8367..92455792a 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -13,33 +13,30 @@ import { default as i18next, changeLanguage } from 'i18next';
 import { extractLocaleFromUrl, LOCALES, mapLocale } from './i18n';
 import HttpApi from 'i18next-http-backend';
 import { initReactI18next } from "react-i18next";
-import { Suspense } from 'preact/compat';
 
 export const LocaleContext = createContext('en');
 
 export function App(props: {repoStargazersCount: number}) {
 	return (
-        <LocationProvider>
-                <LocaleProvider>
-                    <Suspense fallback={<div class="loading-screen">Loading...</div>}>
-                        <Header repoStargazersCount={props.repoStargazersCount} />
-                        <main>
-                            <Router>
-                                <Route path="/" component={Home} />
-                                <Route path="/get-started" component={GetStarted} />
-                                <Route path="/support-us" component={SupportUs} />
+		<LocationProvider>
+            <LocaleProvider>
+                <Header repoStargazersCount={props.repoStargazersCount} />
+                <main>
+                    <Router>
+                        <Route path="/" component={Home} />
+                        <Route path="/get-started" component={GetStarted} />
+                        <Route path="/support-us" component={SupportUs} />
 
-                                <Route path="/:locale:/" component={Home} />
-                                <Route path="/:locale:/get-started" component={GetStarted} />
-                                <Route path="/:locale:/support-us" component={SupportUs} />
+                        <Route path="/:locale:/" component={Home} />
+                        <Route path="/:locale:/get-started" component={GetStarted} />
+                        <Route path="/:locale:/support-us" component={SupportUs} />
 
-                                <Route default component={NotFound} />
-                            </Router>
-                        </main>
-                        <Footer />
-                    </Suspense>
-                </LocaleProvider>
-            </LocationProvider>
+                        <Route default component={NotFound} />
+                    </Router>
+                </main>
+                <Footer />
+            </LocaleProvider>
+		</LocationProvider>
 	);
 }
 
diff --git a/apps/website/src/pages/Home/index.tsx b/apps/website/src/pages/Home/index.tsx
index 02b97bbdc..b26d43621 100644
--- a/apps/website/src/pages/Home/index.tsx
+++ b/apps/website/src/pages/Home/index.tsx
@@ -33,7 +33,6 @@ import presentationIcon from "../../assets/boxicons/bx-slideshow.svg?raw";
 import { getPlatform } from '../../download-helper.js';
 import { useEffect, useState } from 'preact/hooks';
 import { Trans, useTranslation } from 'react-i18next';
-import { Suspense } from 'preact/compat';
 
 export function Home() {
     usePageTitle("");
@@ -80,9 +79,7 @@ function HeroSection() {
                 <p>{t("hero_section.subtitle")}</p>
 
                 <div className="download-wrapper">
-                    <Suspense fallback={<div class="loading-screen">Loading...</div>}>
-                        <DownloadButton big />
-                    </Suspense>
+                    <DownloadButton big />
                     <Button href="./get-started/" className="mobile-only" text={t("hero_section.get_started")} />
                     <div className="additional-options">
                         <Button iconSvg={gitHubIcon} outline text={t("hero_section.github")} href="https://github.com/TriliumNext/Trilium/" openExternally />

From b069fab82f20d1562d4f1122043656d2c765f7f9 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 17:17:37 +0200
Subject: [PATCH 05/10] chore(website): use static loading of translations

---
 apps/website/src/i18n.ts                      | 29 +++++++++++++++++
 apps/website/src/index.tsx                    | 31 +++++++------------
 .../translations/ar/translation.json          |  0
 .../translations/ca/translation.json          |  0
 .../translations/cs/translation.json          |  0
 .../translations/de/translation.json          |  0
 .../translations/el/translation.json          |  0
 .../translations/en/translation.json          |  0
 .../translations/es/translation.json          |  0
 .../translations/fa/translation.json          |  0
 .../translations/fi/translation.json          |  0
 .../translations/fr/translation.json          |  0
 .../translations/hr/translation.json          |  0
 .../translations/hu/translation.json          |  0
 .../translations/id/translation.json          |  0
 .../translations/it/translation.json          |  0
 .../translations/ja/translation.json          |  0
 .../translations/ko/translation.json          |  0
 .../translations/md/translation.json          |  0
 .../translations/nb-NO/translation.json       |  0
 .../translations/nl/translation.json          |  0
 .../translations/pl/translation.json          |  0
 .../translations/pt-BR/translation.json       |  0
 .../translations/pt/translation.json          |  0
 .../translations/ro/translation.json          |  0
 .../translations/ru/translation.json          |  0
 .../translations/sl/translation.json          |  0
 .../translations/sr/translation.json          |  0
 .../translations/sv/translation.json          |  0
 .../translations/tr/translation.json          |  0
 .../translations/uk/translation.json          |  0
 .../translations/vi/translation.json          |  0
 .../translations/zh-Hans/translation.json     |  0
 .../translations/zh-Hant/translation.json     |  0
 34 files changed, 40 insertions(+), 20 deletions(-)
 rename apps/website/{public => src}/translations/ar/translation.json (100%)
 rename apps/website/{public => src}/translations/ca/translation.json (100%)
 rename apps/website/{public => src}/translations/cs/translation.json (100%)
 rename apps/website/{public => src}/translations/de/translation.json (100%)
 rename apps/website/{public => src}/translations/el/translation.json (100%)
 rename apps/website/{public => src}/translations/en/translation.json (100%)
 rename apps/website/{public => src}/translations/es/translation.json (100%)
 rename apps/website/{public => src}/translations/fa/translation.json (100%)
 rename apps/website/{public => src}/translations/fi/translation.json (100%)
 rename apps/website/{public => src}/translations/fr/translation.json (100%)
 rename apps/website/{public => src}/translations/hr/translation.json (100%)
 rename apps/website/{public => src}/translations/hu/translation.json (100%)
 rename apps/website/{public => src}/translations/id/translation.json (100%)
 rename apps/website/{public => src}/translations/it/translation.json (100%)
 rename apps/website/{public => src}/translations/ja/translation.json (100%)
 rename apps/website/{public => src}/translations/ko/translation.json (100%)
 rename apps/website/{public => src}/translations/md/translation.json (100%)
 rename apps/website/{public => src}/translations/nb-NO/translation.json (100%)
 rename apps/website/{public => src}/translations/nl/translation.json (100%)
 rename apps/website/{public => src}/translations/pl/translation.json (100%)
 rename apps/website/{public => src}/translations/pt-BR/translation.json (100%)
 rename apps/website/{public => src}/translations/pt/translation.json (100%)
 rename apps/website/{public => src}/translations/ro/translation.json (100%)
 rename apps/website/{public => src}/translations/ru/translation.json (100%)
 rename apps/website/{public => src}/translations/sl/translation.json (100%)
 rename apps/website/{public => src}/translations/sr/translation.json (100%)
 rename apps/website/{public => src}/translations/sv/translation.json (100%)
 rename apps/website/{public => src}/translations/tr/translation.json (100%)
 rename apps/website/{public => src}/translations/uk/translation.json (100%)
 rename apps/website/{public => src}/translations/vi/translation.json (100%)
 rename apps/website/{public => src}/translations/zh-Hans/translation.json (100%)
 rename apps/website/{public => src}/translations/zh-Hant/translation.json (100%)

diff --git a/apps/website/src/i18n.ts b/apps/website/src/i18n.ts
index 10608e571..6f0ae9fbf 100644
--- a/apps/website/src/i18n.ts
+++ b/apps/website/src/i18n.ts
@@ -1,9 +1,38 @@
+import i18next from "i18next";
+import { initReactI18next } from "react-i18next";
+
 interface Locale {
     id: string;
     name: string;
     rtl?: boolean;
 }
 
+i18next.use(initReactI18next);
+const localeFiles = import.meta.glob("./translations/*/translation.json", { eager: true });
+const resources: Record<string, Record<string, string>> = {};
+for (const [ path, translations ] of Object.entries(localeFiles)) {
+    const id = path.split("/").at(-2);
+    if (!resources[id]) resources[id] = {};
+    if ("default" in (translations as any)) {
+        resources[id].translation = (translations as any).default;
+    } else {
+        resources[id].translation = translations;
+    }
+}
+
+export function initTranslations(lng: string) {
+    i18next.init({
+        fallbackLng: "en",
+        lng,
+        returnEmptyString: false,
+        resources,
+        initAsync: false,
+        react: {
+            useSuspense: false
+        }
+    });
+}
+
 export const LOCALES: Locale[] = [
     { id: "en", name: "English" },
     { id: "ro", name: "Română" },
diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 92455792a..78dcb6556 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -8,9 +8,9 @@ import Footer from './components/Footer.js';
 import GetStarted from './pages/GetStarted/get-started.js';
 import SupportUs from './pages/SupportUs/SupportUs.js';
 import { createContext } from 'preact';
-import { useLayoutEffect, useState } from 'preact/hooks';
+import { useLayoutEffect, useRef, useState } from 'preact/hooks';
 import { default as i18next, changeLanguage } from 'i18next';
-import { extractLocaleFromUrl, LOCALES, mapLocale } from './i18n';
+import { extractLocaleFromUrl, initTranslations, LOCALES, mapLocale } from './i18n';
 import HttpApi from 'i18next-http-backend';
 import { initReactI18next } from "react-i18next";
 
@@ -43,29 +43,20 @@ export function App(props: {repoStargazersCount: number}) {
 export function LocaleProvider({ children }) {
   const { path } = useLocation();
   const localeId = mapLocale(extractLocaleFromUrl(path) || navigator.language);
-  const [ loaded, setLoaded ] = useState(false);
+  const loadedRef = useRef(false);
 
-  useLayoutEffect(() => {
-      i18next
-        .use(HttpApi)
-        .use(initReactI18next);
-      i18next.init({
-        lng: localeId,
-        fallbackLng: "en",
-        backend: {
-            loadPath: "/translations/{{lng}}/{{ns}}.json",
-        },
-        returnEmptyString: false
-    }).then(() => setLoaded(true))
-}, []);
-
-  useLayoutEffect(() => {
-    if (!loaded) return;
+  if (!loadedRef.current) {
+    initTranslations(localeId);
+    loadedRef.current = true;
+  } else {
     changeLanguage(localeId);
+  }
+
+  useLayoutEffect(() => {
     const correspondingLocale = LOCALES.find(l => l.id === localeId);
     document.documentElement.lang = localeId;
     document.documentElement.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
-  }, [ loaded, localeId ]);
+  }, [ localeId ]);
 
   return (
     <LocaleContext.Provider value={localeId}>
diff --git a/apps/website/public/translations/ar/translation.json b/apps/website/src/translations/ar/translation.json
similarity index 100%
rename from apps/website/public/translations/ar/translation.json
rename to apps/website/src/translations/ar/translation.json
diff --git a/apps/website/public/translations/ca/translation.json b/apps/website/src/translations/ca/translation.json
similarity index 100%
rename from apps/website/public/translations/ca/translation.json
rename to apps/website/src/translations/ca/translation.json
diff --git a/apps/website/public/translations/cs/translation.json b/apps/website/src/translations/cs/translation.json
similarity index 100%
rename from apps/website/public/translations/cs/translation.json
rename to apps/website/src/translations/cs/translation.json
diff --git a/apps/website/public/translations/de/translation.json b/apps/website/src/translations/de/translation.json
similarity index 100%
rename from apps/website/public/translations/de/translation.json
rename to apps/website/src/translations/de/translation.json
diff --git a/apps/website/public/translations/el/translation.json b/apps/website/src/translations/el/translation.json
similarity index 100%
rename from apps/website/public/translations/el/translation.json
rename to apps/website/src/translations/el/translation.json
diff --git a/apps/website/public/translations/en/translation.json b/apps/website/src/translations/en/translation.json
similarity index 100%
rename from apps/website/public/translations/en/translation.json
rename to apps/website/src/translations/en/translation.json
diff --git a/apps/website/public/translations/es/translation.json b/apps/website/src/translations/es/translation.json
similarity index 100%
rename from apps/website/public/translations/es/translation.json
rename to apps/website/src/translations/es/translation.json
diff --git a/apps/website/public/translations/fa/translation.json b/apps/website/src/translations/fa/translation.json
similarity index 100%
rename from apps/website/public/translations/fa/translation.json
rename to apps/website/src/translations/fa/translation.json
diff --git a/apps/website/public/translations/fi/translation.json b/apps/website/src/translations/fi/translation.json
similarity index 100%
rename from apps/website/public/translations/fi/translation.json
rename to apps/website/src/translations/fi/translation.json
diff --git a/apps/website/public/translations/fr/translation.json b/apps/website/src/translations/fr/translation.json
similarity index 100%
rename from apps/website/public/translations/fr/translation.json
rename to apps/website/src/translations/fr/translation.json
diff --git a/apps/website/public/translations/hr/translation.json b/apps/website/src/translations/hr/translation.json
similarity index 100%
rename from apps/website/public/translations/hr/translation.json
rename to apps/website/src/translations/hr/translation.json
diff --git a/apps/website/public/translations/hu/translation.json b/apps/website/src/translations/hu/translation.json
similarity index 100%
rename from apps/website/public/translations/hu/translation.json
rename to apps/website/src/translations/hu/translation.json
diff --git a/apps/website/public/translations/id/translation.json b/apps/website/src/translations/id/translation.json
similarity index 100%
rename from apps/website/public/translations/id/translation.json
rename to apps/website/src/translations/id/translation.json
diff --git a/apps/website/public/translations/it/translation.json b/apps/website/src/translations/it/translation.json
similarity index 100%
rename from apps/website/public/translations/it/translation.json
rename to apps/website/src/translations/it/translation.json
diff --git a/apps/website/public/translations/ja/translation.json b/apps/website/src/translations/ja/translation.json
similarity index 100%
rename from apps/website/public/translations/ja/translation.json
rename to apps/website/src/translations/ja/translation.json
diff --git a/apps/website/public/translations/ko/translation.json b/apps/website/src/translations/ko/translation.json
similarity index 100%
rename from apps/website/public/translations/ko/translation.json
rename to apps/website/src/translations/ko/translation.json
diff --git a/apps/website/public/translations/md/translation.json b/apps/website/src/translations/md/translation.json
similarity index 100%
rename from apps/website/public/translations/md/translation.json
rename to apps/website/src/translations/md/translation.json
diff --git a/apps/website/public/translations/nb-NO/translation.json b/apps/website/src/translations/nb-NO/translation.json
similarity index 100%
rename from apps/website/public/translations/nb-NO/translation.json
rename to apps/website/src/translations/nb-NO/translation.json
diff --git a/apps/website/public/translations/nl/translation.json b/apps/website/src/translations/nl/translation.json
similarity index 100%
rename from apps/website/public/translations/nl/translation.json
rename to apps/website/src/translations/nl/translation.json
diff --git a/apps/website/public/translations/pl/translation.json b/apps/website/src/translations/pl/translation.json
similarity index 100%
rename from apps/website/public/translations/pl/translation.json
rename to apps/website/src/translations/pl/translation.json
diff --git a/apps/website/public/translations/pt-BR/translation.json b/apps/website/src/translations/pt-BR/translation.json
similarity index 100%
rename from apps/website/public/translations/pt-BR/translation.json
rename to apps/website/src/translations/pt-BR/translation.json
diff --git a/apps/website/public/translations/pt/translation.json b/apps/website/src/translations/pt/translation.json
similarity index 100%
rename from apps/website/public/translations/pt/translation.json
rename to apps/website/src/translations/pt/translation.json
diff --git a/apps/website/public/translations/ro/translation.json b/apps/website/src/translations/ro/translation.json
similarity index 100%
rename from apps/website/public/translations/ro/translation.json
rename to apps/website/src/translations/ro/translation.json
diff --git a/apps/website/public/translations/ru/translation.json b/apps/website/src/translations/ru/translation.json
similarity index 100%
rename from apps/website/public/translations/ru/translation.json
rename to apps/website/src/translations/ru/translation.json
diff --git a/apps/website/public/translations/sl/translation.json b/apps/website/src/translations/sl/translation.json
similarity index 100%
rename from apps/website/public/translations/sl/translation.json
rename to apps/website/src/translations/sl/translation.json
diff --git a/apps/website/public/translations/sr/translation.json b/apps/website/src/translations/sr/translation.json
similarity index 100%
rename from apps/website/public/translations/sr/translation.json
rename to apps/website/src/translations/sr/translation.json
diff --git a/apps/website/public/translations/sv/translation.json b/apps/website/src/translations/sv/translation.json
similarity index 100%
rename from apps/website/public/translations/sv/translation.json
rename to apps/website/src/translations/sv/translation.json
diff --git a/apps/website/public/translations/tr/translation.json b/apps/website/src/translations/tr/translation.json
similarity index 100%
rename from apps/website/public/translations/tr/translation.json
rename to apps/website/src/translations/tr/translation.json
diff --git a/apps/website/public/translations/uk/translation.json b/apps/website/src/translations/uk/translation.json
similarity index 100%
rename from apps/website/public/translations/uk/translation.json
rename to apps/website/src/translations/uk/translation.json
diff --git a/apps/website/public/translations/vi/translation.json b/apps/website/src/translations/vi/translation.json
similarity index 100%
rename from apps/website/public/translations/vi/translation.json
rename to apps/website/src/translations/vi/translation.json
diff --git a/apps/website/public/translations/zh-Hans/translation.json b/apps/website/src/translations/zh-Hans/translation.json
similarity index 100%
rename from apps/website/public/translations/zh-Hans/translation.json
rename to apps/website/src/translations/zh-Hans/translation.json
diff --git a/apps/website/public/translations/zh-Hant/translation.json b/apps/website/src/translations/zh-Hant/translation.json
similarity index 100%
rename from apps/website/public/translations/zh-Hant/translation.json
rename to apps/website/src/translations/zh-Hant/translation.json

From ee9bf1d47b45b96ed00b5f809ac528934ee36d33 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 18:04:49 +0200
Subject: [PATCH 06/10] fix(website): incorrect lang tag

---
 apps/website/index.html    |  2 +-
 apps/website/src/index.tsx | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/website/index.html b/apps/website/index.html
index 798ca14f9..55cb4fa6a 100644
--- a/apps/website/index.html
+++ b/apps/website/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 	<head>
 		<meta charset="UTF-8" />
 		<link rel="icon" type="image/svg+xml" href="/src/assets/favicon.ico" />
diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 78dcb6556..3858165fd 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -52,12 +52,6 @@ export function LocaleProvider({ children }) {
     changeLanguage(localeId);
   }
 
-  useLayoutEffect(() => {
-    const correspondingLocale = LOCALES.find(l => l.id === localeId);
-    document.documentElement.lang = localeId;
-    document.documentElement.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
-  }, [ localeId ]);
-
   return (
     <LocaleContext.Provider value={localeId}>
       {children}
@@ -75,6 +69,14 @@ export async function prerender(data) {
 	// This ensures the GitHub API is not called on every page load in the client.
 	const stargazersCount = await getRepoStargazersCount();
 
-	return await ssr(<App repoStargazersCount={stargazersCount} {...data} />);
+	const { html, links } = await ssr(<App repoStargazersCount={stargazersCount} {...data} />);
+    const lang = extractLocaleFromUrl(data.url);
+    return {
+        html,
+        links,
+        head: {
+            lang
+        }
+    }
 }
 

From f24880d42c5534454f54abdacae3131e40e407e5 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 18:10:21 +0200
Subject: [PATCH 07/10] fix(website): incorrect default language

---
 apps/website/src/index.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 3858165fd..242b1159a 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -8,11 +8,9 @@ import Footer from './components/Footer.js';
 import GetStarted from './pages/GetStarted/get-started.js';
 import SupportUs from './pages/SupportUs/SupportUs.js';
 import { createContext } from 'preact';
-import { useLayoutEffect, useRef, useState } from 'preact/hooks';
-import { default as i18next, changeLanguage } from 'i18next';
+import { useRef } from 'preact/hooks';
+import { changeLanguage } from 'i18next';
 import { extractLocaleFromUrl, initTranslations, LOCALES, mapLocale } from './i18n';
-import HttpApi from 'i18next-http-backend';
-import { initReactI18next } from "react-i18next";
 
 export const LocaleContext = createContext('en');
 
@@ -42,7 +40,7 @@ export function App(props: {repoStargazersCount: number}) {
 
 export function LocaleProvider({ children }) {
   const { path } = useLocation();
-  const localeId = mapLocale(extractLocaleFromUrl(path) || navigator.language);
+  const localeId = getLocaleId(path);
   const loadedRef = useRef(false);
 
   if (!loadedRef.current) {
@@ -63,6 +61,13 @@ if (typeof window !== 'undefined') {
 	hydrate(<App repoStargazersCount={FALLBACK_STARGAZERS_COUNT} />, document.getElementById('app')!);
 }
 
+function getLocaleId(path: string) {
+    const extractedLocale = extractLocaleFromUrl(path);
+    if (extractedLocale) return mapLocale(extractedLocale);
+    if (typeof window === "undefined") return 'en';
+    return mapLocale(navigator.language);
+}
+
 export async function prerender(data) {
 	// Fetch the stargazer count of the Trilium's GitHub repo on prerender to pass
 	// it to the App component for SSR.
@@ -70,12 +75,11 @@ export async function prerender(data) {
 	const stargazersCount = await getRepoStargazersCount();
 
 	const { html, links } = await ssr(<App repoStargazersCount={stargazersCount} {...data} />);
-    const lang = extractLocaleFromUrl(data.url);
     return {
         html,
         links,
         head: {
-            lang
+            lang: extractLocaleFromUrl(data.url) ?? "en"
         }
     }
 }

From 4f72f81a958a54f465bb373579d91720231fc5ed Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 18:19:35 +0200
Subject: [PATCH 08/10] chore(website): fix typecheck issues

---
 apps/website/src/i18n.ts   | 10 ++++++----
 apps/website/tsconfig.json |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/website/src/i18n.ts b/apps/website/src/i18n.ts
index 6f0ae9fbf..5b99f961b 100644
--- a/apps/website/src/i18n.ts
+++ b/apps/website/src/i18n.ts
@@ -9,12 +9,14 @@ interface Locale {
 
 i18next.use(initReactI18next);
 const localeFiles = import.meta.glob("./translations/*/translation.json", { eager: true });
-const resources: Record<string, Record<string, string>> = {};
-for (const [ path, translations ] of Object.entries(localeFiles)) {
+const resources: Record<string, Record<string, Record<string, string>>> = {};
+for (const [ path, _translations ] of Object.entries(localeFiles)) {
     const id = path.split("/").at(-2);
+    if (!id) continue;
     if (!resources[id]) resources[id] = {};
-    if ("default" in (translations as any)) {
-        resources[id].translation = (translations as any).default;
+    const translations = _translations as { default: Record<string, string> } | Record<string, string>;
+    if ("default" in translations) {
+        resources[id].translation = translations.default as Record<string, string>;
     } else {
         resources[id].translation = translations;
     }
diff --git a/apps/website/tsconfig.json b/apps/website/tsconfig.json
index 48581e18c..4d67635d7 100644
--- a/apps/website/tsconfig.json
+++ b/apps/website/tsconfig.json
@@ -9,6 +9,9 @@
 		"jsx": "react-jsx",
 		"jsxImportSource": "preact",
 		"skipLibCheck": true,
+		"types": [
+			"vite/client"
+		],
 		"paths": {
 			"react": ["../../node_modules/preact/compat/"],
 			"react-dom": ["../../node_modules/preact/compat/"]

From 6bde2641565ae29b0fc7025c1035371419ff152d Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 18:31:03 +0200
Subject: [PATCH 09/10] fix(website): lang/dir not updating after switching
 language

---
 apps/website/src/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 242b1159a..5bef0fad2 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -8,7 +8,7 @@ import Footer from './components/Footer.js';
 import GetStarted from './pages/GetStarted/get-started.js';
 import SupportUs from './pages/SupportUs/SupportUs.js';
 import { createContext } from 'preact';
-import { useRef } from 'preact/hooks';
+import { useLayoutEffect, useRef } from 'preact/hooks';
 import { changeLanguage } from 'i18next';
 import { extractLocaleFromUrl, initTranslations, LOCALES, mapLocale } from './i18n';
 
@@ -50,6 +50,13 @@ export function LocaleProvider({ children }) {
     changeLanguage(localeId);
   }
 
+  // Update html lang and dir attributes
+  useLayoutEffect(() => {
+    const correspondingLocale = LOCALES.find(l => l.id === localeId);
+    document.documentElement.lang = localeId;
+    document.documentElement.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
+  }, [localeId]);
+
   return (
     <LocaleContext.Provider value={localeId}>
       {children}

From c4f57f3d1522a5b2b21941a794edb3de90894680 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 27 Oct 2025 18:34:26 +0200
Subject: [PATCH 10/10] refactor(website): simplify loop

---
 apps/website/src/i18n.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/website/src/i18n.ts b/apps/website/src/i18n.ts
index 5b99f961b..93931d936 100644
--- a/apps/website/src/i18n.ts
+++ b/apps/website/src/i18n.ts
@@ -10,16 +10,12 @@ interface Locale {
 i18next.use(initReactI18next);
 const localeFiles = import.meta.glob("./translations/*/translation.json", { eager: true });
 const resources: Record<string, Record<string, Record<string, string>>> = {};
-for (const [ path, _translations ] of Object.entries(localeFiles)) {
+for (const [path, module] of Object.entries(localeFiles)) {
     const id = path.split("/").at(-2);
     if (!id) continue;
-    if (!resources[id]) resources[id] = {};
-    const translations = _translations as { default: Record<string, string> } | Record<string, string>;
-    if ("default" in translations) {
-        resources[id].translation = translations.default as Record<string, string>;
-    } else {
-        resources[id].translation = translations;
-    }
+
+    const translations = (module as any).default ?? module;
+    resources[id] = { translation: translations };
 }
 
 export function initTranslations(lng: string) {