fix: Use asPath for dynamic client side routing (#427)

i18next · Jul 28, 2019 · 0b314a6 · 0b314a6
1 parent a2ccb45
commit 0b314a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/__tests__/hocs/app-with-translation.test.js b/__tests__/hocs/app-with-translation.test.js
@@ -60,13 +60,23 @@ describe('appWithTranslation', () => {
   it('will call router events in a browser context', async () => {
     const { i18n } = await createApp()
     process.browser = true
+    i18n.initializedLanguageOnce = true
     await i18n.changeLanguage('en')
     expect(mockRouterFn).toHaveBeenCalledTimes(1)
   })
 
   it('will not call router events in a server context', async () => {
     const { i18n } = await createApp()
     process.browser = false
+    i18n.initializedLanguageOnce = true
+    await i18n.changeLanguage('en')
+    expect(mockRouterFn).toHaveBeenCalledTimes(0)
+  })
+
+  it('will not call router events if initializedLanguageOnce is false', async () => {
+    const { i18n } = await createApp()
+    process.browser = true
+    i18n.initializedLanguageOnce = false
     await i18n.changeLanguage('en')
     expect(mockRouterFn).toHaveBeenCalledTimes(0)
   })

diff --git a/src/hocs/app-with-translation.js b/src/hocs/app-with-translation.js
@@ -29,14 +29,14 @@ export default function (WrappedComponent) {
         const { pathname, asPath, query } = router
         const routeInfo = { pathname, query }
 
-        if (process.browser) {
+        if (process.browser && i18n.initializedLanguageOnce) {
           if (config.localeSubpaths !== localeSubpathOptions.NONE) {
             const { as, href } = lngPathCorrector(config, { as: asPath, href: routeInfo }, lng)
             if (as !== asPath) {
               router.replace(href, as)
             }
           } else {
-            router.replace({ pathname, query })
+            router.replace({ pathname, query }, asPath)
           }
         }
       })