From 600ba2e7657807957b555cce761eec966e8b6592 Mon Sep 17 00:00:00 2001 From: Peter Nagy Date: Wed, 24 Jun 2020 18:12:31 +0200 Subject: [PATCH] feat: don't include default language into meta urls --- src/Helmet.tsx | 13 +++++-------- yarn.lock | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Helmet.tsx b/src/Helmet.tsx index 4b6ec53..d68d450 100644 --- a/src/Helmet.tsx +++ b/src/Helmet.tsx @@ -3,18 +3,15 @@ import {Helmet as ReactHelmet, HelmetProps} from 'react-helmet'; import {useI18next} from './useI18next'; export const Helmet: React.FC = ({children, ...props}) => { - const {languages, language, originalPath, siteUrl = ''} = useI18next(); + const {languages, language, originalPath, defaultLanguage, siteUrl = ''} = useI18next(); + const createUrlWithLang = (lang: string) => + `${siteUrl}${lang === defaultLanguage ? '' : `/${lang}`}${originalPath}`; return ( - + {languages.map((lang) => ( - + ))} {children} diff --git a/yarn.lock b/yarn.lock index a5ec983..350ea4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10478,7 +10478,7 @@ react-side-effect@^2.1.0: resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3" integrity sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg== -react@^16.12.0, react@^16.8.0: +react@^16.8.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==