Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/routes/Index.js

i18n.json

@@ -7,6 +7,8 @@
     "password": "Password",
     "user-info": "User Info",
     "reset-info": "Reset User Info",
+    "Change-Avatar" :"Change Avatar",
+    "upload":"upload",
     "avatar": "Avatar",
     "nickname": "Nickname",
     "reset-account-info": "Reset Account info",
@@ -88,6 +90,8 @@
     "password": "密码",
     "user-info": "用户信息",
     "reset-info": "修改信息",
+    "Change-Avatar" :"修改头像",
+    "upload":"上传",
     "avatar": "头像",
     "nickname": "昵称",
     "reset-account-info": "修改账户信息",

src/routes/Index.js

@@ -186,9 +186,9 @@ function Index({ children, messages, dispatch, client }) {
           <Menu.Item key="2">
             <Dropdown overlay={menu} trigger={['click']}>
               {language === 'en-US' ?
-                <a className="ant-dropdown-link changelanguage">
+                <a className="ant-dropdown-link changelanguage" href="#">
                   &nbsp;English <Icon type="down" className="flag"/>
-                </a> : <a className="ant-dropdown-link changelanguage">
+                </a> : <a className="ant-dropdown-link changelanguage" href="#">
                   &nbsp;中文 <Icon type="down" className="flag"/>
                 </a>
               }

src/routes/Profiles.js

@@ -112,7 +112,7 @@ class Profiles extends React.Component {
                     guides
                   />
                   <Button type="primary" onClick={this.handleUpload}>
-                    <Icon type="upload"/> upload
+                    <Icon type="upload"/> <Format id="upload"/>
                   </Button>
                 </div>
 
@@ -120,7 +120,7 @@ class Profiles extends React.Component {
                   <img alt="avatar" src={avatar || imageUrl || defaultAvatar}/>
                   <Button onClick={() => { dispatch({ type: 'upload/start' }); }}>
                     <label>
-                      <Icon type="plus"/> Change Avatar
+                      <Icon type="plus"/><Format id="Change-Avatar"/>
                       <input
                         type="file" onChange={this.onGetFile} ref={(file) => {
                           this.file = file;