[bbb-greenlight: 9/12] Added missing question mark (#2234)
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bbb-greenlight: 9/12] Added missing question mark (#2234)
- Date: Wed, 28 Oct 2020 07:03:40 +0000 (UTC)
commit 23b08853dbad90cc35664a794b3e3d888c7b982e
Author: Ahmad Farhat <ahmad af farhat gmail com>
Date: Mon Oct 26 15:27:49 2020 -0400
Added missing question mark (#2234)
* Added missing question mark
* Made bigbluebutton name variable
app/controllers/admins_controller.rb | 2 +-
app/controllers/application_controller.rb | 2 +-
config/locales/en.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index 8bd5f57..26975f2 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 4a89a73..1e2cf53 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 0cbd6e4..186313a 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}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]