Use "Deleted at/by" instead of "Edited at/by" for deletes

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index b6960b9c4b0b3533aad31d27d008e9ade1a5907c..07b44a94a7d1515c537a7d2c1c2bc346115b199a 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,11 +1,19 @@
 <tr>
 <tr>

-  <th><%= t 'browse.common_details.edited_at' %></th>
+  <% if common_details.visible? %>
+    <th><%= t 'browse.common_details.edited_at' %></th>
+  <% else %>
+    <th><%= t 'browse.common_details.deleted_at' %></th>
+  <% end %>

   <td><%= l common_details.timestamp %></td>
 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>
   <td><%= l common_details.timestamp %></td>
 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>

-    <th><%= t 'browse.common_details.edited_by' %></th>
+    <% if common_details.visible? %>
+      <th><%= t 'browse.common_details.edited_by' %></th>
+    <% else %>
+      <th><%= t 'browse.common_details.deleted_by' %></th>
+    <% end %>

     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>
     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b341e7f452a01dd780f2a7c15ece999fdc7bf83..8fb853c589d1119e123d458d75a2596afa2d5e5d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -141,6 +141,8 @@ en:
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"

+      deleted_at: "Deleted at:"
+      deleted_by: "Deleted by:"

       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"