Merge remote-tracking branch 'upstream/pull/5476'

[rails.git] / app / helpers / user_blocks_helper.rb

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index a1cd263084ad00e9078ce4a641ed2001d003029d..75bd4a46daec8b1ce277f0b01e59f8f2e3f7cf8d 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -27,18 +27,18 @@ module UserBlocksHelper
 
   def block_short_status(block)
     if block.active?
-      if block.needs_view?
-        if block.ends_at > Time.now.utc
-          t("user_blocks.helper.short.until_end_and_login")
-        else
-          t("user_blocks.helper.short.until_login")
-        end
+      if block.ends_at > Time.now.utc
+        t("user_blocks.helper.short.active")
       else
-        t("user_blocks.helper.short.until_end")
+        t("user_blocks.helper.short.active_until_read")
       end
     else
       if block.revoker_id.nil?
-        t("user_blocks.helper.short.ended")
+        if block.deactivates_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",