lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
Conversation 0 Commits 203 Files Changed 134 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1368bbc5e7 - Show all commits

2
app/models/setting.rb
View File

@ -66,7 +66,7 @@ class Setting < ApplicationRecord
Rails.configuration.shared_access_default Rails.configuration.shared_access_default
when "Preupload Presentation" when "Preupload Presentation"
Rails.configuration.preupload_presentation_default Rails.configuration.preupload_presentation_default
when "Moderator Access Codes" when "Room Configuration Moderator Access Codes"
Rails.configuration.moderator_codes_default Rails.configuration.moderator_codes_default
when "Room Configuration Mute On Join" when "Room Configuration Mute On Join"
room_config_setting("mute-on-join") room_config_setting("mute-on-join")

2
config/locales/en.yml
View File

@ -177,7 +177,7 @@ en:
info: Allows room owners to specify whether they want the option to record a room or not. If enabled, the moderator must still click the "Record" button once the meeting has started. info: Allows room owners to specify whether they want the option to record a room or not. If enabled, the moderator must still click the "Record" button once the meeting has started.
moderator_codes: moderator_codes:
info: Allows room owners to optionally generate a moderator pin which allows other users to join directly as moderators. info: Allows room owners to optionally generate a moderator pin which allows other users to join directly as moderators.
title: Enables the generation of moderator codes title: Moderator Access Code
options: options:
disabled: Disabled disabled: Disabled
enabled: Always Enabled enabled: Always Enabled