翻译

src/language/en_US.js

@@ -38,5 +38,17 @@ const en_US = {
     "API Path": 'API Path',
     "Notification": 'Notification',
     "Want more options?": 'Want more options?',
+    "Welcome": 'Welcome',
+    "Account center": "Account center",
+    "Cloud settings": 'Cloud settings',
+    'exit': 'exit',
+    'login': 'login',
+    'register': 'register',
+    'ok, login please': 'ok, login please',
+    'login filed': 'login filed',
+    'username': 'username',
+    'password': 'password',
+    'nickname': 'nickname',
+    'username has been used': 'username has been used, please change one',
 };
 export default en_US;

src/language/zh_CN.js

@@ -38,5 +38,18 @@ const zh_CN = {
     "API Path": 'API路径 配置',
     "Notification": '通知配置',
     "Want more options?": '需要更多配置项？',
+    "Welcome": '欢迎',
+    "Account center": "用户中心",
+    "Cloud settings": '云配置',
+    'exit': '退出',
+    'login': '登录',
+    'register': '注册',
+    'ok, login please': '完成，请登录',
+    'login filed': '登录失败',
+    'username': '用户名',
+    'password': '密码',
+    'nickname': '昵称',
+    'username has been used': '用户名已被占用，请更换',
+
 };
 export default zh_CN;

src/login/AccountConfig.js

@@ -41,7 +41,7 @@ class AccountConfig extends Component {
                         <Row>
                             <Col span={20} offset={4} className={'message-wrapper'}>
                                 <Row>
-                                    <Col span={22}>
+                                    <Col span={20}>
                                         {
                                             this.state.editNickname ?
                                                 <EditNickname kind={'nickname'} cancelEdit={this.cancelEdit}/>
@@ -71,7 +71,7 @@ class AccountConfig extends Component {
                                                 </div>
                                         }
                                     </Col>
-                                    <Col span={2}>
+                                    <Col span={4}>
                                         <div className="back-to-login" onClick={() => {
                                             this.props.history.push({
                                                 pathname: '/login',

src/login/LoginInput.js

@@ -12,6 +12,7 @@ import {idGen} from "../func";
 import {setCookie} from "../cookie";
 import {loginUrl, registerUrl, getIdUrl} from '../config'
 import {graphqlUrl} from "../config";
+import {FormattedMessage} from 'react-intl';
 
 axios.defaults.withCredentials = true;
 
@@ -79,9 +80,9 @@ class LoginInput extends Component {
 
                     return (
                         <div>
-                            <span style={{marginRight: 20}}><b>register:</b></span>
+                            <span style={{marginRight: 20}}><b><FormattedMessage id="register"/>:</b></span>
                             <div style={{marginTop: 10}}>
-                                <span>username: </span>
+                                <span><FormattedMessage id="username"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -94,13 +95,13 @@ class LoginInput extends Component {
                                 />
                                 {
                                     this.state.usernameTip ?
-                                        <span><b>username has been used!</b></span>
+                                        <span><b><FormattedMessage id="username has been used"/>!</b></span>
                                         :
                                         ''
                                 }
                             </div>
                             <div style={{marginTop: 10}}>
-                                <span>password: </span>
+                                <span><FormattedMessage id="password"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -111,7 +112,7 @@ class LoginInput extends Component {
                                 />
                             </div>
                             <div style={{marginTop: 10}}>
-                                <span>nickname: </span>
+                                <span><FormattedMessage id="nickname"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -216,9 +217,9 @@ class LoginInput extends Component {
                                 ''
                             :
                             <div>
-                                <span style={{marginRight: 20}}><b>login:</b></span>
+                                <span style={{marginRight: 20}}><b><FormattedMessage id="login"/>:</b></span>
                                 <div style={{marginTop: 10}}>
-                                    <span>username: </span>
+                                    <span><FormattedMessage id="username"/>: </span>
                                     <Input
                                         placeholder=""
                                         onChange={(e) => {
@@ -229,7 +230,7 @@ class LoginInput extends Component {
                                     />
                                 </div>
                                 <div style={{marginTop: 10}}>
-                                    <span>password: </span>
+                                    <span><FormattedMessage id="password"/>: </span>
                                     <Input
                                         placeholder=""
                                         onChange={(e) => {
@@ -250,7 +251,7 @@ class LoginInput extends Component {
                         this.state.loginStatus === 'logined' ?
                             <div>
                                                 <span
-                                                    style={{marginRight: '10px'}}>welcome, {this.state.nickname}</span>
+                                                    style={{marginRight: '10px'}}><FormattedMessage id="Welcome"/>, {this.state.nickname}</span>
                                 <Button onClick={() => {
                                     this.setState({
                                         hasLogin: false,
@@ -258,31 +259,31 @@ class LoginInput extends Component {
                                         loginOnce: true
                                     });
                                     // cookie.remove('ring-session')
-                                }}>exit</Button>
+                                }}><FormattedMessage id="exit"/></Button>
                                 <div style={{marginTop: 20}}>
                                     <Button type="primary" style={{marginRight: 10}} onClick={() => {
                                         this.props.history.push({
                                             pathname: '/login/account',
                                         })
-                                    }}>user setting</Button>
+                                    }}><FormattedMessage id="Account center"/></Button>
                                     <Button type="primary" onClick={() => {
                                         this.props.history.push({
                                             pathname: '/login/cloud',
                                         })
-                                    }}>cloud setting</Button>
+                                    }}><FormattedMessage id="Cloud settings"/></Button>
                                 </div>
                             </div>
                             :
                             this.state.loginStatus === 'failed' ?
                                 <div>
-                                    <span style={{marginRight: '10px'}}>login failed</span>
+                                    <span style={{marginRight: '10px'}}><FormattedMessage id="login failed"/></span>
                                     <Button onClick={() => {
                                         this.setState({
                                             hasLogin: false,
                                             loginStatus: '',
                                             loginOnce: true
                                         })
-                                    }}>relogin</Button>
+                                    }}><FormattedMessage id="relogin"/></Button>
                                 </div>
                                 :
                                 ''
@@ -291,7 +292,7 @@ class LoginInput extends Component {
                 <div className='register' style={{marginTop: 20}}>
                     {
                         this.state.hasRegister ?
-                            <div>ok, login please</div>
+                            <div><FormattedMessage id="ok, login please"/></div>
                             :
                             this.state.loginStatus === 'logined' ?
                                 ''

src/login/index.css

@@ -113,4 +113,5 @@
   display: inline-block;
   line-height: 36px;
   font-size: 16px;
+  padding-right: 50px;
 }