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

Times are now rendered using the browsers time zone (#2438)

Browse Source
This commit is contained in:
Ahmad Farhat
2021-01-17 14:48:51 -05:00
committed by GitHub
parent fed6ca4d03
commit 4bf0811136
14 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admins/components/_invited_users_table.html.erb
View File

@ -24,7 +24,7 @@
<div><%= user.email %></div>
</td>
<td>
<div><%= friendly_time(user.updated_at) %></div>
<div><%= view_date(user.updated_at) %></div>
</td>
<td>
<div>

2
app/views/admins/components/_manage_users_table.html.erb
View File

@ -48,7 +48,7 @@
<tr data-user-uid="<%= user.uid %>">
<td>
<div><%= user.name %></div>
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", user.created_at].join %></div>
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", view_date(user.created_at)].join.html_safe %></div>
</td>
<td class="user-email"><%= user.email && user.email != "" ? user.email : user.username%></td>
<td><%= user.provider %></td>

2
app/views/admins/components/_server_recording_row.html.erb
View File

@ -26,7 +26,7 @@
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
<div class="small text-muted">
<%= recording_owner_email(recording[:meetingID]) %>

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

@ -26,11 +26,11 @@
<div class="small text-muted">
<% running = room_is_running(room.bbb_id) %>
<% if running %>
<%= t("administrator.rooms.table.started", session: friendly_time(room.last_session)) %>
<%= t("administrator.rooms.table.started", session: view_date(room.last_session)).html_safe %>
<% elsif room.last_session.present? %>
<%= t("administrator.rooms.table.ended", session: friendly_time(room.last_session)) %>
<%= t("administrator.rooms.table.ended", session: view_date(room.last_session)).html_safe %>
<% else %>
<%= [t("administrator.users.table.created"), ": ", friendly_time(room.created_at)].join %>
<%= [t("administrator.users.table.created"), ": ", view_date(room.created_at)].join.html_safe %>
<% end %>
</div>
</td>

2
app/views/rooms/components/_room_block.html.erb
View File

@ -35,7 +35,7 @@
</div>
<div class="small text-muted">
<% if room.sessions > 0 %>
<i><%= t("room.last_session", session: recording_date(room.last_session)) %></i>
<i><%= t("room.last_session", session: view_date(room.last_session)).html_safe %></i>
<% else %>
<i><%= t("room.no_sessions") %></i>
<% end %>

2
app/views/shared/components/_public_recording_row.html.erb
View File

@ -26,7 +26,7 @@
</span>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
</td>
<% if recording_thumbnails? %>

2
app/views/shared/components/_recording_row.html.erb
View File

@ -27,7 +27,7 @@
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
</td>
<% if recording_thumbnails? %>