Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Paraglide-Next: Fix paths segments that start with language tags being edited #3006

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Paraglide-Next: Fix paths segments that start with language tags being edited #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c17ae5a
Fix path replacement
LorisSigrist Jul 3, 2024
7dfecf1
Add changeset
LorisSigrist Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/plenty-roses-grab.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@inlang/paraglide-next": patch
---

fix issue where path-segments that start with a language tag confused the router.

Eg: `/entropy` would match the language `en` & be resolved to `/tropy`
4 changes: 4 additions & 0 deletions ...urce-code/paraglide/paraglide-next/src/app/routing-strategy/strats/prefixStrategy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ describe("getCanonicalPath", () => {
expect(getCanonicalPath("/en/translated/1", "en")).toBe("/canonical-translated/1")
expect(getCanonicalPath("/de-CH/uebersetzt/1", "de-CH")).toBe("/canonical-translated/1")
})

it("does not get confused by a path that starts with a language tag", () => {
expect(getCanonicalPath("/de-something-else", "de")).toBe("/de-something-else")
})
})

describe("getLocalisedPath", () => {
Expand Down
11 changes: 8 additions & 3 deletions ...ng/source-code/paraglide/paraglide-next/src/app/routing-strategy/strats/prefixStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@ export function PrefixStrategy<T extends string>({
// get the prefix for this language
const prefix = resolvedPrefixes[locale] ?? locale

const pathWithoutLocale: `/${string}` = localisedPath.startsWith(`/${prefix}`)
? ((localisedPath.replace(`/${prefix}`, "") || "/") as `/${string}`)
const pathWithoutLocale: `/${string}` = localisedPath.startsWith(`/${prefix}/`)
? (localisedPath.replace(`/${prefix}`, "") as `/${string}`)
: localisedPath === `/${prefix}`
? "/"
: localisedPath

for (const [canonicalPathDefinition, translationsForPath] of Object.entries(
Expand Down Expand Up @@ -166,7 +168,10 @@ export function PrefixStrategy<T extends string>({
const pathWithoutBase = request.nextUrl.pathname

const entries = Object.entries(resolvedPrefixes) as [T, string][]
const entry = entries.find(([, prefix]) => pathWithoutBase.startsWith(`/${prefix}`))
const entry = entries.find(
([, prefix]) =>
pathWithoutBase.startsWith(`/${prefix}/`) || pathWithoutBase === `/${prefix}`
)
const detected = entry?.[0]

// If no prefix is detected and prefixDefault is "never" -> use default language
Expand Down
Loading