Skip to content
Snippets Groups Projects
Commit 32bbc804 authored by Rafael Baldasso Audibert's avatar Rafael Baldasso Audibert Committed by Jesus Federico
Browse files

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
parent 9b2424cd
Branches
No related tags found
No related merge requests found
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %> <% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %>
<% p = recording[:playbacks].find do |p| p.key?(:length) end %> <% p = recording[:playbacks].find do |p| p.key?(:length) end %>
<% sorted_formats.each do |p| %> <% 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 %> <% end %>
</td> </td>
</tr> </tr>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<td> <td>
<% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %> <% sorted_formats = recording[:playbacks].sort_by! {|p| p[:type]} %>
<% sorted_formats.each do |p| %> <% 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 %> <% end %>
</td> </td>
<td class="text-center"> <td class="text-center">
......
...@@ -175,6 +175,8 @@ en: ...@@ -175,6 +175,8 @@ en:
visibility: visibility:
public: Public public: Public
unlisted: Unlisted unlisted: Unlisted
format:
presentation: Presentation
rename: Rename rename: Rename
reset_password: reset_password:
subtitle: Reset Password subtitle: Reset Password
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment