added country names to locales

Author: emilie-chen

app/[lang]/_components/constants.ts

@@ -28,7 +28,7 @@ const chomskyFont = LocalFont(
     },
 );
 
-export type Language = "en" | "fr";
+export type Language = "en-US" | "fr-FR";
 
 export interface LanguageProps {
     language: Language;

app/[lang]/_lib/dictionary.ts

@@ -5,9 +5,9 @@ import getFR from "@/app/[lang]/_lib/dictionaries/fr";
 
 export const getDictionary = (locale: Locale) => {
     switch (locale) {
-        case 'en':
+        case 'en-US':
             return getEN();
-        case 'fr':
+        case 'fr-FR':
             return getFR();
 
         default:

app/[lang]/page.tsx

@@ -10,8 +10,8 @@ export default function Home({
 								 params
 							 }: {	params: { lang: Language }
 							 }) {
-	if (params.lang !== 'en' && params.lang !== 'fr') {
-		params.lang = 'en';
+	if (params.lang !== 'en-US' && params.lang !== 'fr-FR') {
+		params.lang = 'en-US';
 	}
 	return (
 		<div className="flex flex-col gt-lg:justify-center w-screen h-screen">

i18n.config.ts

@@ -1,6 +1,6 @@
 export const i18n = {
-    defaultLocale: 'en',
-    locales: ['en', 'fr']
+    defaultLocale: 'fr-FR',
+    locales: ['en-US', 'fr-FR']
 } as const
 
 export type Locale = (typeof i18n)['locales'][number]

middleware.ts

@@ -1,7 +1,7 @@
 import type {NextRequest} from 'next/server'
 import {NextResponse} from 'next/server'
 
-import {i18n} from '@/i18n.config'
+import {i18n, Locale} from '@/i18n.config'
 
 import {match as matchLocale} from '@formatjs/intl-localematcher'
 import Negotiator from "negotiator";
@@ -27,31 +27,21 @@ export function middleware(request: NextRequest) {
         locale => !pathname.startsWith(`/${locale}`) && pathname !== `/${locale}`
     )
 
-    // console.log("request.url ", request);
+    console.log("request.url ", request.url);
 
     // console.log("pathnameIsMissingLocale ", pathnameIsMissingLocale);
     // console.log("pathname ", pathname);
 
     // Redirect if there is no locale
     if (pathnameIsMissingLocale) {
-        const locale = getLocale(request);
-        if (locale === 'fr') {
-            console.log("redirecting " + pathname + " to " + `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`);
-            return NextResponse.redirect(
-                new URL(
-                    `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`,
-                    request.url
-                )
+        const locale = getLocale(request) as Locale;
+        console.log("redirecting " + pathname + " to " + `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`);
+        return NextResponse.redirect(
+            new URL(
+                `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`,
+                request.url
             )
-        } else {
-            //console.log("rewriting " + pathname + " to " + `/en${pathname.startsWith('/') ? '' : '/'}${pathname}`);
-            return NextResponse.redirect(
-                new URL(
-                    `/fr${pathname.startsWith('/') ? '' : '/'}${pathname}`,
-                    request.url
-                )
-            )
-        }
+        )
     }
 }