bugfix(website): fix build issues

socialincome-san · Nov 17, 2023 · 7d25e10 · 7d25e10
1 parent 86e3821
commit 7d25e10
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/website/src/app/[lang]/[region]/(website)/layout.tsx b/website/src/app/[lang]/[region]/(website)/layout.tsx
@@ -1,11 +1,11 @@
 import { DefaultLayoutProps } from '@/app/[lang]/[region]';
 import Footer from '@/components/footer/footer';
 import Navbar from '@/components/navbar/navbar';
-import { websiteLanguages, websiteRegions } from '@/i18n';
+import { mainWebsiteLanguages, websiteRegions } from '@/i18n';
 import { PropsWithChildren } from 'react';
 
 export const generateStaticParams = () =>
-	websiteRegions.flatMap((country) => websiteLanguages.map((lang) => ({ lang, country })));
+	websiteRegions.flatMap((region) => mainWebsiteLanguages.map((lang) => ({ lang, region })));
 
 export default function Layout({ children, params }: PropsWithChildren<DefaultLayoutProps>) {
 	return (

diff --git a/website/src/components/navbar/navbar.tsx b/website/src/components/navbar/navbar.tsx
@@ -1,6 +1,6 @@
 import { DefaultParams } from '@/app/[lang]/[region]';
 import { NavbarClient } from '@/components/navbar/navbar-client';
-import { WebsiteLanguage, websiteCurrencies, websiteRegions } from '@/i18n';
+import { mainWebsiteLanguages, websiteCurrencies, websiteRegions } from '@/i18n';
 import { Translator } from '@socialincome/shared/src/utils/i18n';
 
 type NavbarProps = {
@@ -12,7 +12,6 @@ export default async function Navbar({ lang, region, showNavigation = true }: Na
 		language: lang,
 		namespaces: ['common', 'website-common', 'website-me'],
 	});
-	const supportedLanguages: WebsiteLanguage[] = ['en', 'de'];
 
 	return (
 		<NavbarClient
@@ -28,7 +27,7 @@ export default async function Navbar({ lang, region, showNavigation = true }: Na
 				payments: translator.t('tabs.contributions'),
 				signOut: translator.t('sign-out'),
 			}}
-			languages={supportedLanguages.map((lang) => ({
+			languages={mainWebsiteLanguages.map((lang) => ({
 				code: lang,
 				translation: translator.t(`languages.${lang}`),
 			}))}

diff --git a/website/src/i18n.ts b/website/src/i18n.ts
@@ -7,11 +7,12 @@ import { Currency } from '../../shared/src/types/currency';
 
 export type WebsiteLanguage = Extract<LanguageCode, 'en' | 'de' | 'kri'>;
 export const defaultLanguage: WebsiteLanguage = 'en';
-export const websiteLanguages: WebsiteLanguage[] = ['en', 'de', 'kri'];
+export const mainWebsiteLanguages: WebsiteLanguage[] = ['en', 'de'];
+export const allWebsiteLanguages: WebsiteLanguage[] = ['en', 'de', 'kri'];
 
 export type WebsiteRegion = 'int' | 'ch' | 'sl';
 export const defaultRegion: WebsiteRegion = 'int';
-export const websiteRegions: WebsiteRegion[] = ['int', 'ch', 'sl'];
+export const websiteRegions: WebsiteRegion[] = ['int', 'ch'];
 
 export type WebsiteCurrency = Extract<Currency, 'USD' | 'EUR' | 'CHF' | 'SLE'>;
 export const defaultCurrency: WebsiteCurrency = 'USD';
@@ -35,7 +36,7 @@ export const findBestLocale = (
 	 */
 	if (
 		request.cookies.has(LANGUAGE_COOKIE) &&
-		websiteLanguages.includes(request.cookies.get(LANGUAGE_COOKIE)!.value as WebsiteLanguage) &&
+		mainWebsiteLanguages.includes(request.cookies.get(LANGUAGE_COOKIE)!.value as WebsiteLanguage) &&
 		request.cookies.has(REGION_COOKIE) &&
 		websiteRegions.includes(request.cookies.get(REGION_COOKIE)!.value as WebsiteRegion)
 	) {
@@ -51,7 +52,7 @@ export const findBestLocale = (
 		(option) =>
 			option.code &&
 			option.region &&
-			websiteLanguages.includes(option.code as WebsiteLanguage) &&
+			mainWebsiteLanguages.includes(option.code as WebsiteLanguage) &&
 			websiteRegions.includes(option.region as WebsiteRegion),
 	);
 

diff --git a/website/src/middleware.ts b/website/src/middleware.ts
@@ -1,5 +1,5 @@
 import { CURRENCY_COOKIE } from '@/app/[lang]/[region]';
-import { WebsiteLanguage, WebsiteRegion, findBestLocale, websiteLanguages, websiteRegions } from '@/i18n';
+import { WebsiteLanguage, WebsiteRegion, allWebsiteLanguages, findBestLocale, websiteRegions } from '@/i18n';
 import { NextRequest, NextResponse } from 'next/server';
 import { bestGuessCurrency, isValidCurrency } from '../../shared/src/types/currency';
 
@@ -26,7 +26,7 @@ export const i18nRedirectMiddleware = (request: NextRequest) => {
 	const detectedLanguage = segments.at(1) ?? '';
 	const detectedCountry = segments.at(2) ?? '';
 
-	const pathnameIsMissingLanguage = !websiteLanguages.includes(detectedLanguage as WebsiteLanguage);
+	const pathnameIsMissingLanguage = !allWebsiteLanguages.includes(detectedLanguage as WebsiteLanguage);
 	const pathnameIsMissingCountry = !websiteRegions.includes(detectedCountry as WebsiteRegion);
 
 	if (pathnameIsMissingCountry || pathnameIsMissingLanguage) {