feat: allow for locale fallbacks when adding locale prefix

orinokai · orinokai · commit b0101923b341 · 2024-07-19T15:24:04.000+01:00
diff --git a/edge-runtime/lib/util.ts b/edge-runtime/lib/util.ts
@@ -29,11 +29,13 @@ export const addBasePath = (path: string, basePath?: string) => {
   return path
 }
 
+// add locale prefix if not present, allowing for locale fallbacks
 export const addLocale = (path: string, locale?: string) => {
   if (
     locale &&
     path.toLowerCase() !== `/${locale.toLowerCase()}` &&
-    !path.toLowerCase().startsWith(`/${locale.toLowerCase()}/`)
+    !path.toLowerCase().startsWith(`/${locale.toLowerCase()}/`) &&
+    !path.toLowerCase().startsWith(`/${locale.toLowerCase()}-`)
   ) {
     return `/${locale}${path}`
   }

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,13 @@ export const addBasePath = (path: string, basePath?: string) => {`
`29`	`29`	`return path`
`30`	`30`	`}`
`31`	`31`
	`32`	`+// add locale prefix if not present, allowing for locale fallbacks`
`32`	`33`	`export const addLocale = (path: string, locale?: string) => {`
`33`	`34`	`if (`
`34`	`35`	`locale &&`
`35`	`36`	path.toLowerCase() !== `/${locale.toLowerCase()}` &&
`36`		- !path.toLowerCase().startsWith(`/${locale.toLowerCase()}/`)
	`37`	+ !path.toLowerCase().startsWith(`/${locale.toLowerCase()}/`) &&
	`38`	+ !path.toLowerCase().startsWith(`/${locale.toLowerCase()}-`)
`37`	`39`	`) {`
`38`	`40`	return `/${locale}${path}`
`39`	`41`	`}`