bugfix(website): fix middleware region redirect (#664)

socialincome-san · Dec 1, 2023 · 8a2d5b9 · 8a2d5b9
1 parent 5cb7eb6
commit 8a2d5b9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/website/src/i18n.ts b/website/src/i18n.ts
@@ -40,7 +40,7 @@ export const findBestLocale = (
 	}
 
 	const options = langParser.parse(request.headers.get('Accept-Language') || 'en');
-	const requestCountry = request.geo?.country;
+	const requestCountry = request.geo?.country?.toLowerCase() as WebsiteRegion | undefined;
 	console.info('Country set in request header:', requestCountry);
 
 	const bestOption = options.find(
@@ -54,7 +54,7 @@ export const findBestLocale = (
 	return {
 		language: (bestOption?.code as WebsiteLanguage) || defaultLanguage,
 		region:
-			(websiteRegions.includes(requestCountry?.toLowerCase() as WebsiteRegion) && (requestCountry as WebsiteRegion)) ||
+			(requestCountry && websiteRegions.includes(requestCountry) && requestCountry) ||
 			(bestOption?.region as WebsiteRegion) ||
 			defaultRegion,
 	};