diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx index f00567db3adecb25eda027706f59ee0379acd33c..3d1475173cbd417c6bd9004464daa95a68a56f51 100755 --- a/bigbluebutton-html5/imports/startup/client/base.jsx +++ b/bigbluebutton-html5/imports/startup/client/base.jsx @@ -17,7 +17,6 @@ import mapUser from '/imports/ui/services/user/mapUser'; import { Session } from 'meteor/session'; import IntlStartup from './intl'; import Meetings from '../../api/meetings'; -import AppService from '/imports/ui/components/app/service'; import AnnotationsTextService from '/imports/ui/components/whiteboard/annotations/text/service'; import Breakouts from '/imports/api/breakouts'; import AudioService from '/imports/ui/components/audio/service'; @@ -32,10 +31,10 @@ const HTML = document.getElementsByTagName('html')[0]; let breakoutNotified = false; const propTypes = { - subscriptionsReady: PropTypes.bool.isRequired, + subscriptionsReady: PropTypes.bool, locale: PropTypes.string, approved: PropTypes.bool, - meetingHasEnded: PropTypes.bool.isRequired, + meetingHasEnded: PropTypes.bool, meetingExist: PropTypes.bool, }; @@ -43,6 +42,8 @@ const defaultProps = { locale: undefined, approved: undefined, meetingExist: false, + subscriptionsReady: false, + meetingHasEnded: false, }; const fullscreenChangedEvents = [ @@ -367,7 +368,6 @@ const BaseContainer = withTracker(() => { meteorIsConnected: Meteor.status().connected, meetingExist: !!meeting, meetingHasEnded: !!meeting && meeting.meetingEnded, - meetingIsBreakout: AppService.meetingIsBreakout(), }; })(Base); diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx index 80679181ed37e88e8af1cbae1e466888aaa02d90..bfcf865a4eceb677c70f2948cabeace51ab48e2b 100644 --- a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx @@ -12,6 +12,9 @@ const intlMessages = defineMessages({ id: 'app.error.500', defaultMessage: 'Ops, something went wrong', }, + 410: { + id: 'app.error.410', + }, 404: { id: 'app.error.404', defaultMessage: 'Not found', diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json index 352761bb03d38616521f68d27c2f6fbf22162aab..abbc6052c8a4b81b4f415bba8f51989258bf9303 100755 --- a/bigbluebutton-html5/private/locales/en.json +++ b/bigbluebutton-html5/private/locales/en.json @@ -393,13 +393,14 @@ "app.meeting.logout.validateTokenFailedEjectReason": "Failed to validate authorization token", "app.meeting.logout.userInactivityEjectReason": "User inactive for too long", "app.dropdown.close": "Close", - "app.error.500": "Ops, something went wrong", - "app.error.404": "Not found", - "app.error.401": "Unauthorized", - "app.error.403": "Forbidden", "app.error.400": "Bad Request", + "app.error.401": "Unauthorized", + "app.error.403": "You have been removed from the meeting", + "app.error.404": "Not found", + "app.error.410": "Meeting has ended", + "app.error.500": "Ops, something went wrong", "app.error.leaveLabel": "Log in again", - "app.error.fallback.presentation.title": "An error occured", + "app.error.fallback.presentation.title": "An error occurred", "app.error.fallback.presentation.description": "It has been logged. Please try reloading the page.", "app.error.fallback.presentation.reloadButton": "Reload", "app.guest.waiting": "Waiting for approval to join",