diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index 8bd5f576..26975f2f 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -74,7 +74,7 @@ class AdminsController < ApplicationController begin meetings = all_running_meetings[:meetings] rescue - flash[:alert] = I18n.t("administrator.rooms.timeout") + flash[:alert] = I18n.t("administrator.rooms.timeout", server: I18n.t("bigbluebutton")) meetings = [] end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4a89a73a..1e2cf536 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -271,7 +271,7 @@ class ApplicationController < ActionController::Base render "errors/greenlight_error", locals: { message: I18n.t("errors.not_found.user_missing.message"), help: I18n.t("errors.not_found.user_missing.help") } 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 @settings = Setting.find_by(provider: @user_domain) else diff --git a/config/locales/en.yml b/config/locales/en.yml index 0cbd6e4d..186313ac 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -173,7 +173,7 @@ en: enabled: Always Enabled optional: Optional 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 table: ended: "Ended: %{session}"