pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with remote

Browse Source
This commit is contained in:
or-else
2022-08-09 15:16:43 -07:00
parent eac59ea11f 3922db3aa6
commit 81afca1efe
18 changed files with 220 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/de.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "abgelehnt",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/en.json
+8 -1
View File
@@ -1420,7 +1420,14 @@
"call_declined": {
"translation": "declined",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "disconnected",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": false,
"obsolete": false
}
src/i18n/es.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "rechazada",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/ex/base-en.json
+5 -1
View File
@@ -129,7 +129,11 @@
},
"call_declined": {
"defaultMessage": "declined",
"description": "Label for declined incoming call"
"description": "Label for declined call"
},
"call_disconnected": {
"defaultMessage": "disconnected",
"description": "Label for disconnected call"
},
"call_missed": {
"defaultMessage": "missed",
src/i18n/fr.json
+8 -1
View File
@@ -1385,7 +1385,7 @@
"call_declined": {
"translation": "",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": true,
"obsolete": false
},
@@ -1423,5 +1423,12 @@
"description": "Start video call",
"missing": true,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/ko.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "통화 거부",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/ro.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "refuzat",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/ru.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "отклонен",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/zh-TW.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "被拒",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/i18n/zh.json
+8 -1
View File
@@ -1420,8 +1420,15 @@
"call_declined": {
"translation": "被拒",
"defaultMessage": "declined",
"description": "Label for declined incoming call",
"description": "Label for declined call",
"missing": false,
"obsolete": false
},
"call_disconnected": {
"translation": "",
"defaultMessage": "disconnected",
"description": "Label for disconnected call",
"missing": true,
"obsolete": false
}
}
src/messages.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/widgets/call-message.jsx
+18 -7
View File
@@ -12,13 +12,24 @@ export default class CallMessage extends React.PureComponent {
const callIcon = this.props.incoming ?
(isCallDropped ? 'call_missed' : 'call_received') :
(isCallDropped ? 'call_missed_outgoing' : 'call_made');
const duration = isCallDropped ? (
this.props.incoming ? (this.props.callState == 'declined' ?
<FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined incoming call" /> :
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" />
) :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />
) : <span>{secondsToTime(this.props.duration / 1000)}</span>;
let duration;
if (isCallDropped) {
switch (this.props.callState) {
case 'declined':
duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
break;
case 'missed':
duration = this.props.incoming ?
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" /> :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />;
break;
default:
duration = <FormattedMessage id="call_disconnected" defaultMessage="disconnected" description="Label for disconnected call" />;
break;
}
} else {
duration = <span>{secondsToTime(this.props.duration / 1000)}</span>;
}
return <div className="call-message">
<div><i className="material-icons big gray">call</i></div>
<div className="flex-column narrow">
src/widgets/call-panel.jsx
+7
View File
@@ -62,6 +62,7 @@ class CallPanel extends React.PureComponent {
this.handleICEConnectionStateChangeEvent = this.handleICEConnectionStateChangeEvent.bind(this);
this.handleSignalingStateChangeEvent = this.handleSignalingStateChangeEvent.bind(this);
this.handleICEGatheringStateChangeEvent = this.handleICEGatheringStateChangeEvent.bind(this);
this.handleIceCandidateErrorEvent = this.handleIceCandidateErrorEvent.bind(this);
this.handleTrackEvent = this.handleTrackEvent.bind(this);
this.handleVideoOfferMsg = this.handleVideoOfferMsg.bind(this);
@@ -181,6 +182,7 @@ class CallPanel extends React.PureComponent {
this.state.pc.onsignalingstatechange = null;
this.state.pc.onicegatheringstatechange = null;
this.state.pc.onnegotiationneeded = null;
this.state.pc.onicecandidateerror = null;
this.state.pc.close();
}
@@ -216,6 +218,7 @@ class CallPanel extends React.PureComponent {
pc.onicegatheringstatechange = this.handleICEGatheringStateChangeEvent;
pc.onsignalingstatechange = this.handleSignalingStateChangeEvent;
pc.onnegotiationneeded = this.handleNegotiationNeededEvent;
pc.onicecandidateerror = this.handleIceCandidateErrorEvent;
pc.ontrack = this.handleTrackEvent;
this.setState({pc: pc, waitingForPeer: false});
@@ -254,6 +257,10 @@ class CallPanel extends React.PureComponent {
.catch(this.reportError);
}
handleIceCandidateErrorEvent(event) {
console.log('ICE candidate error: ', event);
}
handleICECandidateEvent(event) {
if (event.candidate) {
this.props.onIceCandidate(this.props.topic, this.props.seq, event.candidate.toJSON());
src/widgets/call-status.jsx
+18 -7
View File
@@ -13,13 +13,24 @@ export default class CallStatus extends React.PureComponent {
const icon2 = this.props.incoming ?
(isCallDropped ? 'call_missed' : 'call_received') :
(isCallDropped ? 'call_missed_outgoing' : 'call_made');
const duration = isCallDropped ? (
this.props.incoming ? (this.props.callState == 'declined' ?
<FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined incoming call" /> :
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" />
) :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />
) : <span>{secondsToTime(this.props.duration / 1000)}</span>;
let duration;
if (isCallDropped) {
switch (this.props.callState) {
case 'declined':
duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
break;
case 'missed':
duration = this.props.incoming ?
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" /> :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />;
break;
default:
duration = <FormattedMessage id="call_disconnected" defaultMessage="disconnected" description="Label for disconnected call" />;
break;
}
} else {
duration = <span>{secondsToTime(this.props.duration / 1000)}</span>;
}
return (
<>
<div className="composed-material">
umd/index.dev.js
+96 -39
View File
File diff suppressed because one or more lines are too long
umd/index.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long