Change block end column to display strictly ends_at

Could display when block was viewed before. That's going to be unintuitive if sorting by different times is introduced.

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index a1cd263084ad00e9078ce4a641ed2001d003029d..8a3a8a3eb460f2b8c550d7daeba3c99e724e48f2 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -29,16 +29,20 @@ module UserBlocksHelper
     if block.active?
       if block.needs_view?
         if block.ends_at > Time.now.utc
     if block.active?
       if block.needs_view?
         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
       else
         end
       else

-        t("user_blocks.helper.short.until_end")
+        t("user_blocks.helper.short.active")

       end
     else
       if block.revoker_id.nil?
       end
     else
       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
         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",
       else
         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",

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index ef790103e47c1f156db5126fd3567c6b0143d79f..cbc2ee23c0b39297c07f4aac73acd2c6121a0082 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -7,10 +7,10 @@
   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= block_short_time_in_past(block.created_at) %></td>
   <% end %>
   <td><%= h truncate(block.reason) %></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>
   <% else %>
   <td><%= block_short_time_in_future(block.ends_at) %></td>
   <% 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 %>
   <td><%= h block_short_status(block) %></td>
   <td><%= link_to t(".show"), block %></td>
   <% end %>
   <td><%= h block_short_status(block) %></td>
   <td><%= link_to t(".show"), block %></td>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6baa963312794b71129b97fa784b53e05866a02c..4fdc9741ce18ce10c49dbfe24c771862958de765 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2898,9 +2898,10 @@ en:
       short:
         ended: "ended"
         revoked_html: "revoked by %{name}"
       short:
         ended: "ended"
         revoked_html: "revoked by %{name}"

-        until_end: "until end"
-        until_login: "until login"
-        until_end_and_login: "until end & login"
+        active: "active"
+        active_unread: "active unread"
+        expired_unread: "expired unread"
+        read_html: "read at %{time}"

         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"
     blocks_on:
         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"
     blocks_on: