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

Merge pull request #4199 from matrix-org/bwindels/aliasrefinements 

Fixes for removing local alias
pull/21833/head
Bruno Windels 2020-03-12 11:29:33 +00:00 committed by GitHub
parent 1a1782fc06 cccf7cd07f
commit 6b552e5ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/views/room_settings/AliasSettings.js
View File

@ -235,7 +235,7 @@ export default class AliasSettings extends React.Component {
// to this room. See https://github.com/vector-im/riot-web/issues/7353 // to this room. See https://github.com/vector-im/riot-web/issues/7353
MatrixClientPeg.get().deleteAlias(alias).then(() => { MatrixClientPeg.get().deleteAlias(alias).then(() => {
const localAliases = this.state.localAliases.slice(); const localAliases = this.state.localAliases.slice();
localAliases.splice(index); localAliases.splice(index, 1);
this.setState({localAliases}); this.setState({localAliases});
if (this.state.canonicalAlias === alias) { if (this.state.canonicalAlias === alias) {
@ -243,12 +243,18 @@ export default class AliasSettings extends React.Component {
} }
}).catch((err) => { }).catch((err) => {
console.error(err); console.error(err);
Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, { let description;
title: _t("Error removing alias"), if (err.errcode === "M_FORBIDDEN") {
description: _t( description = _t("You don't have permission to delete the alias.");
} else {
description = _t(
"There was an error removing that alias. It may no longer exist or a temporary " + "There was an error removing that alias. It may no longer exist or a temporary " +
"error occurred.", "error occurred.",
), );
}
Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
title: _t("Error removing alias"),
description,
}); });
}); });
}; };

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

@ -1151,8 +1151,9 @@
"There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.", "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
"Error creating alias": "Error creating alias", "Error creating alias": "Error creating alias",
"There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.", "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
"Error removing alias": "Error removing alias", "You don't have permission to delete the alias.": "You don't have permission to delete the alias.",
"There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.", "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
"Error removing alias": "Error removing alias",
"Main address": "Main address", "Main address": "Main address",
"not specified": "not specified", "not specified": "not specified",
"This room has no local addresses": "This room has no local addresses", "This room has no local addresses": "This room has no local addresses",