Avoid double-escaping display names when sent through the translation system

[rails.git] / app / views / reports / new.html.erb

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index 6dad7aa43a314069ddbcd2f05a112aacd37ef467..599456db2ed1b37250408f9257a2e946b1068d38 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -1,14 +1,14 @@
 <% content_for :heading do %>
-  <h1>Report <%= reportable_url(@report.issue.reportable) %></h1>
+  <h1><%= t ".title_html", :link => link_to(reportable_title(@report.issue.reportable), reportable_url(@report.issue.reportable)) %></h1>
 <% end %>
 
-<div class="disclaimer">
+<div class="alert alert-warning report-disclaimer">
+  <%= t(".disclaimer.intro") %>
   <ul>
-    <%= t('issues.new.disclaimer.intro') %>:
-      <li> <%= t('issues.new.disclaimer.not_just_mistake') %> </li>
-      <li> <%= t('issues.new.disclaimer.unable_to_fix') %> </li>
-      <li> <%= t('issues.new.disclaimer.resolve_with_user') %> </li>
-    </ul>
+    <li> <%= t(".disclaimer.not_just_mistake") %> </li>
+    <li> <%= t(".disclaimer.unable_to_fix") %> </li>
+    <li> <%= t(".disclaimer.resolve_with_user") %> </li>
+  </ul>
 </div>
 
 <%= form_for(@report) do |f| %>
@@ -19,24 +19,24 @@
       <%= issue_form.hidden_field :reportable_type %>
     <% end %>
 
-    <div class='form-row' style='width:600px'>
-      <p><%= t('issues.new.select') %>:</p>
-
-      <div class="new-report-form">
-        <% @report_strings_yaml.each do |k,v| %>
-          <div style="padding-left:5px">
-            <%= radio_button_tag :report_type, v[:type].to_s %>
-            <%= label_tag v[:details].to_s %> <br/>
-          </div>
-        <% end %>
-      </div>
+    <div class='form-row'>
+      <p><%= t(".select") %></p>
+      <ul>
+      <% Report.categories_for(@report.issue.reportable).each do |c| %>
+        <li>
+          <%= radio_button :report, :category, c, :required => true %>
+          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %> <br />
+        </li>
+      <% end %>
+      </ul>
+    </div>
 
-      <br/>
-      <%= text_area :report, :details, :cols => 20, :rows => 3, placeholder: t('issues.new.details'), required: true %>
+    <div class='form-row'>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t(".details") %>
     </div>
 
     <div class='buttons'>
-      <%= submit_tag %>
+      <%= f.submit %>
     </div>
   </fieldset>
 <% end %>