Display the changeset comment (if any) as part of the description of

any object in the data browser. Closes #2282.

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 179b22f60813add46ec6a752d627e7bc404b46e9..0c486e0a716c789d94116e44282d52689d7294f0 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -20,4 +20,11 @@
   <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
 </tr>
 
   <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
 </tr>
 

+<% if common_details.changeset.tags['comment'] %>
+  <tr>
+    <th><%= t 'browse.common_details.changeset_comment' %></th>
+    <td><%= auto_link(h(common_details.changeset.tags['comment'])) %></td>
+  </tr>
+<% end %>
+

 <%= render :partial => "tag_details", :object => common_details %>
 <%= render :partial => "tag_details", :object => common_details %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 012457a70161bf0e5277cfcef43818339c41b6ce..f774b45983260cd591ea0ec1fbb45d12902c7f6c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,7 @@ en:
       edited_by: "Edited by:"
       version: "Version:"
       in_changeset: "In changeset:"
       edited_by: "Edited by:"
       version: "Version:"
       in_changeset: "In changeset:"

+      changeset_comment: "Comment:"

     containing_relation:
       entry: "Relation {{relation_name}}"
       entry_role: "Relation {{relation_name}} (as {{relation_role}})"
     containing_relation:
       entry: "Relation {{relation_name}}"
       entry_role: "Relation {{relation_name}} (as {{relation_role}})"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 73f498c3f38b596048779ae2ae6e1da6588a0814..c951b0aab26347e500c206f3035f9b81f133e18a 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -120,6 +120,7 @@ is:
       edited_by: "Breytt af:"
       version: "Útgáfa:"
       in_changeset: "Í breytingarsetti:"
       edited_by: "Breytt af:"
       version: "Útgáfa:"
       in_changeset: "Í breytingarsetti:"

+      changeset_comment: "Athugasemd:"

     containing_relation:
       entry: "Venslunum {{relation_name}}"
       entry_role: "Venslunum {{relation_name}} (sem „{{relation_role}}“)"
     containing_relation:
       entry: "Venslunum {{relation_name}}"
       entry_role: "Venslunum {{relation_name}} (sem „{{relation_role}}“)"