fix language bug

w3b3d3v · Jun 7, 2024 · abfe685 · abfe685
1 parent 49fb642
commit abfe685
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/components/Home/index.js b/components/Home/index.js
@@ -22,7 +22,9 @@ export default function Main({ course }) {
         <div>
           <div className="m-auto max-w-lg">
             <Text h2 auto="true" className="mb-4 text-center font-bold">
-              {!course?.metadata ? course.title : course.metadata[i18n.language].title}
+              {!course?.metadata
+                ? course.title
+                : course.metadata[i18n.resolvedLanguage || 'en'].title}
             </Text>
           </div>
           <div className="mb-7 flex justify-center text-justify">
@@ -31,7 +33,9 @@ export default function Main({ course }) {
           <div className="max-w-2xl">
             {course?.metadata && (
               <div
-                dangerouslySetInnerHTML={{ __html: course?.metadata[i18n.language].description }}
+                dangerouslySetInnerHTML={{
+                  __html: course?.metadata[i18n.resolvedLanguage || 'en'].description,
+                }}
               />
             )}
             {!course?.metadata && <div dangerouslySetInnerHTML={{ __html: course?.description }} />}

diff --git a/components/Navbar/index.js b/components/Navbar/index.js
@@ -73,7 +73,7 @@ export default function NavbarComponent() {
         </Navbar.Content>
         <Dropdown>
           <Dropdown.Button size="xs" light rounded flat css={{ paddingBlock: '$10' }}>
-            {i18n.language}
+            {i18n.resolvedLanguage || 'en'}
           </Dropdown.Button>
           <Dropdown.Menu
             css={{
@@ -83,7 +83,7 @@ export default function NavbarComponent() {
             }}
           >
             {i18n.options.whitelist
-              .filter((l) => l !== i18n.language)
+              .filter((l) => l !== i18n.resolvedLanguage)
               .map((l) => (
                 <Dropdown.Item>
                   <Link href={'?lang=' + l}>

diff --git a/pages/courses/[id].js b/pages/courses/[id].js
@@ -200,13 +200,17 @@ function Course({ course, currentDate }) {
         <div className="mb-8 flex flex-col justify-between lg:flex-row">
           <div className="max-w-4xl self-center">
             <h1 className="text-2xl font-bold">
-              {!course?.metadata ? course.title : course.metadata[i18n.language].title}
+              {!course?.metadata
+                ? course.title
+                : course.metadata[i18n.resolvedLanguage || 'en'].title}
             </h1>
 
             <p className="mb-6  text-sm">
               {course?.metadata && (
                 <div
-                  dangerouslySetInnerHTML={{ __html: course?.metadata[i18n.language].description }}
+                  dangerouslySetInnerHTML={{
+                    __html: course?.metadata[i18n.resolvedLanguage || 'en'].description,
+                  }}
                 />
               )}
               {!course?.metadata && (