fix: Handle overlapping locale prefixes correctly

amannn · Sep 17, 2024 · dab7dae · dab7dae
1 parent 172e535
commit dab7dae
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/packages/next-intl/src/middleware/utils.test.tsx b/packages/next-intl/src/middleware/utils.test.tsx
@@ -3,6 +3,7 @@ import {
   formatPathnameTemplate,
   getInternalTemplate,
   getNormalizedPathname,
+  getPathnameMatch,
   getRouteParams
 } from './utils';
 
@@ -168,3 +169,22 @@ describe('getInternalTemplate', () => {
     ]);
   });
 });
+
+describe('getPathnameMatch', () => {
+  it('prioritizes more specific prefixes for overlapping locales', () => {
+    expect(
+      getPathnameMatch('/de/at/test', ['de', 'de-at'], {
+        mode: 'always',
+        prefixes: {
+          'de-at': '/de/at',
+          de: '/de'
+        }
+      })
+    ).toEqual({
+      locale: 'de-at',
+      prefix: '/de/at',
+      exact: true,
+      matchedPrefix: '/de/at'
+    });
+  });
+});
diff --git a/packages/next-intl/src/middleware/utils.tsx b/packages/next-intl/src/middleware/utils.tsx
@@ -151,6 +151,9 @@ export function getPathnameMatch<AppLocales extends Locales>(
   | undefined {
   const localePrefixes = getLocalePrefixes(locales, localePrefix);
 
+  // More specific ones first
+  localePrefixes.sort((a, b) => b[1].length - a[1].length);
+
   for (const [locale, prefix] of localePrefixes) {
     let exact, matches;
     if (pathname === prefix || pathname.startsWith(prefix + '/')) {