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

Merge pull request #4497 from matrix-org/t3chguy/invite_copy

Browse source 
Update Invite Dialog copy to include email addresses
This commit is contained in:
Michael Telatynski 2020-05-06 18:16:36 +01:00 committed by GitHub
commit 62bbf15efe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/dialogs/InviteDialog.js
View file

@ -1070,9 +1070,8 @@ export default class InviteDialog extends React.PureComponent {
let buttonText; let buttonText;
let goButtonFn; let goButtonFn;
const userId = MatrixClientPeg.get().getUserId();
if (this.props.kind === KIND_DM) { if (this.props.kind === KIND_DM) {
const userId = MatrixClientPeg.get().getUserId();
title = _t("Direct Messages"); title = _t("Direct Messages");
helpText = _t( helpText = _t(
"Start a conversation with someone using their name, username (like <userId/>) or email address.", "Start a conversation with someone using their name, username (like <userId/>) or email address.",
@ -1086,9 +1085,11 @@ export default class InviteDialog extends React.PureComponent {
} else { // KIND_INVITE } else { // KIND_INVITE
title = _t("Invite to this room"); title = _t("Invite to this room");
helpText = _t( helpText = _t(
"If you can't find someone, ask them for their username (e.g. @user:server.com) or " + "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
"<a>share this room</a>.", {}, {},
{ {
userId: () =>
<a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
a: (sub) => a: (sub) =>
<a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>, <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
}, },

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

@ -1650,7 +1650,7 @@
"Recently Direct Messaged": "Recently Direct Messaged", "Recently Direct Messaged": "Recently Direct Messaged",
"Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.", "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
"Go": "Go", "Go": "Go",
"If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.", "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
"You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.", "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
"Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.", "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
"Start verification": "Start verification", "Start verification": "Start verification",