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

[rails.git] / app / views / notes / show.html.erb

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 3bb97b484289396ffeec14167cff936401c52ad0..fda8946b6b18378ce483c53c0bf267963d5f3df2 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -95,7 +95,7 @@
 
   <% if @note.freshly_closed? %>
     <small class="text-muted">
-      <%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %>
+      <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %>
     </small>
   <% end %>
 </div>