fix broken changeLanguage redirects

Signed-off-by: Dmitriy Nevzorov <[email protected]>

Author: jimmyn

.github/workflows/publish.yml

@@ -26,7 +26,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - run: yarn install --skip-integrity-check --non-interactive --no-progress
+      - run: yarn install --frozen-lockfile --skip-integrity-check --non-interactive --no-progress
 
       - run: npm publish --access public
         env:

src/useI18next.ts

@@ -14,8 +14,8 @@ export const useI18next = (ns?: Namespace, options?: UseTranslationOptions) => {
 
   const {routed, defaultLanguage} = context;
 
-  const getUrlLanguage = (language: string) => {
-    return language !== defaultLanguage ? language : '';
+  const getLanguagePath = (language: string) => {
+    return language !== defaultLanguage ? `/${language}` : '';
   };
 
   const removePrefix = (pathname: string) => {
@@ -33,15 +33,15 @@ export const useI18next = (ns?: Namespace, options?: UseTranslationOptions) => {
   };
 
   const navigate = (to: string, options?: NavigateOptions<{}>) => {
-    const urlLanguage = getUrlLanguage(context.language);
-    const link = routed ? `/${urlLanguage}${to}` : `${to}`;
+    const languagePath = getLanguagePath(context.language);
+    const link = routed ? `${languagePath}${to}` : `${to}`;
     return gatsbyNavigate(link, options);
   };
 
   const changeLanguage = (language: string, to?: string, options?: NavigateOptions<{}>) => {
-    const urlLanguage = getUrlLanguage(language);
+    const languagePath = getLanguagePath(language);
     const pathname = to || removeLocalePart(removePrefix(window.location.pathname));
-    const link = `/${urlLanguage}${pathname}${window.location.search}`;
+    const link = `${languagePath}${pathname}${window.location.search}`;
     localStorage.setItem(LANGUAGE_KEY, language);
     return gatsbyNavigate(link, options);
   };

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.8.0:
+react@^16.12.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==