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

[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 9812c6806f2c0c59e999f9426ecd48e06de32242..fb338b4979c2bd46376e2f96b7d5c315930ceb58 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -3,11 +3,11 @@
 <% end %>
 
 <div class="report-disclaimer">
-  <%= t('issues.new.disclaimer.intro') %>
+  <%= t('.disclaimer.intro') %>
   <ul>
-    <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>
+    <li> <%= t('.disclaimer.not_just_mistake') %> </li>
+    <li> <%= t('.disclaimer.unable_to_fix') %> </li>
+    <li> <%= t('.disclaimer.resolve_with_user') %> </li>
   </ul>
 </div>
 
@@ -20,19 +20,19 @@
     <% end %>
 
     <div class='form-row'>
-      <p><%= t('issues.new.select') %></p>
+      <p><%= t('.select') %></p>
       <ul>
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>
-          <%= radio_button :report, :category, c %>
-          <%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name}.#{c}") %> <br/>
+          <%= 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>
 
     <div class='form-row'>
-      <%= text_area :report, :details, :cols => 20, :rows => 5, placeholder: t('issues.new.details'), required: true %>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, placeholder: t('.details') %>
     </div>
 
     <div class='buttons'>