Improve display of user block timestamps
[rails.git] / app / helpers / user_blocks_helper.rb
index b6d4a9a9fe403e8bd9dbf1691f1e416cb2df5865..282d9164aa2cc046842b23939a8a6db557696fbe 100644 (file)
@@ -7,14 +7,14 @@ module UserBlocksHelper
       if block.needs_view?
         I18n.t("user_block.helper.until_login")
       else
       if block.needs_view?
         I18n.t("user_block.helper.until_login")
       else
-        I18n.t("user_block.helper.time_future", :time => distance_of_time_in_words_to_now(block.ends_at))
+        I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
       end
     else
       # the max of the last update time or the ends_at time is when this block finished
       # either because the user viewed the block (updated_at) or it expired or was
       # revoked (ends_at)
       last_time = [block.ends_at, block.updated_at].max
       end
     else
       # the max of the last update time or the ends_at time is when this block finished
       # either because the user viewed the block (updated_at) or it expired or was
       # revoked (ends_at)
       last_time = [block.ends_at, block.updated_at].max
-      I18n.t("user_block.helper.time_past", :time => distance_of_time_in_words_to_now(last_time))
+      I18n.t("user_block.helper.time_past", :time => friendly_date(last_time)).html_safe
     end
   end
 end
     end
   end
 end