Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🐛 Fix matcher throwing error (#1634)

Luke Vellaf075c98f6e47
diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.ts
index 890d8f771..73956b331 100644
--- a/apps/web/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts
@@ -19,7 +19,7 @@ const handler = async (req: NextRequest) => {
req,
router: appRouter,
createContext: async () => {
- const locale = await getPreferredLocale(req);
+ const locale = getPreferredLocale(req);
const user = session?.user
? {
id: session.user.id,
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index ec63c06c4..f38702b6a 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -25,7 +25,7 @@ export const middleware = withAuth(async (req) => {
newUrl.pathname = `/${locale}${newUrl.pathname}`;
} else {
// Check if locale is specified in header
- locale = await getPreferredLocale(req);
+ locale = getPreferredLocale(req);
newUrl.pathname = `/${locale}${newUrl.pathname}`;
}
diff --git a/packages/languages/src/get-preferred-locale.ts b/packages/languages/src/get-preferred-locale.ts
index 4f7f652de..66094430a 100644
--- a/packages/languages/src/get-preferred-locale.ts
+++ b/packages/languages/src/get-preferred-locale.ts
@@ -5,13 +5,19 @@ import type { NextRequest } from "next/server";
const locales = Object.keys(languages);
-export async function getPreferredLocale(req: NextRequest) {
+export function getPreferredLocale(req: NextRequest) {
const preferredLanguages = new Negotiator({
headers: {
"accept-language": req.headers.get("accept-language") ?? "",
},
- }).languages();
+ })
+ .languages()
+ .filter((lang) => lang !== "*");
- const locale = match(preferredLanguages, locales, defaultLocale);
- return locale;
+ try {
+ return match(preferredLanguages, locales, defaultLocale);
+ } catch (e) {
+ console.warn("Failed to match locale", e);
+ return defaultLocale;
+ }
}