Commit 3df1452a authored by nano's avatar nano

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/routes/Index.js
parents d317d3ca 9f623290
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
"password": "Password", "password": "Password",
"user-info": "User Info", "user-info": "User Info",
"reset-info": "Reset User Info", "reset-info": "Reset User Info",
"Change-Avatar" :"Change Avatar",
"upload":"upload",
"avatar": "Avatar", "avatar": "Avatar",
"nickname": "Nickname", "nickname": "Nickname",
"reset-account-info": "Reset Account info", "reset-account-info": "Reset Account info",
...@@ -88,6 +90,8 @@ ...@@ -88,6 +90,8 @@
"password": "密码", "password": "密码",
"user-info": "用户信息", "user-info": "用户信息",
"reset-info": "修改信息", "reset-info": "修改信息",
"Change-Avatar" :"修改头像",
"upload":"上传",
"avatar": "头像", "avatar": "头像",
"nickname": "昵称", "nickname": "昵称",
"reset-account-info": "修改账户信息", "reset-account-info": "修改账户信息",
......
...@@ -186,9 +186,9 @@ function Index({ children, messages, dispatch, client }) { ...@@ -186,9 +186,9 @@ function Index({ children, messages, dispatch, client }) {
<Menu.Item key="2"> <Menu.Item key="2">
<Dropdown overlay={menu} trigger={['click']}> <Dropdown overlay={menu} trigger={['click']}>
{language === 'en-US' ? {language === 'en-US' ?
<a className="ant-dropdown-link changelanguage"> <a className="ant-dropdown-link changelanguage" href="#">
&nbsp;English <Icon type="down" className="flag"/> &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"/> &nbsp;中文 <Icon type="down" className="flag"/>
</a> </a>
} }
......
...@@ -112,7 +112,7 @@ class Profiles extends React.Component { ...@@ -112,7 +112,7 @@ class Profiles extends React.Component {
guides guides
/> />
<Button type="primary" onClick={this.handleUpload}> <Button type="primary" onClick={this.handleUpload}>
<Icon type="upload"/> upload <Icon type="upload"/> <Format id="upload"/>
</Button> </Button>
</div> </div>
...@@ -120,7 +120,7 @@ class Profiles extends React.Component { ...@@ -120,7 +120,7 @@ class Profiles extends React.Component {
<img alt="avatar" src={avatar || imageUrl || defaultAvatar}/> <img alt="avatar" src={avatar || imageUrl || defaultAvatar}/>
<Button onClick={() => { dispatch({ type: 'upload/start' }); }}> <Button onClick={() => { dispatch({ type: 'upload/start' }); }}>
<label> <label>
<Icon type="plus"/> Change Avatar <Icon type="plus"/><Format id="Change-Avatar"/>
<input <input
type="file" onChange={this.onGetFile} ref={(file) => { type="file" onChange={this.onGetFile} ref={(file) => {
this.file = file; this.file = file;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment