Merge branch 'main' into ref/enforce-types-imports

QuiiBz · Oct 11, 2023 · 0854f60 · 0854f60
2 parents 082075e + c38b52e
commit 0854f60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/next-international/src/app/middleware/index.ts b/packages/next-international/src/app/middleware/index.ts
@@ -79,7 +79,7 @@ function localeFromRequest<Locales extends readonly string[]>(
 
 const defaultResolveLocaleFromRequest: NonNullable<I18nMiddlewareConfig<any>['resolveLocaleFromRequest']> = request => {
   const header = request.headers.get('Accept-Language');
-  const locale = header?.split(',')?.[0]?.split('-')?.[0];
+  const locale = header?.split(',', 1)?.[0]?.split('-', 1)?.[0];
   return locale ?? null;
 };
 

diff --git a/packages/next-international/src/common/create-t.ts b/packages/next-international/src/common/create-t.ts
@@ -26,7 +26,7 @@ export function createT<Locale extends BaseLocale, Scope extends Scopes<Locale>
   const pluralKeys = new Set(
     Object.keys(content)
       .filter(key => key.includes('#'))
-      .map(key => key.split('#')[0]),
+      .map(key => key.split('#', 1)[0]),
   );
 
   const pluralRules = new Intl.PluralRules(context.locale);
@@ -63,7 +63,7 @@ export function createT<Locale extends BaseLocale, Scope extends Scopes<Locale>
     let value = scope ? content[`${scope}.${key}`] : content[key];
 
     if (!value && isPlural) {
-      const baseKey = key.split('#')[0] as Key;
+      const baseKey = key.split('#', 1)[0] as Key;
       value = (content[`${baseKey}#other`] || key)?.toString();
     } else {
       value = (value || key)?.toString();