PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Weblate 2018-03-29 14:43:59 +00:00
commit fc0b73c29a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/GroupView.js
View file

@ -708,8 +708,14 @@ 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 ? const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
<div className="mx_GroupView_changeDelayWarning"> <div className="mx_GroupView_changeDelayWarning">
{ _t( 'Changes made to your community might not be seen by other users ' + { _t(
'for up to 30 minutes.', 'Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> ' +
'might not be seen by other users for up to 30 minutes.',
{},
{
'bold1': (sub) => <b> { sub } </b>,
'bold2': (sub) => <b> { sub } </b>,
},
) } ) }
</div> : <div />; </div> : <div />;
return <div className={groupSettingsSectionClasses}> return <div className={groupSettingsSectionClasses}>

2
src/i18n/strings/en_EN.json
View file

@ -768,7 +768,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.", "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> 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:",