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

fix(website): language-specific pages not properly determined

Browse Source
This commit is contained in:
Elian Doran 2025-10-27 16:30:03 +02:00
parent c4c8fe23a9
commit 86aaa97809
No known key found for this signature in database
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/website/src/i18n.spec.ts
View File

@ -19,6 +19,7 @@ describe("swapLocale", () => {
expect(swapLocaleInUrl("/ro/get-started", "ro")).toStrictEqual("/ro/get-started"); expect(swapLocaleInUrl("/ro/get-started", "ro")).toStrictEqual("/ro/get-started");
expect(swapLocaleInUrl("/en/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/");
expect(swapLocaleInUrl("/ro", "en")).toStrictEqual("/en");
}); });
}); });

8
apps/website/src/i18n.ts
View File

@ -35,7 +35,13 @@ export function mapLocale(locale: string) {
export function swapLocaleInUrl(url: string, newLocale: string) { export function swapLocaleInUrl(url: string, newLocale: string) {
const components = url.split("/"); const components = url.split("/");
if (components.length === 2) { 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 { } else {
components[1] = newLocale; components[1] = newLocale;
return components.join("/"); return components.join("/");