浏览代码

get then overrides tracim_lib translation file + removed react logger

Skylsmoi 7 年前
父节点
当前提交
bc8ddabae2
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 7 2
      src/i18n.js
  2. 2 2
      src/store.js

+ 7 - 2
src/i18n.js 查看文件

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_lib'
3
 import fr from './translate/fr.js'
4
 import fr from './translate/fr.js'
4
 import en from './translate/en.js'
5
 import en from './translate/en.js'
5
 
6
 
18
       wait: true
19
       wait: true
19
     },
20
     },
20
     resources: {
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 查看文件

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