update i18n

i18n.json

@@ -75,8 +75,14 @@
     "old-password":"old password",
     "new-password":"new password",
     "Password length must be between 8 and 24 characters":"Password length must be between 8 and 24 characters",
-
-    "没毛用":"防逗号报错,上线删"
+    "i_update_success": "Update Success!",
+    "i_password_error": "Incorrect password. ",
+    "i_user_unexists":"",
+    "i_email_exists":"email is exists",
+    "i_username_exists":"",
+    "i_not_found":"",
+    "i_key_out_time":"",
+    "没毛用":"防逗号报错,上线删"    
   },
   "zh": {
     "language": "english",
@@ -159,5 +165,6 @@
 
     "密码至少为8-24位":"密码至少为8-24位",
     "没毛用":"防逗号报错,上线删"
+    
   }
 }

src/components/EmailForm.js

@@ -35,7 +35,7 @@ class EmailForm extends React.Component {
 
     const {form, dispatch, user, checkEmail, isEmailExists} = this.props
     const {getFieldDecorator} = form
-    const {id, email} = data;
+    const {id, email} = user;
     const { intl: {messages} } = this.context;
 
 

src/components/UserNameForm.js

@@ -34,7 +34,7 @@ class EmailForm extends React.Component {
 
     const { form, dispatch, user, checkUsername, isUserNameExists } = this.props;
     const { getFieldDecorator } = form;
-    const { id, username } = data;
+    const { id, username } = user;
     const { intl: { messages } } = this.context;
 
     const usernameProps = {

src/index.js

@@ -29,7 +29,7 @@ app.model(require("./models/upload"));
 
 app.model(require('./models/auth'));
 
-app.model(require('./models/haha'));
+// app.model(require('./models/haha'));
 
 // app.model(require("./models/login"));
 

src/models/auth.js

@@ -180,16 +180,18 @@ export default {
         yield put({ type: 'check', payload: { isUserNameExists: false, checkUsername: 'success' } })
       }
     },
-    *login({ payload }, { call, put }) {
+    *login({ payload }, { call, put, select }) {
+      const { messages } = yield select(state => state.common)      
       try {
         const { data } = yield call(login, payload)
+
         if (data) {
           yield put({ type: 'loginSuccess', payload: { input: payload } })          
           yield put({ type: 'user/loginSuccess', payload: { data } })
         }
       } catch (error) {
         yield put({ type: 'loginFail' })
-        message.error(error.message)
+        message.error(messages[error.message])
       }
     },
     *forgot({ payload }, { call, put }) {
@@ -197,7 +199,7 @@ export default {
           const { data } = yield call(forgot, payload)
           if(data){
             yield put({ type: 'forgotSuccess' })
-            message.info("已发送密码重置邮件")
+            message.info("已发送密码重置邮件", 3)
           }
         } catch (error) {
           yield put({ type: 'forgotFail' })
@@ -229,7 +231,7 @@ export default {
         }
       } catch (error) {
          yield put({ type: 'resetFail' })
-         message.error("重置失败")
+         message.error(error.message, 3)
       }
     },
   },

src/models/common.js

+import i18n from '../../i18n.json'
+
+
 export default {
   namespace: 'common',
   state: {
-    language: 'zh-CN'
+    language: 'zh-CN',
+    messages: {}
   },
   reducers: {
     init(state, action){
@@ -13,10 +17,12 @@ export default {
   effects: {},
   subscriptions: {
     setup({ dispatch, history }) {
-      const language = navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
+      let language =localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
+
       const languageWithoutRegionCode = language.toLowerCase().split(/[_-]+/)[0];
+      const messages = i18n[languageWithoutRegionCode]
 
-      dispatch({type: "init", payload: { language: languageWithoutRegionCode }})
+      dispatch({type: "init", payload: { language: languageWithoutRegionCode, messages }})
     }
   },
 };

src/models/example.js

-export default {
-
-  namespace: 'example',
-
-  state: {},
-
-  subscriptions: {
-    setup({ dispatch, history }) {  // eslint-disable-line
-    },
-  },
-
-  effects: {
-    *fetch({ payload }, { call, put }) {  // eslint-disable-line
-      yield put({ type: 'save' });
-    },
-  },
-
-  reducers: {
-    save(state, action) {
-      return { ...state, ...action.payload };
-    },
-  },
-
-};

src/models/user.js

@@ -117,22 +117,25 @@ export default {
       message.destroy()
       try {
         let token = yield select(state => state.user.token)        
+        let { messages } = yield select(state => state.common)
+
         let { data } = yield call(updateProfile, {...payload, token})
         
         if (data) {
           yield put({ type: 'updateProfileSuccess', payload: { user: data, token } })
           
-          message.info("更新成功")
+          message.info(messages["i_update_success"])          
         }
       } catch (error) {
         yield put({ type: 'updateProfileFail' })
-        message.error(error.message)
+        message.error(messages[error.message])
       }
     },
     *updateEmail({ payload }, { call, put, select }) {
       try {
 
-        let token = yield select(state => state.user.token)        
+        let token = yield select(state => state.user.token)      
+        let { messages } = yield select(state => state.common)          
         let { data } = yield call(updateAccount, {...payload, token})
 
         if (data) {
@@ -141,23 +144,25 @@ export default {
         }
       } catch (error) {
         yield put({ type: 'updateAccountFail' })
-        message.error(error.message)
+        message.error(messages[error.message])
       }
     },
 
     *updateAccount({ payload }, { call, put, select }) {
       try {
         
-        let token = yield select(state => state.user.token)        
+        let token = yield select(state => state.user.token)
+        let { messages } = yield select(state => state.common)
+
         let { data } = yield call(updateAccount, {...payload, token})
 
         if (data) {
           yield put({ type: 'updateAccountSuccess', payload: { user: data, token } })
-          message.info("更新成功")
+          message.info(messages["i_update_success"])
         }
       } catch (error) {
         yield put({ type: 'updateAccountFail' })
-        message.error(error.message)
+        message.error(messages[error.message])
       }
     },
   },

src/routes/Register.js

@@ -57,7 +57,7 @@ class Register extends React.Component {
     const emailProps = {
       hasFeedback: true,
       validateStatus: checkEmail,
-      help: isEmailExists ? 'email exists' : '',
+      help: isEmailExists ? messages['i_email_exists'] : '',
     };
 
     const emailInputProps = {