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

Added missing question mark (#2234) 

* Added missing question mark

* Made bigbluebutton name variable
This commit is contained in:
Ahmad Farhat 2020-10-26 15:27:49 -04:00 committed by GitHub
parent 68716bc6f3
commit 23b08853db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admins_controller.rb
View File

@ -74,7 +74,7 @@ class AdminsController < ApplicationController
begin begin
meetings = all_running_meetings[:meetings] meetings = all_running_meetings[:meetings]
rescue rescue
flash[:alert] = I18n.t("administrator.rooms.timeout") flash[:alert] = I18n.t("administrator.rooms.timeout", server: I18n.t("bigbluebutton"))
meetings = [] meetings = []
end end

2
app/controllers/application_controller.rb
View File

@ -271,7 +271,7 @@ class ApplicationController < ActionController::Base
render "errors/greenlight_error", locals: { message: I18n.t("errors.not_found.user_missing.message"), render "errors/greenlight_error", locals: { message: I18n.t("errors.not_found.user_missing.message"),
help: I18n.t("errors.not_found.user_missing.help") } help: I18n.t("errors.not_found.user_missing.help") }
elsif e.message.eql? "That user has no configured provider." elsif e.message.eql? "That user has no configured provider."
if Setting.exists(provider: @user_domain) if Setting.exists?(provider: @user_domain)
# Keep the branding # Keep the branding
@settings = Setting.find_by(provider: @user_domain) @settings = Setting.find_by(provider: @user_domain)
else else

2
config/locales/en.yml
View File

@ -173,7 +173,7 @@ en:
enabled: Always Enabled enabled: Always Enabled
optional: Optional optional: Optional
rooms: rooms:
timeout: Due to the BigBlueButton Server request timing out, the information for status and participants may not be accurate timeout: Due to the %{server} Server request timing out, the information for status and participants may not be accurate
title: Server Rooms title: Server Rooms
table: table:
ended: "Ended: %{session}" ended: "Ended: %{session}"