From 8d3418dfa99e6f0eb40f747990953ab684e53e6f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 6 Dec 2019 17:08:24 -0700 Subject: [PATCH 1/2] Update copy for DM invites Fixes https://github.com/vector-im/riot-web/issues/10766 --- src/components/views/rooms/RoomPreviewBar.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js index 513b867d4f..a43a4df158 100644 --- a/src/components/views/rooms/RoomPreviewBar.js +++ b/src/components/views/rooms/RoomPreviewBar.js @@ -451,16 +451,21 @@ module.exports = createReactClass({ if (isDM) { title = _t("Do you want to chat with %(user)s?", { user: inviteMember.name }); + subTitle = [ + avatar, + _t(" wants to chat", {}, {userName: () => inviterElement}), + ]; + primaryActionLabel = _t("Start chatting"); } else { title = _t("Do you want to join %(roomName)s?", { roomName: this._roomName() }); + subTitle = [ + avatar, + _t(" invited you", {}, {userName: () => inviterElement}), + ]; + primaryActionLabel = _t("Accept"); } - subTitle = [ - avatar, - _t(" invited you", {}, {userName: () => inviterElement}), - ]; - primaryActionLabel = _t("Accept"); primaryActionHandler = this.props.onJoinClick; secondaryActionLabel = _t("Reject"); secondaryActionHandler = this.props.onRejectClick; From 0e1d5daee4a799e0b01e0c156a8adf473e9ea44f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 6 Dec 2019 17:08:55 -0700 Subject: [PATCH 2/2] i18n --- src/i18n/strings/en_EN.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 182c761c5f..d1bd34860d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -980,6 +980,8 @@ "Use an identity server in Settings to receive invites directly in Riot.": "Use an identity server in Settings to receive invites directly in Riot.", "Share this email in Settings to receive invites directly in Riot.": "Share this email in Settings to receive invites directly in Riot.", "Do you want to chat with %(user)s?": "Do you want to chat with %(user)s?", + " wants to chat": " wants to chat", + "Start chatting": "Start chatting", "Do you want to join %(roomName)s?": "Do you want to join %(roomName)s?", " invited you": " invited you", "Reject": "Reject",