cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use lazy lookups for translations in issues

Browse source
This commit is contained in:
Tom Hughes 2018-06-10 16:03:38 +01:00
parent 5effa0a6d6
commit 2aca6920dc
13 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/issues/_comments.html.erb
View file

@ -17,7 +17,7 @@
<div class="comment">
<%= form_for @new_comment, url: issue_comments_path(@issue) do |f| %>
<%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
<%= label_tag :reassign, t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %>
<%= label_tag :reassign, t('.reassign_param') %> <%= check_box_tag :reassign, true %>
<br/>
<br/>
<%= submit_tag 'Submit' %>

4
app/views/issues/index.html.erb
View file

@ -4,7 +4,7 @@
<%= form_tag(issues_path, :method => :get) do %>
<p><%= t ".search_guidance" %></p>
<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>
<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
<%= select_tag :last_updated_by, options_for_select(@users.all.collect{|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
@ -31,7 +31,7 @@
<tbody>
<% @issues.each do |issue| %>
<tr>
<td><%= t "issues.states.#{issue.status}" %></td>
<td><%= t ".states.#{issue.status}" %></td>
<td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user.display_name) if issue.reported_user %></td>

6
app/views/issues/show.html.erb
View file

@ -11,12 +11,12 @@
</small>
</p>
<p>
<%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
<%= link_to t('.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
<% if @issue.may_ignore? %>
| <%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post %>
| <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %>
<% end %>
</p>
<p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
<p><%= link_to t('.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
<% end %>
<div class="report-related-block">

14
app/views/reports/new.html.erb
View file

@ -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.underscore}.#{c}") %> <br/>
<%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}") %> <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'), required: true %>
</div>
<div class='buttons'>