]> git.openstreetmap.org Git - rails.git/blobdiff - app/helpers/user_blocks_helper.rb
Enable image compression utils for image_optim
[rails.git] / app / helpers / user_blocks_helper.rb
index 282d9164aa2cc046842b23939a8a6db557696fbe..3c9c0a37e5f6a5d1ab237505e9835a75e844d865 100644 (file)
@@ -4,8 +4,13 @@ module UserBlocksHelper
   # user block (i.e: whether it's active, what the expiry time is)
   def block_status(block)
     if block.active?
+      # if the block hasn't expired yet show the date, if the user just needs to login show that
       if block.needs_view?
-        I18n.t("user_block.helper.until_login")
+        if block.ends_at > Time.now.getutc
+          I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe
+        else
+          I18n.t("user_block.helper.until_login")
+        end
       else
         I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
       end