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

Merge branch 'master' into translations_en-yml--master_eu

This commit is contained in:
Jesus Federico 2020-04-28 13:15:47 -04:00 committed by GitHub
parent 5f9e82c705 b08b1ff013
commit 6dd78ca41b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admins/components/_server_room_row.html.erb
View File

@ -36,9 +36,9 @@
<td class="text-left"> <td class="text-left">
<% running = room_is_running(room.bbb_id) %> <% running = room_is_running(room.bbb_id) %>
<% if running %> <% if running %>
<%= t("administrator.rooms.running") %> <%= t("administrator.rooms.table.running") %>
<% else %> <% else %>
<%= t("administrator.rooms.not_running") %> <%= t("administrator.rooms.table.not_running") %>
<% end %> <% end %>
</td> </td>
<td class="text-center"> <td class="text-center">
@ -48,7 +48,7 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right">
<%= link_to room_path(room), class: "dropdown-item" do %> <%= link_to room_path(room), class: "dropdown-item" do %>
<i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.view") %> <i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.table.view") %>
<% end %> <% end %>
<%= button_to start_room_path(room), class: "dropdown-item", "data-disable": "" do %> <%= button_to start_room_path(room), class: "dropdown-item", "data-disable": "" do %>
<i class="dropdown-icon fas fa-door-open"></i> <%= running ? t("room.join") : t("room.start") %> <i class="dropdown-icon fas fa-door-open"></i> <%= running ? t("room.join") : t("room.start") %>

1
config/locales/en.yml
View File

@ -147,6 +147,7 @@ en:
delete: Delete delete: Delete
edit: Edit edit: Edit
edit_roles: Edit the user roles edit_roles: Edit the user roles
merge: Merge
perm_delete: Permanently Delete perm_delete: Permanently Delete
unban: Unban User unban: Unban User
undelete: Undelete undelete: Undelete