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

Merge pull request #6545 from SimonBrandner/feature/update-tile-copy/18376 

Improve call event tile wording
pull/21833/head
Dariusz Niemczyk 2021-08-04 15:55:26 +02:00 committed by GitHub
parent c848b8f486 a04a8006fc
commit 139a4028a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/messages/CallEvent.tsx
View File

@ -25,7 +25,6 @@ import { CallErrorCode, CallState } from 'matrix-js-sdk/src/webrtc/call';
import InfoTooltip, { InfoTooltipKind } from '../elements/InfoTooltip'; import InfoTooltip, { InfoTooltipKind } from '../elements/InfoTooltip';
import classNames from 'classnames'; import classNames from 'classnames';
import AccessibleTooltipButton from '../elements/AccessibleTooltipButton'; import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
interface IProps { interface IProps {
mxEvent: MatrixEvent; mxEvent: MatrixEvent;
@ -117,14 +116,12 @@ export default class CallEvent extends React.Component<IProps, IState> {
if (state === CallState.Ended) { if (state === CallState.Ended) {
const hangupReason = this.props.callEventGrouper.hangupReason; const hangupReason = this.props.callEventGrouper.hangupReason;
const gotRejected = this.props.callEventGrouper.gotRejected; const gotRejected = this.props.callEventGrouper.gotRejected;
const rejectParty = this.props.callEventGrouper.rejectParty;
if (gotRejected) { if (gotRejected) {
const weDeclinedCall = MatrixClientPeg.get().getUserId() === rejectParty;
return ( return (
<div className="mx_CallEvent_content"> <div className="mx_CallEvent_content">
{ weDeclinedCall ? _t("You declined this call") : _t("They declined this call") } { _t("Call declined") }
{ this.renderCallBackButton(weDeclinedCall ? _t("Call back") : _t("Call again")) } { this.renderCallBackButton(_t("Call back")) }
</div> </div>
); );
} else if (([CallErrorCode.UserHangup, "user hangup"].includes(hangupReason) || !hangupReason)) { } else if (([CallErrorCode.UserHangup, "user hangup"].includes(hangupReason) || !hangupReason)) {
@ -136,14 +133,14 @@ export default class CallEvent extends React.Component<IProps, IState> {
// Also, if we don't have a reason // Also, if we don't have a reason
return ( return (
<div className="mx_CallEvent_content"> <div className="mx_CallEvent_content">
{ _t("This call has ended") } { _t("Call ended") }
</div> </div>
); );
} else if (hangupReason === CallErrorCode.InviteTimeout) { } else if (hangupReason === CallErrorCode.InviteTimeout) {
return ( return (
<div className="mx_CallEvent_content"> <div className="mx_CallEvent_content">
{ _t("They didn't pick up") } { _t("Missed call") }
{ this.renderCallBackButton(_t("Call again")) } { this.renderCallBackButton(_t("Call back")) }
</div> </div>
); );
} }
@ -176,7 +173,8 @@ export default class CallEvent extends React.Component<IProps, IState> {
className="mx_CallEvent_content_tooltip" className="mx_CallEvent_content_tooltip"
kind={InfoTooltipKind.Warning} kind={InfoTooltipKind.Warning}
/> />
{ _t("This call has failed") } { _t("Connection failed") }
{ this.renderCallBackButton(_t("Retry")) }
</div> </div>
); );
} }
@ -190,7 +188,7 @@ export default class CallEvent extends React.Component<IProps, IState> {
if (state === CustomCallState.Missed) { if (state === CustomCallState.Missed) {
return ( return (
<div className="mx_CallEvent_content"> <div className="mx_CallEvent_content">
{ _t("You missed this call") } { _t("Missed call") }
{ this.renderCallBackButton(_t("Call back")) } { this.renderCallBackButton(_t("Call back")) }
</div> </div>
); );

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

@ -1864,19 +1864,15 @@
"Verification cancelled": "Verification cancelled", "Verification cancelled": "Verification cancelled",
"Compare emoji": "Compare emoji", "Compare emoji": "Compare emoji",
"Connected": "Connected", "Connected": "Connected",
"You declined this call": "You declined this call", "Call declined": "Call declined",
"They declined this call": "They declined this call",
"Call back": "Call back", "Call back": "Call back",
"Call again": "Call again", "Missed call": "Missed call",
"This call has ended": "This call has ended",
"They didn't pick up": "They didn't pick up",
"Could not connect media": "Could not connect media", "Could not connect media": "Could not connect media",
"Connection failed": "Connection failed", "Connection failed": "Connection failed",
"Their device couldn't start the camera or microphone": "Their device couldn't start the camera or microphone", "Their device couldn't start the camera or microphone": "Their device couldn't start the camera or microphone",
"An unknown error occurred": "An unknown error occurred", "An unknown error occurred": "An unknown error occurred",
"Unknown failure: %(reason)s)": "Unknown failure: %(reason)s)", "Unknown failure: %(reason)s)": "Unknown failure: %(reason)s)",
"This call has failed": "This call has failed", "Retry": "Retry",
"You missed this call": "You missed this call",
"The call is in an unknown state!": "The call is in an unknown state!", "The call is in an unknown state!": "The call is in an unknown state!",
"Sunday": "Sunday", "Sunday": "Sunday",
"Monday": "Monday", "Monday": "Monday",
@ -1899,7 +1895,6 @@
"Error processing audio message": "Error processing audio message", "Error processing audio message": "Error processing audio message",
"React": "React", "React": "React",
"Edit": "Edit", "Edit": "Edit",
"Retry": "Retry",
"Reply": "Reply", "Reply": "Reply",
"Message Actions": "Message Actions", "Message Actions": "Message Actions",
"Download %(text)s": "Download %(text)s", "Download %(text)s": "Download %(text)s",