Skip to content

Commit

Permalink
Improve display of user block timestamps
Browse files Browse the repository at this point in the history
Display the creation time, as a friendly date with a tooltip for
the exact time, and add a tooltip to the expiry time.

Fixes #923 and #996
  • Loading branch information
tomhughes committed Jun 25, 2015
1 parent 0678ab6 commit 4676179
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/helpers/user_blocks_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ def block_status(block)
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
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
2 changes: 2 additions & 0 deletions app/views/user_blocks/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
</p>
<% end %>

<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>

<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>

<p><b><%= t'user_block.show.reason' %></b></p>
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2112,6 +2112,8 @@ en:
heading: "%{block_on} blocked by %{block_by}"
time_future: "Ends in %{time}"
time_past: "Ended %{time} ago"
created: "Created"
ago: "%{time} ago"
status: "Status"
show: "Show"
edit: "Edit"
Expand Down

0 comments on commit 4676179

Please sign in to comment.