Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-14903: Adds messaging to group members dropdown. #2729

Merged
merged 4 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MM-14903: Adds translation.
  • Loading branch information
mkraft committed Apr 30, 2019
commit 9d981447c6b6a87628a526f62b21ec0707ef2f9d
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,11 @@ exports[`components/PopoverListMembers should match snapshot with group-constrai
<div
className="subhead"
>
Members managed by linked groups.
<FormattedMessage
defaultMessage="Members managed by linked groups."
id="channel_header.groupConstrained"
values={Object {}}
/>
</div>
</div>
<div
Expand Down
7 changes: 6 additions & 1 deletion components/popover_list_members/popover_list_members.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,12 @@ export default class PopoverListMembers extends React.Component {
>
<div className='more-modal__header'>
{title}
{this.props.channel.group_constrained && <div className='subhead'>Members managed by linked groups.</div>}
{this.props.channel.group_constrained && <div className='subhead'>
<FormattedMessage
id='channel_header.groupConstrained'
defaultMessage='Members managed by linked groups.'
/>
</div>}
</div>
<div className='more-modal__body'>
<div className='more-modal__list'>
Expand Down
1 change: 1 addition & 0 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1645,6 +1645,7 @@
"channel_flow.set_url_title": "Set Channel URL",
"channel_header.addChannelHeader": "Add a channel description",
"channel_header.channelMembers": "Members",
"channel_header.groupConstrained": "Members managed by linked groups.",
"channel_header.convert": "Convert to Private Channel",
"channel_header.delete": "Archive Channel",
"channel_header.directchannel.you": "{displayname} (you) ",
Expand Down
3 changes: 3 additions & 0 deletions sass/components/_popover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@
.subhead {
font-size: 12px;
opacity: 0.6;
span {
font-weight: normal;
}
}
}

Expand Down