cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change block end column to display strictly ends_at

Browse source 
Could display when block was viewed before. That's going to be unintuitive if sorting by different times is introduced.
This commit is contained in:
Anton Khorev 2023-08-24 05:35:53 +03:00
parent 30da09c5a1
commit 156c526c22
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/helpers/user_blocks_helper.rb
View file

@ -29,16 +29,20 @@ module UserBlocksHelper
if block.active? if block.active?
if block.needs_view? if block.needs_view?
if block.ends_at > Time.now.utc if block.ends_at > Time.now.utc
t("user_blocks.helper.short.until_end_and_login") t("user_blocks.helper.short.active_unread")
else else
t("user_blocks.helper.short.until_login") t("user_blocks.helper.short.expired_unread")
end end
else else
t("user_blocks.helper.short.until_end") t("user_blocks.helper.short.active")
end end
else else
if block.revoker_id.nil? if block.revoker_id.nil?
t("user_blocks.helper.short.ended") if block.updated_at > block.ends_at
t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
else
t("user_blocks.helper.short.ended")
end
else else
t("user_blocks.helper.short.revoked_html", :name => link_to(block.revoker.display_name, block.revoker, t("user_blocks.helper.short.revoked_html", :name => link_to(block.revoker.display_name, block.revoker,
:class => "username d-inline-block text-truncate text-wrap align-bottom", :class => "username d-inline-block text-truncate text-wrap align-bottom",

4
app/views/user_blocks/_block.html.erb
View file

@ -7,10 +7,10 @@
<% end %> <% end %>
<td><%= h truncate(block.reason) %></td> <td><%= h truncate(block.reason) %></td>
<td><%= block_short_time_in_past(block.created_at) %></td> <td><%= block_short_time_in_past(block.created_at) %></td>
<% if block.active? %> <% if block.ends_at > Time.now.utc %>
<td><%= block_short_time_in_future(block.ends_at) %></td> <td><%= block_short_time_in_future(block.ends_at) %></td>
<% else %> <% else %>
<td><%= block_short_time_in_past([block.ends_at, block.updated_at].max) %></td> <td><%= block_short_time_in_past(block.ends_at) %></td>
<% end %> <% end %>
<td><%= h block_short_status(block) %></td> <td><%= h block_short_status(block) %></td>
<td><%= link_to t(".show"), block %></td> <td><%= link_to t(".show"), block %></td>

7
config/locales/en.yml
View file

@ -2898,9 +2898,10 @@ en:
short: short:
ended: "ended" ended: "ended"
revoked_html: "revoked by %{name}" revoked_html: "revoked by %{name}"
until_end: "until end" active: "active"
until_login: "until login" active_unread: "active unread"
until_end_and_login: "until end & login" expired_unread: "expired unread"
read_html: "read at %{time}"
time_in_future_title: "%{time_absolute}; in %{time_relative}" time_in_future_title: "%{time_absolute}; in %{time_relative}"
time_in_past_title: "%{time_absolute}; %{time_relative}" time_in_past_title: "%{time_absolute}; %{time_relative}"
blocks_on: blocks_on: