Browse Source

get then overrides tracim_lib translation file + removed react logger

Skylsmoi 6 years ago
parent
commit
bc8ddabae2
2 changed files with 9 additions and 4 deletions
  1. 7 2
      src/i18n.js
  2. 2 2
      src/store.js

+ 7 - 2
src/i18n.js View File

@@ -1,5 +1,6 @@
1 1
 import i18n from 'i18next'
2 2
 import { reactI18nextModule } from 'react-i18next'
3
+import { langFr, langEn } from 'tracim_lib'
3 4
 import fr from './translate/fr.js'
4 5
 import en from './translate/en.js'
5 6
 
@@ -18,8 +19,12 @@ i18n
18 19
       wait: true
19 20
     },
20 21
     resources: {
21
-      en,
22
-      fr
22
+      en: {
23
+        translation: {...langEn.translation, ...en.translation}
24
+      },
25
+      fr: {
26
+        translation: {...langFr.translation, ...fr.translation}
27
+      }
23 28
     }
24 29
   })
25 30
 

+ 2 - 2
src/store.js View File

@@ -1,6 +1,6 @@
1 1
 import { createStore, applyMiddleware, compose } from 'redux'
2 2
 import thunkMiddleware from 'redux-thunk'
3
-import { createLogger } from 'redux-logger'
3
+// import { createLogger } from 'redux-logger'
4 4
 import rootReducer from './reducer/root.js'
5 5
 // import createSagaMiddleware from 'redux-saga'
6 6
 // import rootSaga from './saga.js'
@@ -10,7 +10,7 @@ import rootReducer from './reducer/root.js'
10 10
 export const store = createStore(
11 11
   rootReducer,
12 12
   compose(
13
-    applyMiddleware(thunkMiddleware, /* sagaMiddleware, */ createLogger()),
13
+    applyMiddleware(thunkMiddleware /* , sagaMiddleware, createLogger() */),
14 14
     (window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()) || (f => f)
15 15
   )
16 16
 )