Skip to content

Commit

Permalink
Merge pull request #1802 from matrix-org/luke/group-view-change-delay…
Browse files Browse the repository at this point in the history
…-warning

Add change delay warning in GroupView settings
  • Loading branch information
lukebarnard1 committed Mar 15, 2018
2 parents c614810 + bc5699b commit 99f092e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/components/structures/GroupView.js
Expand Up @@ -707,8 +707,15 @@ export default React.createClass({
});

const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />;
const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
<div className="mx_GroupView_changeDelayWarning">
{ _t( 'Changes made to your community might not be seen by other users ' +
'for up to 30 minutes.',
) }
</div> : <div />;
return <div className={groupSettingsSectionClasses}>
{ header }
{ changeDelayWarning }
{ this._getLongDescriptionNode() }
{ this._getRoomsNode() }
</div>;
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
Expand Up @@ -766,6 +766,7 @@
"Leave": "Leave",
"Unable to leave room": "Unable to leave room",
"Community Settings": "Community Settings",
"Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
"These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
"Add rooms to this community": "Add rooms to this community",
"Featured Rooms:": "Featured Rooms:",
Expand Down

0 comments on commit 99f092e

Please sign in to comment.