3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-04-28 09:46:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix matcher throwing error

Browse source
This commit is contained in:
Luke Vella 2025-03-14 13:30:45 +00:00
parent 5bf579a62f
commit 153062f91c
No known key found for this signature in database
GPG key ID: 469CAD687F0D784C
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/web/src/app/api/trpc/[trpc]/route.ts
View file

@ -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,

2
apps/web/src/middleware.ts
View file

@ -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}`;
}

14
packages/languages/src/get-preferred-locale.ts
View file

@ -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;
}
}