From 8b1eda92b6c3a724803bff2d3dd21ad159a338ed Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 16 May 2018 15:15:46 -0300
Subject: [PATCH] Create intlMediaErrorsMessages and add messages of errors
---
.../components/video-provider/component.jsx | 19 ++++++++++++++-----
bigbluebutton-html5/private/locales/en.json | 7 ++++---
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index 79ae66e7fc..dffb070c7f 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -16,10 +16,6 @@ const intlMessages = defineMessages({
id: 'app.video.iceCandidateError',
description: 'Error message for ice candidate fail',
},
- permissionError: {
- id: 'app.video.permissionError',
- description: 'Error message for webcam permission',
- },
sharingError: {
id: 'app.video.sharingError',
description: 'Error on sharing webcam',
@@ -32,6 +28,13 @@ const intlMessages = defineMessages({
id: 'app.video.chromeExtensionErrorLink',
description: 'Error message for Chrome Extension not installed',
},
+});
+
+const intlMediaErrorsMessages = defineMessages({
+ permissionError: {
+ id: 'app.video.permissionError',
+ description: 'Error message for webcam permission',
+ },
NotFoundError: {
id: 'app.video.notFoundError',
description: 'error message when can not get webcam video',
@@ -44,6 +47,10 @@ const intlMessages = defineMessages({
id: 'app.video.notSupportedError',
description: 'error message when origin do not have ssl valid',
},
+ NotReadableError: {
+ id: 'app.video.notReadableError',
+ description: 'error message when origin do not have ssl valid',
+ },
});
const CAMERA_SHARE_FAILED_WAIT_TIME = 10000;
@@ -376,7 +383,9 @@ class VideoProvider extends Component {
if (error) {
log('error', ' WebRTC peerObj create error');
log('error', error);
- const errorMessage = intlMessages[error.name] || intlMessages.permissionError;
+ console.error(error);
+ const errorMessage = intlMediaErrorsMessages[error.name]
+ || intlMediaErrorsMessages.permissionError;
that.notifyError(intl.formatMessage(errorMessage));
/* This notification error is displayed considering kurento-utils
* returned the error 'The request is not allowed by the user agent
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 3b39da2a6e..d7b2fd12d9 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -315,9 +315,10 @@
"app.video.iceCandidateError": "Error on adding ice candidate",
"app.video.permissionError": "Error on sharing webcam. Please check permissions",
"app.video.sharingError": "Error on sharing webcam",
- "app.video.notFoundError": "Could not get webcam video. Please make sure it's connected",
- "app.video.notAllowed": "missing permission for share webcam, please make sure your browser permissions",
- "app.video.notSupportedError": "can share webcam video only with safe sources, make sure your SSL certificate is valid",
+ "app.video.notFoundError": "Could not find webcam. Please make sure it's connected",
+ "app.video.notAllowed": "Missing permission for share webcam, please make sure your browser permissions",
+ "app.video.notSupportedError": "Can share webcam video only with safe sources, make sure your SSL certificate is valid",
+ "app.video.notReadableError": "Could not get webcam video. Please make sure another program is not using the webcam ",
"app.video.swapCam": "Swap",
"app.video.swapCamDesc": "swap the direction of webcams",
"app.video.videoMenu": "Video menu",
--
GitLab