Co-authored-by: Tobias Fiebig <t.fiebig@tudelft.nl> (#1296)

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
This commit is contained in:
yanosz
2020-06-29 19:43:12 +02:00
committed by GitHub
parent 9a96df6a37
commit 2e4010aed8
12 changed files with 109 additions and 31 deletions

View File

@ -52,16 +52,16 @@ module Greenlight
# Use standalone BigBlueButton server.
config.bigbluebutton_endpoint = if ENV["BIGBLUEBUTTON_ENDPOINT"].present?
ENV["BIGBLUEBUTTON_ENDPOINT"]
else
config.bigbluebutton_endpoint_default
end
ENV["BIGBLUEBUTTON_ENDPOINT"]
else
config.bigbluebutton_endpoint_default
end
config.bigbluebutton_secret = if ENV["BIGBLUEBUTTON_SECRET"].present?
ENV["BIGBLUEBUTTON_SECRET"]
else
config.bigbluebutton_secret_default
end
ENV["BIGBLUEBUTTON_SECRET"]
else
config.bigbluebutton_secret_default
end
# Fix endpoint format if required.
config.bigbluebutton_endpoint += "/" unless config.bigbluebutton_endpoint.ends_with?('/')
@ -144,12 +144,12 @@ module Greenlight
# Default registration method if the user does not specify one
config.registration_method_default = if ENV["DEFAULT_REGISTRATION"] == "invite"
config.registration_methods[:invite]
elsif ENV["DEFAULT_REGISTRATION"] == "approval"
config.registration_methods[:approval]
else
config.registration_methods[:open]
end
config.registration_methods[:invite]
elsif ENV["DEFAULT_REGISTRATION"] == "approval"
config.registration_methods[:approval]
else
config.registration_methods[:open]
end
# Default limit on number of rooms users can create
config.number_of_rooms_default = 15

View File

@ -156,6 +156,8 @@ en:
info: Allows any user to start the meeting at any time. By default, only the room owner can start the meeting.
all_moderator:
info: Gives all users moderator privileges in BigBlueButton when they join the meeting.
recordings:
info: Records a recording of the room and enables moderators to set recording markers
options:
disabled: Disabled
enabled: Always Enabled
@ -409,10 +411,13 @@ en:
update: Update Room
client: Select client type
join_moderator: All users join as moderators
recordings: Enable room recordings
mute: Mute users when they join
require_approval: Require moderator approval before joining
start: Allow any user to start this meeting
footer_text: Adjustment to your room can be done at anytime.
recording: Record sessions
session_active: Active session
rename_room:
name_placeholder: Enter a new room name...
share_access:
@ -517,6 +522,7 @@ en:
enter_the_access_code: Enter the room's access code
invalid_provider: You have entered an invalid url. Please check the url and try again.
invited: You have been invited to join
recording_present: The session is going to be recorded. This includes voice and video from your side.
invite_participants: Invite Participants
join: Join
last_session: Last session on %{session}