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

Use underscore versions of model names for translation keys.

Browse source
This commit is contained in:
Andy Allan 2018-03-14 12:12:24 +08:00
parent 0737c4f169
commit 36970bcf50
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@
<% Report.categories_for(@report.issue.reportable).each do |c| %> <% Report.categories_for(@report.issue.reportable).each do |c| %>
<li> <li>
<%= radio_button :report, :category, c %> <%= radio_button :report, :category, c %>
<%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name}.#{c}") %> <br/> <%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name.underscore}.#{c}") %> <br/>
</li> </li>
<% end %> <% end %>
</ul> </ul>

8
config/locales/en.yml
View file

@ -1040,23 +1040,23 @@ en:
new: new:
title_html: "Report %{link}" title_html: "Report %{link}"
categories: categories:
DiaryEntry: diary_entry:
spam: This Diary Entry is/contains spam spam: This Diary Entry is/contains spam
offensive: This Diary Entry is obscene/offensive offensive: This Diary Entry is obscene/offensive
threat: This Diary Entry contains a threat threat: This Diary Entry contains a threat
other: Other other: Other
DiaryComment: diary_comment:
spam: This Diary Comment is/contains spam spam: This Diary Comment is/contains spam
offensive: This Diary Comment is obscene/offensive offensive: This Diary Comment is obscene/offensive
threat: This Diary Comment contains a threat threat: This Diary Comment contains a threat
other: Other other: Other
User: user:
spam: This User profile is/contains spam spam: This User profile is/contains spam
offensive: This User profile is obscene/offensive offensive: This User profile is obscene/offensive
threat: This User profile contains a threat threat: This User profile contains a threat
vandal: This User is a vandal vandal: This User is a vandal
other: Other other: Other
Note: note:
spam: This note is spam spam: This note is spam
vandalism: This note is vandalism vandalism: This note is vandalism
personal: This note contains personal data personal: This note contains personal data

2
test/system/report_anonymous_note_test.rb
View file

@ -18,7 +18,7 @@ class ReportAnonymousNoteTest < ApplicationSystemTestCase
assert page.has_content? "Report" assert page.has_content? "Report"
assert page.has_content? I18n.t("issues.new.disclaimer.intro") assert page.has_content? I18n.t("issues.new.disclaimer.intro")
choose I18n.t("reports.categories.Note.spam") choose I18n.t("reports.categories.note.spam")
fill_in "report_details", :with => "This is spam" fill_in "report_details", :with => "This is spam"
click_on "Create Report" click_on "Create Report"

4
test/system/report_diary_entry_test.rb
View file

@ -22,7 +22,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
assert page.has_content? "Report" assert page.has_content? "Report"
assert page.has_content? I18n.t("issues.new.disclaimer.intro") assert page.has_content? I18n.t("issues.new.disclaimer.intro")
choose I18n.t("reports.categories.DiaryEntry.spam") choose I18n.t("reports.categories.diary_entry.spam")
fill_in "report_details", :with => "This is advertising" fill_in "report_details", :with => "This is advertising"
click_on "Create Report" click_on "Create Report"
@ -41,7 +41,7 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
assert page.has_content? "Report" assert page.has_content? "Report"
assert page.has_content? I18n.t("issues.new.disclaimer.intro") assert page.has_content? I18n.t("issues.new.disclaimer.intro")
choose I18n.t("reports.categories.DiaryEntry.spam") choose I18n.t("reports.categories.diary_entry.spam")
fill_in "report_details", :with => "This is advertising" fill_in "report_details", :with => "This is advertising"
click_on "Create Report" click_on "Create Report"