diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
| commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
| tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/react/components/admin_console/team_users.jsx | |
| parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
| parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
| download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip | |
Fixing merge
Diffstat (limited to 'web/react/components/admin_console/team_users.jsx')
| -rw-r--r-- | web/react/components/admin_console/team_users.jsx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx index 2d9657956..1177c9c56 100644 --- a/web/react/components/admin_console/team_users.jsx +++ b/web/react/components/admin_console/team_users.jsx @@ -6,6 +6,8 @@ import LoadingScreen from '../loading_screen.jsx'; import UserItem from './user_item.jsx'; import ResetPasswordModal from './reset_password_modal.jsx'; +import {FormattedMessage} from 'mm-intl'; + export default class UserList extends React.Component { constructor(props) { super(props); @@ -122,7 +124,15 @@ export default class UserList extends React.Component { if (this.state.users == null) { return ( <div className='wrapper--fixed'> - <h3>{'Users for ' + this.props.team.name}</h3> + <h3> + <FormattedMessage + id='admin.userList.title' + defaultMessage='Users for {team}' + values={{ + team: this.props.team.name + }} + /> + </h3> {serverError} <LoadingScreen /> </div> @@ -141,7 +151,16 @@ export default class UserList extends React.Component { return ( <div className='wrapper--fixed'> - <h3>{'Users for ' + this.props.team.name + ' (' + this.state.users.length + ')'}</h3> + <h3> + <FormattedMessage + id='admin.userList.title2' + defaultMessage='Users for {team} ({count})' + values={{ + team: this.props.team.name, + count: this.state.users.length + }} + /> + </h3> {serverError} <form className='form-horizontal' |