fix: updated i18n handling

Author: henrynoowah

src/app/[locale]/_components/LocaleToggle.tsx

@@ -23,8 +23,6 @@ const LocaleToggle = () => {
     }
   }, [iconToggle])
 
-  console.log(locale === 'ko')
-
   return (
     <button
       aria-label="Theme Toggle"

src/app/[locale]/page.tsx

@@ -13,7 +13,7 @@ interface Params {
 }
 
 const Home = async ({ params }: Params) => {
-  const dictionary = await getDictionary(params.locale, 'navigation')
+  const dictionary = await getDictionary(params.locale)
   return (
     <main className={inter.variable}>
       <DictionaryProvider dictionary={dictionary}>

src/app/[locale]/posts/layout.tsx

@@ -17,7 +17,8 @@ interface Params {
 }
 
 const PostsLayouts = async ({ children, params }: Params) => {
-  const t = await getDictionary(params.locale, 'navigation')
+  const t = await getDictionary(params.locale)
+  console.log(t)
 
   const navOption: Array<{ label: string; href: string; locale: Locale; external?: boolean }> = [
     { label: t.navigation.home.title, href: '/', locale: params.locale },

src/dictionaries/en.json

@@ -0,0 +1,24 @@
+{
+  "navigation": {
+    "home": {
+      "title": "Home",
+      "description": ""
+    },
+    "posts": {
+      "title": "Posts",
+      "description": "Check out my dev blog posts"
+    },
+    "about": {
+      "title": "About",
+      "description": ""
+    },
+    "github": {
+      "title": "Github",
+      "description": "Head over to my github!"
+    },
+    "chat": {
+      "title": "Chat Bot",
+      "description": "Chat Bot Coming Soon...!"
+    }
+  }
+}

src/dictionaries/en/navigation.json

@@ -0,0 +1,24 @@
+{
+  "navigation": {
+    "home": {
+      "title": "홈",
+      "description": ""
+    },
+    "posts": {
+      "title": "포스트",
+      "description": "기술 블로그 포스트 보러가기"
+    },
+    "about": {
+      "title": "소개",
+      "description": ""
+    },
+    "github": {
+      "title": "Github",
+      "description": "깃허브 페이지로 이동"
+    },
+    "chat": {
+      "title": "챗봇",
+      "description": "준비중입니다...!"
+    }
+  }
+}

src/dictionaries/ko.json

@@ -1,44 +1,9 @@
 import 'server-only'
 import type { Locale } from '@/i18n.config'
 
-const dictionaries = (() => {
-  let obj: { [key: string]: { [key: string]: () => Promise<any> } } = {}
-  for (let locale of ['en', 'ko']) {
-    obj[locale] = {
-      navigation: async () => import(`src/dictionaries/${locale}/navigation.json`).then((module) => module.default)
-    }
-  }
-  return obj
-})()
-// const dictionaries = {
-//   en: () => import('@/dictionaries/en.json').then((module) => module.default),
-//   ko: () => import('@/dictionaries/ko.json').then((module) => module.default)
-// }
-
-export const getDictionary = async (locale: Locale, key?: string | string[]) => {
-  switch (typeof key) {
-    case 'string': {
-      return dictionaries[locale ?? 'en'][key]()
-    }
-    case 'object': {
-      if (Array.isArray(key)) {
-        let obj: { [key: string]: Promise<any> } = {}
-        for (let k of key) {
-          console.log(locale)
-          if (dictionaries[locale ?? 'en'][k]) {
-            {
-              obj[k] = await dictionaries[locale ?? 'en'][k]()
-            }
-          }
-        }
-
-        return obj
-      }
-    }
-    case 'undefined':
-    default: {
-      return dictionaries[locale ?? 'en']
-    }
-  }
+const dictionaries = {
+  en: () => import('@/dictionaries/en.json').then((module) => module.default),
+  ko: () => import('@/dictionaries/ko.json').then((module) => module.default)
 }
-// export const getDictionary = async (locale: Locale) => dictionaries[locale]()
+
+export const getDictionary = async (locale: Locale) => dictionaries[locale]()

src/dictionaries/ko/navigation.json

@@ -26,7 +26,9 @@ export function middleware(request: NextRequest) {
 
   // Redirect if there is no locale
   if (pathnameIsMissingLocale) {
-    const locale = getLocale(request)
+    // const locale = getLocale(request)
+
+    const locale = i18n.defaultLocale
 
     if (locale === i18n.defaultLocale) {
       return NextResponse.rewrite(new URL(`/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`, request.url))