From 32bbc804151e69c1340ee76cb98bcc46c25272db Mon Sep 17 00:00:00 2001 From: Rafael Baldasso Audibert <32079912+rafaeelaudibert@users.noreply.github.com> Date: Mon, 22 Apr 2019 10:17:37 -0300 Subject: [PATCH] Added Record type/format I18n (#471) * GRN-80: Allow local accounts on multitenant (#428) * Changed the way the omniauth providers are declared * Allow local authentication for multitenant mode based on customer settings * Cleanead up code mandated by rubocop * Completed implementation for signin and added the one for signup * Fixed issue with rubocop * Renamed customer_name to lb_user * Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented * Completed implementation of email_verification * Fixed rubocop issue * Final update * Fix for test with loadbalancer * Make sure loadbalancer mockup is only used when env defined * Fix for test on rooms_controller * Fixed most of the test failing on multitenant env * Fixed issue detected by rubocop * Fixed issue with activation tockens not working on resend * Fixed new issue found by rubocop * Updated travis script * Harcoded credentials for mockup * Updated expectation on start_session * Fixed issue with duplication of home room * Updated script for rubocop * Restored Gemfile * Added I18n for recording types/formats --- app/views/shared/components/_public_recording_row.html.erb | 2 +- app/views/shared/components/_recording_row.html.erb | 2 +- config/locales/en.yml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/shared/components/_public_recording_row.html.erb b/app/views/shared/components/_public_recording_row.html.erb index c48c3ed8..baec07b7 100644 --- a/app/views/shared/components/_public_recording_row.html.erb +++ b/app/views/shared/components/_public_recording_row.html.erb @@ -63,7 +63,7 @@ <% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %> <% p = recording[:playbacks].find do |p| p.key?(:length) end %> <% sorted_formats.each do |p| %> - <%= link_to p[:type].capitalize, p[:url], class: "btn btn-sm btn-primary", target: "_blank" %> + <%= link_to t("recording.format.#{p[:type]}"), p[:url], class: "btn btn-sm btn-primary", target: "_blank" %> <% end %> diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb index 52f47279..734d6ff9 100644 --- a/app/views/shared/components/_recording_row.html.erb +++ b/app/views/shared/components/_recording_row.html.erb @@ -65,7 +65,7 @@ <% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %> <% sorted_formats.each do |p| %> - <%= link_to p[:type].capitalize, p[:url], class: "btn btn-sm btn-primary", target: "_blank" %> + <%= link_to t("recording.format.#{p[:type]}"), p[:url], class: "btn btn-sm btn-primary", target: "_blank" %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 70ab4a7b..cec1f2b3 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -175,6 +175,8 @@ en: visibility: public: Public unlisted: Unlisted + format: + presentation: Presentation rename: Rename reset_password: subtitle: Reset Password