diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-05-09 20:57:51 +0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-05-09 08:57:51 -0700 |
| commit | 12cc9def7beac97ab2b0beae946e19c5eb65e144 (patch) | |
| tree | 5f4053e167dabb2e5086e4e342561f280d9b75a5 /webapp/components/filtered_user_list.jsx | |
| parent | 64b6d8cde5cff996d1c14eecb082e1fe4caced5d (diff) | |
| download | chat-12cc9def7beac97ab2b0beae946e19c5eb65e144.tar.gz chat-12cc9def7beac97ab2b0beae946e19c5eb65e144.tar.bz2 chat-12cc9def7beac97ab2b0beae946e19c5eb65e144.zip | |
Improvements to system console and DM modal (#2930)
Fixing audit and compliance table
Changing prop
Minor improvement to the DM modal
Diffstat (limited to 'webapp/components/filtered_user_list.jsx')
| -rw-r--r-- | webapp/components/filtered_user_list.jsx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/webapp/components/filtered_user_list.jsx b/webapp/components/filtered_user_list.jsx index cffafd663..4270d3731 100644 --- a/webapp/components/filtered_user_list.jsx +++ b/webapp/components/filtered_user_list.jsx @@ -104,9 +104,26 @@ class FilteredUserList extends React.Component { let count; if (users.length === this.state.users.length) { - count = '(' + users.length + ')'; + count = ( + <FormattedMessage + id='filtered_user_list.count' + defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}}' + values={{ + count: users.length + }} + /> + ); } else { - count = '(' + this.state.users.length + ')'; + count = ( + <FormattedMessage + id='filtered_user_list.countTotal' + defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total' + values={{ + count: users.length, + total: this.state.users.length + }} + /> + ); } let teamToggle; @@ -117,7 +134,6 @@ class FilteredUserList extends React.Component { teamToggle = ( <div className='member-select__container'> - <span className='member-count'>{count}</span> <select className='form-control' id='restrictList' @@ -133,7 +149,7 @@ class FilteredUserList extends React.Component { > <FormattedMessage id='filtered_user_list.show' - defaultMessage='Show' + defaultMessage='Filter:' /> </span> </div> @@ -157,6 +173,9 @@ class FilteredUserList extends React.Component { <div className='col-sm-6'> {teamToggle} </div> + <div className='col-sm-12'> + <span className='member-count pull-left'>{count}</span> + </div> </div> <div ref='userList' |