From 4b964f897ff9ed70c72de27a3ac1f210434023ca Mon Sep 17 00:00:00 2001
From: Ramon Souza <contato@ramonsouza.com>
Date: Fri, 4 Jun 2021 13:37:07 -0300
Subject: [PATCH] improve 'meeting ended by user' message
---
.../ui/components/meeting-ended/component.jsx | 14 +++++---------
bigbluebutton-html5/public/locales/en.json | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
index e49636a086..4ff69b97cc 100755
--- a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
@@ -220,17 +220,13 @@ class MeetingEnded extends PureComponent {
<div className={styles.modal}>
<div className={styles.content}>
<h1 className={styles.title} data-test="meetingEndedModalTitle">
- {
- intl.formatMessage(intlMessage[code] || intlMessage[430])
- }
+ {this.meetingEndedBy
+ ? intl.formatMessage(intlMessage.messageEndedByUser, { 0: this.meetingEndedBy })
+ : intl.formatMessage(intlMessage[code] || intlMessage[430])}
</h1>
{!allowRedirectToLogoutURL() ? null : (
<div>
- {this.meetingEndedBy ? (
- <div className={styles.text}>
- {intl.formatMessage(intlMessage.messageEndedByUser, { 0: this.meetingEndedBy })}
- </div>
- ) : null}
+
<div className={styles.text}>
{intl.formatMessage(intlMessage.messageEnded)}
</div>
@@ -294,7 +290,7 @@ class MeetingEnded extends PureComponent {
/>
) : null}
</div>
- ) : null }
+ ) : null}
{noRating && allowRedirectToLogoutURL() ? (
<Button
color="primary"
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index a8d445b5c2..572eb96d86 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -139,7 +139,7 @@
"app.meeting.ended": "This session has ended",
"app.meeting.meetingTimeRemaining": "Meeting time remaining: {0}",
"app.meeting.meetingTimeHasEnded": "Time ended. Meeting will close soon",
- "app.meeting.endedByUserMessage": "The meeting was ended by {0}",
+ "app.meeting.endedByUserMessage": "This session was ended by {0}",
"app.meeting.endedMessage": "You will be forwarded back to the home screen",
"app.meeting.alertMeetingEndsUnderMinutesSingular": "Meeting is closing in one minute.",
"app.meeting.alertMeetingEndsUnderMinutesPlural": "Meeting is closing in {0} minutes.",
--
GitLab