gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-20 13:30:46 +00:00
parent cecaca61a3 f2e66590da
commit c3a0c26610
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RightPanel.js
View File

@ -29,6 +29,8 @@ import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/Acc
import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker'; import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker';
import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache'; import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache';
import { formatCount } from 'matrix-react-sdk/lib/utils/FormattingUtils';
class HeaderButton extends React.Component { class HeaderButton extends React.Component {
constructor() { constructor() {
super(); super();
@ -264,7 +266,7 @@ module.exports = React.createClass({
const room = cli.getRoom(this.props.roomId); const room = cli.getRoom(this.props.roomId);
let userIsInRoom; let userIsInRoom;
if (room) { if (room) {
membersBadge = room.getJoinedMembers().length; membersBadge = formatCount(room.getJoinedMembers().length);
userIsInRoom = room.hasMembershipState( userIsInRoom = room.hasMembershipState(
this.context.matrixClient.credentials.userId, 'join', this.context.matrixClient.credentials.userId, 'join',
); );