From d8533a86b39fbf0d0c236b4663ee1e00ab1da2e7 Mon Sep 17 00:00:00 2001
From: Oleksandr Zhurbenko <xaerok.od.ua@gmail.com>
Date: Wed, 3 Jan 2018 12:25:13 -0800
Subject: [PATCH] Changed the message displayed to the kicked user
Fixes #4863
---
.../imports/ui/components/app/container.jsx | 15 +++++++--------
bigbluebutton-html5/private/locales/en.json | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx
index 88abd7c9b6..97e71e99e6 100644
--- a/bigbluebutton-html5/imports/ui/components/app/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx
@@ -27,7 +27,7 @@ const propTypes = {
navbar: PropTypes.node,
actionsbar: PropTypes.node,
media: PropTypes.node,
- location: PropTypes.object.isRequired,
+ location: PropTypes.shape({}).isRequired,
};
const defaultProps = {
@@ -39,7 +39,7 @@ const defaultProps = {
const intlMessages = defineMessages({
kickedMessage: {
id: 'app.error.kicked',
- description: 'Message when the user is kicked out of the meeting',
+ description: 'Message when the user is removed from the conference',
},
waitingApprovalMessage: {
id: 'app.guest.waiting',
@@ -72,8 +72,7 @@ const AppContainer = (props) => {
);
};
-export default withRouter(injectIntl(withModalMounter(createContainer((
- { router, intl, baseControls }) => {
+export default withRouter(injectIntl(withModalMounter(createContainer(({ router, intl, baseControls }) => {
const currentUser = Users.findOne({ userId: Auth.userID });
const isMeetingBreakout = meetingIsBreakout();
@@ -84,10 +83,10 @@ export default withRouter(injectIntl(withModalMounter(createContainer((
// Displayed error messages according to the mode (kicked, end meeting)
const sendToError = (code, message) => {
Auth.clearCredentials()
- .then(() => {
- router.push(`/error/${code}`);
- baseControls.updateErrorState(message);
- });
+ .then(() => {
+ router.push(`/error/${code}`);
+ baseControls.updateErrorState(message);
+ });
};
// Check if user is kicked out of the session
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 728ec78ae3..fdc5c9adb4 100644
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -261,7 +261,7 @@
"app.audio.listenOnly.closeLabel": "Close",
"app.audio.permissionsOverlay.title": "Allow BigBlueButton to use your Media Devices",
"app.audio.permissionsOverlay.hint": "We need you to allow us to use your Media Devices in order to join you to the voice conference :)",
- "app.error.kicked": "You have been kicked out of the meeting",
+ "app.error.kicked": "You have been removed from the conference",
"app.error.meeting.ended": "You have logged out of the conference",
"app.dropdown.close": "Close",
"app.error.500": "Ops, something went wrong",
--
GitLab