Skip to content

Commit 4c9e2a5

Browse files
authored
Merge pull request #1020 from alexstotsky/improve-i18n-init
(improvement) Translations loading
2 parents 8d9e12a + d121a0f commit 4c9e2a5

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/App.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react'
1+
import React, { Suspense } from 'react'
22
import { useSelector } from 'react-redux'
33
import { ConnectedRouter } from 'connected-react-router'
44
import { I18nextProvider } from 'react-i18next'
@@ -16,14 +16,16 @@ function App() {
1616

1717
return (
1818
<I18nextProvider i18n={i18n}>
19-
<ConnectedRouter history={history}>
20-
{showElectronMenu && (<ElectronMenu />)}
21-
<Header />
22-
<div className='app'>
23-
<Auth />
24-
<Main />
25-
</div>
26-
</ConnectedRouter>
19+
<Suspense fallback={<div className='app-loader' />}>
20+
<ConnectedRouter history={history}>
21+
{showElectronMenu && (<ElectronMenu />)}
22+
<Header />
23+
<div className='app'>
24+
<Auth />
25+
<Main />
26+
</div>
27+
</ConnectedRouter>
28+
</Suspense>
2729
</I18nextProvider>
2830
)
2931
}

src/locales/i18n.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,9 @@ i18n
6363
debug: (REACT_APP_ENV === 'development'),
6464

6565
react: {
66-
wait: true,
67-
useSuspense: false,
68-
// bindI18n: 'languageChanged loaded',
69-
// bindStore: 'added removed',
70-
// nsMode: 'default'
66+
useSuspense: true,
67+
bindI18n: 'languageChanged loaded',
68+
bindI18nStore: 'added removed',
7169
},
7270

7371
interpolation: {

0 commit comments

Comments
 (0)