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

[rails.git] / app / views / account / deletions / show.html.erb

diff --git a/app/views/account/deletions/show.html.erb b/app/views/account/deletions/show.html.erb
index ddc8216772878300b3348b5ff55fd4f6608dbcc0..9b9b0f182ccd88caae6844096ce887594294c257 100644 (file)
--- a/app/views/account/deletions/show.html.erb
+++ b/app/views/account/deletions/show.html.erb
@@ -6,7 +6,7 @@
 
 <div class="alert alert-danger row mx-0 p-3 align-items-center">
   <div class="col-auto">
 
 <div class="alert alert-danger row mx-0 p-3 align-items-center">
   <div class="col-auto">

-    <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
+    <%= notice_svg_tag %>

   </div>
   <div class="col">
     <p class="mb-0"><%= t ".warning" %></p>
   </div>
   <div class="col">
     <p class="mb-0"><%= t ".warning" %></p>


@@ -31,5 +31,13 @@
   <li><%= t ".retain_email" %></li>
 </ul>
 
   <li><%= t ".retain_email" %></li>
 </ul>
 

-<%= link_to t(".delete_account"), account_path, { :method => :delete, :class => "btn btn-danger", :data => { :confirm => t(".confirm_delete") } } %>
+<% if current_user.deletion_allowed? %>
+  <%= link_to t(".delete_account"), account_path, { :method => :delete, :class => "btn btn-danger", :data => { :confirm => t(".confirm_delete") } } %>
+<% else %>
+  <div class="alert alert-warning">
+    <%= t ".recent_editing_html", :time => friendly_date(current_user.deletion_allowed_at) %>
+  </div>
+  <button class="btn btn-secondary" disabled><%= t(".delete_account") %></button>
+<% end %>
+

 <%= link_to t(".cancel"), edit_account_path, :class => "btn btn-link" %>
 <%= link_to t(".cancel"), edit_account_path, :class => "btn btn-link" %>