From b09c7f97e965fe7ca9d2576bd843f32486faa4c9 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 15 Apr 2019 14:43:37 +0200 Subject: [PATCH] implement most of new messages --- src/components/views/rooms/RoomPreviewBar.js | 218 +++++-------------- src/i18n/strings/en_EN.json | 39 ++-- 2 files changed, 77 insertions(+), 180 deletions(-) diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js index 9d1ed44127..850fb0d32d 100644 --- a/src/components/views/rooms/RoomPreviewBar.js +++ b/src/components/views/rooms/RoomPreviewBar.js @@ -32,7 +32,7 @@ const MessageCase = Object.freeze({ Kicked: "Kicked", Banned: "Banned", OtherThreePIDError: "OtherThreePIDError", - MismatchThreePIDInvite: "MismatchThreePIDInvite", + InvitedEmailMismatch: "InvitedEmailMismatch", Invite: "Invite", ViewingRoom: "ViewingRoom", RoomNotFound: "RoomNotFound", @@ -122,7 +122,7 @@ module.exports = React.createClass({ if (this.state.threePidFetchError) { return MessageCase.OtherThreePIDError; } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) { - return MessageCase.MismatchThreePIDInvite; + return MessageCase.InvitedEmailMismatch; } } return MessageCase.Invite; @@ -162,6 +162,8 @@ module.exports = React.createClass({ }, render: function() { + const name = this.props.roomAlias || _t("This room"); + let showSpinner = false; let darkStyle = false; let title; @@ -186,205 +188,89 @@ module.exports = React.createClass({ darkStyle = true; title = _t("Join the conversation with an account"); primaryActionLabel = _t("Sign Up"); - primaryActionLabel = this.props.onSignUpClick; + primaryActionHandler = this.props.onSignUpClick; secondaryActionLabel = _t("Sign In"); - secondaryActionLabel = this.props.onSignInClick; + secondaryActionHandler = this.props.onSignInClick; break; } case MessageCase.Kicked: { - const info = this._getKickOrBanInfo(); - title = _t("You were kicked from this room by %(memberName)", info); - subTitle = _t("Reason: %(reason)", info); + const {memberName, reason} = this._getKickOrBanInfo(); + title = _t("You were kicked from this room by %(memberName)s", {memberName}); + subTitle = _t("Reason: %(reason)s", {reason}); primaryActionLabel = _t("Re-join"); - primaryActionLabel = this.props.onJoinClick; + primaryActionHandler = this.props.onJoinClick; secondaryActionLabel = _t("Forget this room"); - secondaryActionLabel = this.props.onForgetClick; + secondaryActionHandler = this.props.onForgetClick; break; } case MessageCase.Banned: { - const info = this._getKickOrBanInfo(); - title = _t("You were banned from this room by %(memberName)", info); - subTitle = _t("Reason: %(reason)", info); + const {memberName, reason} = this._getKickOrBanInfo(); + title = _t("You were banned from this room by %(memberName)s", {memberName}); + subTitle = _t("Reason: %(reason)s", {reason}); primaryActionLabel = _t("Forget this room"); - primaryActionLabel = this.props.onForgetClick; + primaryActionHandler = this.props.onForgetClick; break; } case MessageCase.OtherThreePIDError: { + // "Unable to ascertain that the address this invite was sent to matches one associated with your account." + // need to show invited by "name", join buttons here? break; } - case MessageCase.MismatchThreePIDInvite: { + case MessageCase.InvitedEmailMismatch: { title = _t("The room invite wasn't sent to your account"); - subTitle = _t("Sign in with a different account, ask for another invite, or add the e-mail address %(email) to this account.", {email: this.props.invitedEmail}); + subTitle = _t("Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.", {email: this.props.invitedEmail}); break; } case MessageCase.Invite: { - title = _t("%(memberName) invited you to this room", {memberName: this.props.inviterName}); + if (this.props.canPreview) { + title = _t("%(memberName)s invited you to this room", {memberName: this.props.inviterName}); + } else { + title = _t("Do you want to join this room?"); + subTitle = _t("%(memberName)s invited you", {memberName: this.props.inviterName}); + } primaryActionLabel = _t("Accept"); - primaryActionLabel = this.props.onJoinClick; + primaryActionHandler = this.props.onJoinClick; secondaryActionLabel = _t("Reject"); - secondaryActionLabel = this.props.onRejectClick; + secondaryActionHandler = this.props.onRejectClick; break; } case MessageCase.ViewingRoom: { if (this.props.canPreview) { - title = _t("You are previewing this room. Want to join it?"); + title = _t("You're previewing this room. Want to join it?"); } else { title = _t("This room can't be previewed. Do you want to join it?"); } - - title = _t("%(memberName) invited you to this room", {memberName: this.props.inviterName}); - primaryActionLabel = _t("Accept"); - primaryActionLabel = this.props.onJoinClick; - secondaryActionLabel = _t("Reject"); - secondaryActionLabel = this.props.onRejectClick; + primaryActionLabel = _t("Join the discussion"); + primaryActionHandler = this.props.onJoinClick; break; } case MessageCase.RoomNotFound: { + title = _t("%(roomName)s does not exist.", {roomName: name}); + subTitle = _t("This room doesn't exist. Are you sure you're at the right place?"); break; } case MessageCase.OtherError: { + title = _t("%(roomName)s is not accessible at this time.", {roomName: name}); + subTitle = ([ +

{ _t("Try again later, or ask a room admin to check if you have access.") }

, +

{ _t("If you think you're seeing this message in error, please submit a bug report.", {}, { + issueLink: label => { label }, + }) }

, + ]); break; } } - let joinBlock; let previewBlock; + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - if (this.props.spinner || this.state.busy) { - let spinnerIntro = ""; - if (this.props.spinnerState === "joining") { - spinnerIntro = _t("Joining room..."); - } - return (
-

{ spinnerIntro }

- -
); - } - - const myMember = this.props.room ? - this.props.room.getMember(MatrixClientPeg.get().getUserId()) : - null; - const kicked = myMember && myMember.isKicked(); - const banned = myMember && myMember && myMember.membership == 'ban'; - - if (this.props.inviterName) { - let emailMatchBlock; - if (this.props.invitedEmail) { - if (this.state.threePidFetchError) { - emailMatchBlock =
- { _t("Unable to ascertain that the address this invite was sent to matches one associated with your account.") } -
; - } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) { - emailMatchBlock = -
-
- /!\\ -
-
- { _t("This invitation was sent to an email address which is not associated with this account:") } - { this.props.invitedEmail } -
- { _t("You may wish to login with a different account, or add this email to this account.") } -
-
; - } - } - joinBlock = ( -
-
- { _t('You have been invited to join this room by %(inviterName)s', {inviterName: this.props.inviterName}) } -
-
- { _t( - 'Would you like to accept or decline this invitation?', - {}, - { - 'acceptText': (sub) => { sub }, - 'declineText': (sub) => { sub }, - }, - ) } -
- { emailMatchBlock } -
- ); - } else if (kicked || banned) { - const roomName = this._roomNameElement(); - const kickerMember = this.props.room.currentState.getMember( - myMember.events.member.getSender(), - ); - const kickerName = kickerMember ? - kickerMember.name : myMember.events.member.getSender(); - let reason; - if (myMember.events.member.getContent().reason) { - reason =
{ _t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason}) }
; - } - let rejoinBlock; - if (!banned) { - rejoinBlock =
{ _t("Rejoin") }
; - } - - let actionText; - if (kicked) { - if (roomName) { - actionText = _t("You have been kicked from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName}); - } else { - actionText = _t("You have been kicked from this room by %(userName)s.", {userName: kickerName}); - } - } else if (banned) { - if (roomName) { - actionText = _t("You have been banned from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName}); - } else { - actionText = _t("You have been banned from this room by %(userName)s.", {userName: kickerName}); - } - } // no other options possible due to the kicked || banned check above. - - joinBlock = ( -
-
- { actionText } -
- { reason } - { rejoinBlock } - { _t("Forget room") } -
-
- ); - } else if (this.props.error) { - const name = this.props.roomAlias || _t("This room"); - let error; - if (this.props.error.errcode == 'M_NOT_FOUND') { - error = _t("%(roomName)s does not exist.", {roomName: name}); + let subTitleElements; + if (subTitle) { + if (Array.isArray(subTitle)) { + subTitleElements = subTitle; } else { - error = _t("%(roomName)s is not accessible at this time.", {roomName: name}); + subTitleElements = [

{ subTitle }

]; } - joinBlock = ( -
-
- { error } -
-
- ); - } else { - const name = this._roomNameElement(); - joinBlock = ( -
-
- { name ? _t('You are trying to access %(roomName)s.', {roomName: name}) : _t('You are trying to access a room.') } -
- { _t("Click here to join the discussion!", - {}, - { 'a': (sub) => { sub } }, - ) } -
-
- ); - } - - if (this.props.canPreview) { - previewBlock = ( -
- { _t('This is a preview of this room. Room interactions have been disabled') }. -
- ); } const classes = classNames("mx_RoomPreviewBar", "dark-panel", { @@ -394,11 +280,17 @@ module.exports = React.createClass({ return (
-
- { joinBlock } - { previewBlock } +
+

{ title }

+ { subTitleElements } +
+
+ { secondaryActionHandler ? { secondaryActionLabel } : undefined } + { primaryActionHandler ? { primaryActionLabel } : undefined }
); + + }, }); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 8e3f0d9f6e..a58601f319 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -789,25 +789,31 @@ "Low priority": "Low priority", "Historical": "Historical", "System Alerts": "System Alerts", - "Joining room...": "Joining room...", - "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.", - "This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:", - "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.", - "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(inviterName)s", - "Would you like to accept or decline this invitation?": "Would you like to accept or decline this invitation?", - "Reason: %(reasonText)s": "Reason: %(reasonText)s", - "Rejoin": "Rejoin", - "You have been kicked from %(roomName)s by %(userName)s.": "You have been kicked from %(roomName)s by %(userName)s.", - "You have been kicked from this room by %(userName)s.": "You have been kicked from this room by %(userName)s.", - "You have been banned from %(roomName)s by %(userName)s.": "You have been banned from %(roomName)s by %(userName)s.", - "You have been banned from this room by %(userName)s.": "You have been banned from this room by %(userName)s.", "This room": "This room", + "Joining room...": "Joining room...", + "In progress ...": "In progress ...", + "Join the conversation with an account": "Join the conversation with an account", + "Sign Up": "Sign Up", + "Sign In": "Sign In", + "You were kicked from this room by %(memberName)s": "You were kicked from this room by %(memberName)s", + "Reason: %(reason)s": "Reason: %(reason)s", + "Re-join": "Re-join", + "Forget this room": "Forget this room", + "You were banned from this room by %(memberName)s": "You were banned from this room by %(memberName)s", + "The room invite wasn't sent to your account": "The room invite wasn't sent to your account", + "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.", + "%(memberName)s invited you to this room": "%(memberName)s invited you to this room", + "Do you want to join this room?": "Do you want to join this room?", + "%(memberName)s invited you": "%(memberName)s invited you", + "Reject": "Reject", + "You're previewing this room. Want to join it?": "You're previewing this room. Want to join it?", + "This room can't be previewed. Do you want to join it?": "This room can't be previewed. Do you want to join it?", + "Join the discussion": "Join the discussion", "%(roomName)s does not exist.": "%(roomName)s does not exist.", + "This room doesn't exist. Are you sure you're at the right place?": "This room doesn't exist. Are you sure you're at the right place?", "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.", - "You are trying to access %(roomName)s.": "You are trying to access %(roomName)s.", - "You are trying to access a room.": "You are trying to access a room.", - "Click here to join the discussion!": "Click here to join the discussion!", - "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled", + "Try again later, or ask a room admin to check if you have access.": "Try again later, or ask a room admin to check if you have access.", + "If you think you're seeing this message in error, please submit a bug report.": "If you think you're seeing this message in error, please submit a bug report.", "Use Key Backup": "Use Key Backup", "Never lose encrypted messages": "Never lose encrypted messages", "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.", @@ -1242,7 +1248,6 @@ "Reject invitation": "Reject invitation", "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?", "Unable to reject invite": "Unable to reject invite", - "Reject": "Reject", "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)", "Resend": "Resend", "Cancel Sending": "Cancel Sending",