Proper implementation of report strings + cleaning up

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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 84c52d077e89f2d9f07df87279e8177d397e629a..1f57c454e73a62babb9d18a9f3e1a4cceff2c8b5 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -7,9 +7,9 @@
                        <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %>  <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %>
                </small>
        </p>
                        <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %>  <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %>
                </small>
        </p>

-       <p><%= link_to "Resolve", resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
-       <p><%= link_to "Ignore", ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
-       <p><%= link_to "Reopen", reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+       <p><%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
+       <p><%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
+       <p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>

 <% end %>
 
 <div class="report-related-block">
 <% end %>
 
 <div class="report-related-block">


@@ -39,7 +39,7 @@
                                <% if @related_issues.count > 1 %>
                                        <% @related_issues.each do |issue| %>
                                                <% if issue.id != @issue.id %>
                                <% if @related_issues.count > 1 %>
                                        <% @related_issues.each do |issue| %>
                                                <% if issue.id != @issue.id %>

-                                                       <%= link_to "#{issue.reportable_type} ##{issue.reportable_id}", issue %>
+                                                       <%= link_to "#{issue.reportable_type} ##{issue.reportable_id}", issue %> <br/>

                                                <% end %>
                                        <% end %>
                                <% else %>
                                                <% end %>
                                        <% end %>
                                <% else %>