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

[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..d355d3e5f29ab07b80431251309d828fcbc14a23 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -65,6 +65,10 @@
                                                    :url => comment_api_note_url(@note, "json") } %>
         </div>
       </form>
                                                    :url => comment_api_note_url(@note, "json") } %>
         </div>
       </form>

+    <% else -%>
+      <p>
+        <%= link_to t(".log_in_to_comment"), login_path(:referer => request.fullpath) %>
+      </p>

     <% end -%>
   <% else %>
     <form class="mb-3" action="#">
     <% end -%>
   <% else %>
     <form class="mb-3" action="#">


@@ -95,7 +99,7 @@
 
   <% if @note.freshly_closed? %>
     <small class="text-muted">
 
   <% 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>
     </small>
   <% end %>
 </div>