Merge branch 'develop' into new-guest-access
This commit is contained in:
commit
d264426ece
25 changed files with 191 additions and 97 deletions
|
@ -213,11 +213,11 @@ module.exports = React.createClass({
|
|||
|
||||
var Loader = sdk.getComponent("elements.Spinner");
|
||||
var modal = Modal.createDialog(Loader);
|
||||
var step = _t('remove %(name)s from the directory', {name: name}) + '.';
|
||||
var step = _t('remove %(name)s from the directory.', {name: name});
|
||||
|
||||
MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
|
||||
if (!alias) return;
|
||||
step = _t('delete the alias') + '.';
|
||||
step = _t('delete the alias.');
|
||||
return MatrixClientPeg.get().deleteAlias(alias);
|
||||
}).done(() => {
|
||||
modal.close();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue