From 0a09112f8015313f5db6d70c1c7eac82c1718f63 Mon Sep 17 00:00:00 2001 From: Ramon Souza <contato@ramonsouza.com> Date: Mon, 8 Mar 2021 16:14:09 -0300 Subject: [PATCH] split end meeting message in two parts --- .../components/end-meeting-confirmation/component.jsx | 11 ++++++++--- bigbluebutton-html5/private/locales/en.json | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx index 8a5d08e6c5..72bb68bf94 100644 --- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx @@ -12,6 +12,10 @@ const intlMessages = defineMessages({ }, endMeetingDescription: { id: 'app.endMeeting.description', + description: 'end meeting description with affected users information', + }, + endMeetingNoUserDescription: { + id: 'app.endMeeting.noUserDescription', description: 'end meeting description', }, yesLabel: { @@ -40,8 +44,6 @@ class EndMeetingComponent extends React.PureComponent { users, intl, closeModal, endMeeting, meetingTitle, } = this.props; - const message = intl.formatMessage(intlMessages.endMeetingDescription, { 0: users }).split('.'); - return ( <Modal overlayClassName={styles.overlay} @@ -52,7 +54,10 @@ class EndMeetingComponent extends React.PureComponent { > <div className={styles.container}> <div className={styles.description}> - {users > 0 ? message.join('.') : message[1]} + {users > 0 + ? intl.formatMessage(intlMessages.endMeetingDescription, { 0: users }) + : intl.formatMessage(intlMessages.endMeetingNoUserDescription) + } </div> <div className={styles.footer}> <Button diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json index 69b7b70442..4e0dc1eb55 100755 --- a/bigbluebutton-html5/private/locales/en.json +++ b/bigbluebutton-html5/private/locales/en.json @@ -303,6 +303,7 @@ "app.leaveConfirmation.confirmDesc": "Logs you out of the meeting", "app.endMeeting.title": "End {0}", "app.endMeeting.description": "This action will end the session for {0} active user(s). Are you sure you want to end this session?", + "app.endMeeting.noUserDescription": "Are you sure you want to end this session?", "app.endMeeting.yesLabel": "Yes", "app.endMeeting.noLabel": "No", "app.about.title": "About", -- GitLab