OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1802 from matrix-org/luke/group-view-change-delay-warning 

Add change delay warning in GroupView settings
pull/21833/head
Luke Barnard 2018-03-15 09:20:15 +00:00 committed by GitHub
parent c614810096 bc5699b3d7
commit 99f092e65f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/GroupView.js
View File

@ -707,8 +707,15 @@ export default React.createClass({
}); });
const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />; 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}> return <div className={groupSettingsSectionClasses}>
{ header } { header }
{ changeDelayWarning }
{ this._getLongDescriptionNode() } { this._getLongDescriptionNode() }
{ this._getRoomsNode() } { this._getRoomsNode() }
</div>; </div>;

1
src/i18n/strings/en_EN.json
View File

@ -766,6 +766,7 @@
"Leave": "Leave", "Leave": "Leave",
"Unable to leave room": "Unable to leave room", "Unable to leave room": "Unable to leave room",
"Community Settings": "Community Settings", "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.", "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", "Add rooms to this community": "Add rooms to this community",
"Featured Rooms:": "Featured Rooms:", "Featured Rooms:": "Featured Rooms:",