Update ICE fallback text

pull/21833/head
J. Ryan Stinnett 2019-08-15 15:04:17 +01:00
parent d610bfc5e5
commit adc3c69022
2 changed files with 21 additions and 24 deletions

View File

@ -151,7 +151,7 @@ function _setCallListeners(call) {
MatrixClientPeg.get().getTurnServers().length === 0 && MatrixClientPeg.get().getTurnServers().length === 0 &&
SettingsStore.getValue("fallbackICEServerAllowed") === null SettingsStore.getValue("fallbackICEServerAllowed") === null
) { ) {
_showICEFallbackPrompt(_t("Call Failed")); _showICEFallbackPrompt();
return; return;
} }
@ -225,32 +225,29 @@ function _setCallState(call, roomId, status) {
}); });
} }
function _showICEFallbackPrompt(title) { function _showICEFallbackPrompt() {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
const code = sub => <code>{sub}</code>; const code = sub => <code>{sub}</code>;
Modal.createTrackedDialog('No TURN servers', '', QuestionDialog, { Modal.createTrackedDialog('No TURN servers', '', QuestionDialog, {
title, title: _t("Call failed due to misconfigured server"),
description: <div> description: <div>
<p>{ _t( <p>{_t(
"Your homeserver <code>%(homeserverDomain)s</code> is " + "Please ask the administrator of your homeserver " +
"currently not configured to assist with calls by offering a " + "(<code>%(homeserverDomain)s</code>) to configure a TURN server in " +
"TURN server, which means it is likely that voice and video " + "order for calls to work reliably.",
"calls will fail. Please notify your homeserver administrator " +
"so that they can address this.",
{ homeserverDomain: cli.getDomain() }, { code }, { homeserverDomain: cli.getDomain() }, { code },
) }</p> )}</p>
<p>{ _t( <p>{_t(
"Riot can use a fallback server <code>turn.matrix.org</code> " + "Alternatively, you can try to use the public server at " +
"if you urgently need to make a call. Your IP address would be " + "<code>turn.matrix.org</code>, but this will not be as reliable, and " +
"shared with this fallback server only if you agree and later " + "it will share your IP address with that server. You can also manage " +
"place or receive a call. You can change this permission later " + "this in Settings.",
"in the Voice & Video section of Settings.",
null, { code }, null, { code },
)}</p> )}</p>
</div>, </div>,
button: _t('Allow Fallback'), button: _t('Try using turn.matrix.org'),
cancelButton: _t('Dismiss'), cancelButton: _t('OK'),
onFinished: (allow) => { onFinished: (allow) => {
SettingsStore.setValue("fallbackICEServerAllowed", null, SettingLevel.DEVICE, allow); SettingsStore.setValue("fallbackICEServerAllowed", null, SettingLevel.DEVICE, allow);
cli.setFallbackICEServerAllowed(allow); cli.setFallbackICEServerAllowed(allow);

View File

@ -28,16 +28,16 @@
"Answer": "Answer", "Answer": "Answer",
"Call Timeout": "Call Timeout", "Call Timeout": "Call Timeout",
"The remote side failed to pick up": "The remote side failed to pick up", "The remote side failed to pick up": "The remote side failed to pick up",
"Your homeserver <code>%(homeserverDomain)s</code> is currently not configured to assist with calls by offering a TURN server, which means it is likely that voice and video calls will fail. Please notify your homeserver administrator so that they can address this.": "Your homeserver <code>%(homeserverDomain)s</code> is currently not configured to assist with calls by offering a TURN server, which means it is likely that voice and video calls will fail. Please notify your homeserver administrator so that they can address this.", "Call failed due to misconfigured server": "Call failed due to misconfigured server",
"Riot can use a fallback server <code>turn.matrix.org</code> if you urgently need to make a call. Your IP address would be shared with this fallback server only if you agree and later place or receive a call. You can change this permission later in the Voice & Video section of Settings.": "Riot can use a fallback server <code>turn.matrix.org</code> if you urgently need to make a call. Your IP address would be shared with this fallback server only if you agree and later place or receive a call. You can change this permission later in the Voice & Video section of Settings.", "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
"Allow Fallback": "Allow Fallback", "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.",
"Dismiss": "Dismiss", "Try using turn.matrix.org": "Try using turn.matrix.org",
"OK": "OK",
"Unable to capture screen": "Unable to capture screen", "Unable to capture screen": "Unable to capture screen",
"Existing Call": "Existing Call", "Existing Call": "Existing Call",
"You are already in a call.": "You are already in a call.", "You are already in a call.": "You are already in a call.",
"VoIP is unsupported": "VoIP is unsupported", "VoIP is unsupported": "VoIP is unsupported",
"You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.", "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
"Homeserver not configured to support calls": "Homeserver not configured to support calls",
"You cannot place a call with yourself.": "You cannot place a call with yourself.", "You cannot place a call with yourself.": "You cannot place a call with yourself.",
"Could not connect to the integration server": "Could not connect to the integration server", "Could not connect to the integration server": "Could not connect to the integration server",
"A conference call could not be started because the integrations server is not available": "A conference call could not be started because the integrations server is not available", "A conference call could not be started because the integrations server is not available": "A conference call could not be started because the integrations server is not available",
@ -99,6 +99,7 @@
"Unnamed Room": "Unnamed Room", "Unnamed Room": "Unnamed Room",
"Error": "Error", "Error": "Error",
"Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.", "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
"Dismiss": "Dismiss",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
"Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
"Unable to enable Notifications": "Unable to enable Notifications", "Unable to enable Notifications": "Unable to enable Notifications",
@ -383,7 +384,6 @@
"Decline": "Decline", "Decline": "Decline",
"Accept": "Accept", "Accept": "Accept",
"The other party cancelled the verification.": "The other party cancelled the verification.", "The other party cancelled the verification.": "The other party cancelled the verification.",
"OK": "OK",
"Verified!": "Verified!", "Verified!": "Verified!",
"You've successfully verified this user.": "You've successfully verified this user.", "You've successfully verified this user.": "You've successfully verified this user.",
"Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.", "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",