add the redirection

Author: vdusart

src/components/Nav/index.tsx

@@ -418,7 +418,11 @@ const Nav: React.FC<IProps> = ({ path }) => {
   }
 
   const shouldShowSubNav = path.includes("/developers/")
-
+  const splitPath = path.split("/")
+  const fromPageParameter =
+    splitPath.length > 3 && splitPath[2] !== "languages"
+      ? `?from=/${splitPath.slice(2).join("/")}`
+      : ""
   return (
     <NavContainer>
       <StyledNav aria-label={translateMessageId("nav-primary", intl)}>
@@ -441,7 +445,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
               >
                 <NavIcon name={isDarkTheme ? "lightTheme" : "darkTheme"} />
               </ThemeToggle>
-              <RightNavLink to="/languages/">
+              <RightNavLink to={`/languages/${fromPageParameter}`}>
                 <NavIcon name="language" />
                 <Span>
                   <Translation id="languages" />

src/pages/languages.tsx

@@ -1,5 +1,6 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
+import { useLocation } from "@reach/router"
 import { useIntl } from "react-intl"
 
 import PageMetadata from "../components/PageMetadata"
@@ -68,12 +69,13 @@ const ResetIcon = styled(Icon)`
   fill: ${(props) => props.theme.colors.text};
 `
 
-interface TranslatedLanguage extends Language {
-  path: string
-}
-
 const LanguagesPage = () => {
   const intl = useIntl()
+  const location = useLocation()
+  const redirectTo =
+    location.search.split("from=").length > 1
+      ? location.search.split("from=")[1]
+      : "/"
   const [keyword, setKeyword] = useState<string>("")
   const resetKeyword = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault()
@@ -83,11 +85,10 @@ const LanguagesPage = () => {
     "page-languages-filter-placeholder",
     intl
   )
-  let translationsCompleted: Array<TranslatedLanguage> = []
+  let translationsCompleted: Array<Language> = []
   for (const lang in languageMetadata) {
     const langMetadata = {
       ...languageMetadata[lang],
-      path: "/",
       name: translateMessageId(`language-${lang}` as TranslationKey, intl),
     }
 
@@ -147,7 +148,7 @@ const LanguagesPage = () => {
           </Form>
           <LangContainer>
             {translationsCompleted.map((lang) => (
-              <LangItem to={lang.path} language={lang.code} key={lang["name"]}>
+              <LangItem to={redirectTo} language={lang.code} key={lang["name"]}>
                 <LangTitle>{lang["name"]}</LangTitle>
                 <h4>{lang.localName}</h4>
               </LangItem>