Browse Source

Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

AlexiCauvin 6 years ago
parent
commit
290d97d63d
1 changed files with 1 additions and 11 deletions
  1. 1 11
      frontend_app_thread/src/i18n.js

+ 1 - 11
frontend_app_thread/src/i18n.js View File

1
 import i18n from 'i18next'
1
 import i18n from 'i18next'
2
 import { reactI18nextModule } from 'react-i18next'
2
 import { reactI18nextModule } from 'react-i18next'
3
-import { langFr, langEn } from 'tracim_frontend_lib'
4
-import fr from './translate/fr.js'
5
-import en from './translate/en.js'
6
 
3
 
7
 i18n
4
 i18n
8
   .use(reactI18nextModule)
5
   .use(reactI18nextModule)
18
     react: {
15
     react: {
19
       wait: true
16
       wait: true
20
     },
17
     },
21
-    resources: {
22
-      en: {
23
-        translation: {...langEn.translation, ...en.translation}
24
-      },
25
-      fr: {
26
-        translation: {...langFr.translation, ...fr.translation}
27
-      }
28
-    }
18
+    resources: {} // init with empty resources, they will come from frontend in app constructor
29
   })
19
   })
30
 
20
 
31
 export default i18n
21
 export default i18n