remove currentLanguage from mainContext, use router.locale instead (g…

…ithub#21716)
aroc2021 · Sep 27, 2021 · 3125579 · 3125579
1 parent 4e0b83d
commit 3125579
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
@@ -8,14 +8,14 @@ import { SupportSection } from 'components/page-footer/SupportSection'
 import { DeprecationBanner } from 'components/page-header/DeprecationBanner'
 import { useMainContext } from 'components/context/MainContext'
 import { useTranslation } from 'components/hooks/useTranslation'
+import { useRouter } from 'next/router'
 
 type Props = { children?: React.ReactNode }
 export const DefaultLayout = (props: Props) => {
   const {
     page,
     error,
     isHomepageVersion,
-    currentLanguage,
     currentPathWithoutLanguage,
     currentVersion,
     currentProduct,
@@ -24,6 +24,7 @@ export const DefaultLayout = (props: Props) => {
     status,
   } = useMainContext()
   const { t } = useTranslation(['errors', 'scroll_button'])
+  const router = useRouter()
   return (
     <div className="d-lg-flex">
       <Head>
@@ -52,7 +53,7 @@ export const DefaultLayout = (props: Props) => {
         {page.topics.length > 0 && <meta name="keywords" content={page.topics.join(',')} />}
 
         {/* For analytics events */}
-        {currentLanguage && <meta name="path-language" content={currentLanguage} />}
+        {router.locale && <meta name="path-language" content={router.locale} />}
         {currentVersion && <meta name="path-version" content={currentVersion} />}
         {currentProduct && <meta name="path-product" content={currentProduct.id} />}
         {relativePath && (

diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx
@@ -77,7 +77,6 @@ export type MainContextT = {
   relativePath?: string
   enterpriseServerReleases: EnterpriseServerReleases
   currentPathWithoutLanguage: string
-  currentLanguage: string
   userLanguage: string
   allVersions: Record<string, VersionItem>
   currentVersion?: string
@@ -162,7 +161,6 @@ export const getMainContext = (req: any, res: any): MainContextT => {
       'supported',
     ]),
     enterpriseServerVersions: req.context.enterpriseServerVersions,
-    currentLanguage: req.context.currentLanguage,
     userLanguage: req.context.userLanguage || '',
     allVersions: req.context.allVersions,
     currentVersion: req.context.currentVersion,

diff --git a/components/page-header/HeaderNotifications.tsx b/components/page-header/HeaderNotifications.tsx
@@ -21,14 +21,8 @@ type Notif = {
 export const HeaderNotifications = () => {
   const router = useRouter()
   const { currentVersion } = useVersion()
-  const {
-    relativePath,
-    allVersions,
-    data,
-    currentLanguage,
-    userLanguage,
-    currentPathWithoutLanguage,
-  } = useMainContext()
+  const { relativePath, allVersions, data, userLanguage, currentPathWithoutLanguage } =
+    useMainContext()
   const { languages } = useLanguages()
   const { t } = useTranslation('header')
 
@@ -39,12 +33,12 @@ export const HeaderNotifications = () => {
         type: NotificationType.TRANSLATION,
         content: data.reusables.policies.translation,
       })
-    } else if (languages[currentLanguage].wip !== true) {
+    } else if (router.locale && languages[router.locale].wip !== true) {
       translationNotices.push({
         type: NotificationType.TRANSLATION,
         content: t('notices.localization_complete'),
       })
-    } else if (languages[currentLanguage].wip) {
+    } else if (router.locale && languages[router.locale].wip) {
       translationNotices.push({
         type: NotificationType.TRANSLATION,
         content: t('notices.localization_in_progress'),

diff --git a/components/release-notes/GHESReleaseNotes.tsx b/components/release-notes/GHESReleaseNotes.tsx
@@ -8,6 +8,7 @@ import {
 } from '@primer/octicons-react'
 import { useMainContext } from 'components/context/MainContext'
 import dayjs from 'dayjs'
+import { useRouter } from 'next/router'
 
 import { Link } from 'components/Link'
 import { MarkdownContent } from 'components/ui/MarkdownContent'
@@ -18,7 +19,8 @@ type Props = {
   context: GHESReleaseNotesContextT
 }
 export function GHESReleaseNotes({ context }: Props) {
-  const { currentLanguage, currentProduct } = useMainContext()
+  const router = useRouter()
+  const { currentProduct } = useMainContext()
   const [focusedPatch, setFocusedPatch] = useState('')
   const {
     prevRelease,
@@ -37,7 +39,7 @@ export function GHESReleaseNotes({ context }: Props) {
           {prevRelease ? (
             <Link
               className="btn btn-outline"
-              href={`/${currentLanguage}/${currentVersion.plan}@${prevRelease}/${currentProduct?.id}/release-notes`}
+              href={`/${router.locale}/${currentVersion.plan}@${prevRelease}/${currentProduct?.id}/release-notes`}
             >
               <ChevronLeftIcon /> {prevRelease}
             </Link>
@@ -52,7 +54,7 @@ export function GHESReleaseNotes({ context }: Props) {
           {nextRelease ? (
             <Link
               className="btn btn-outline"
-              href={`/${currentLanguage}/${currentVersion.plan}@${nextRelease}/${currentProduct?.id}/release-notes`}
+              href={`/${router.locale}/${currentVersion.plan}@${nextRelease}/${currentProduct?.id}/release-notes`}
             >
               {nextRelease} <ChevronRightIcon />
             </Link>
@@ -87,7 +89,7 @@ export function GHESReleaseNotes({ context }: Props) {
           <MarkdownContent data-search="article-content">
             <ul className="list-style-none pl-0 text-bold">
               {releases.map((release) => {
-                const releaseLink = `/${currentLanguage}/${currentVersion.plan}@${release.version}/${currentProduct?.id}/release-notes`
+                const releaseLink = `/${router.locale}/${currentVersion.plan}@${release.version}/${currentProduct?.id}/release-notes`
 
                 if (!release.patches || release.patches.length === 0) {
                   return (