Skip to content

Commit 8fda08c

Browse files
authored
Merge pull request #695 from dodo920306/enhancement/provide-info-about-difference-between-login-page-and-normal-user-registration
Provide more information about difference between login page and norm…
2 parents d464308 + b67df0c commit 8fda08c

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

src/dashboard/src/locales/en-US/login.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export default {
1212
'app.login.login': 'Login',
1313
'app.login.email': 'E-mail',
1414
'app.register.register': 'Register',
15+
'app.register.info':
16+
'This registration form is only for setting up a new organization and its first administrator. If your organization already exists, please ask your administrator to create your account.',
1517
'app.register.orgName': 'Organization name',
1618
'app.register.passwordAgain': 'Enter the password again',
1719
'app.register.success': 'The organization and user register success!',

src/dashboard/src/locales/zh-CN/login.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export default {
1212
'app.login.login': '登录',
1313
'app.login.email': '邮箱地址',
1414
'app.register.register': '注册',
15+
'app.register.info':
16+
'此注册功能仅用于创建新组织及其首位管理员账号。如果您的组织已完成注册,请联系组织管理员为您创建个人账号。',
1517
'app.register.orgName': '组织名',
1618
'app.register.passwordAgain': '再次输入密码',
1719
'app.register.success': '组织和用户注册成功',

src/dashboard/src/pages/User/Login.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ class LoginPage extends Component {
122122
{!registering &&
123123
registerMsg !== '' &&
124124
this.renderMessage({ type: success ? 'success' : 'error', message: registerMsg })}
125+
<Alert
126+
message={intl.formatMessage({ id: 'app.register.info' })}
127+
type="info"
128+
showIcon
129+
style={{ marginBottom: 16 }}
130+
/>
125131
<Tooltip
126132
title={intl.formatMessage({ id: 'app.register.orgName.example' })}
127133
placement="bottomLeft"

0 commit comments

Comments
 (0)