diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 7529d61488..73b8cfa3f3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -167,8 +167,6 @@ Rails/OutputSafety: - 'app/helpers/application_helper.rb' - 'app/helpers/changesets_helper.rb' - 'app/helpers/geocoder_helper.rb' - - 'app/helpers/note_helper.rb' - - 'app/helpers/open_graph_helper.rb' - 'app/helpers/user_blocks_helper.rb' - 'lib/rich_text.rb' - 'test/helpers/application_helper_test.rb' diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4c5827558e..cb92af8fbb 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -344,7 +344,7 @@ def confirm_resend flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name] else UserMailer.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe + flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email end redirect_to :action => "login" diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index dbe0c89f78..d85881a311 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -1,14 +1,16 @@ module NoteHelper + include ActionView::Helpers::TranslationHelper + def note_event(event, at, by) if by.nil? - I18n.t("browse.note." + event + "_by_anonymous", - :when => friendly_date_ago(at), - :exact_time => l(at)).html_safe + t("browse.note." + event + "_by_anonymous_html", + :when => friendly_date_ago(at), + :exact_time => l(at)) else - I18n.t("browse.note." + event + "_by", - :when => friendly_date_ago(at), - :exact_time => l(at), - :user => note_author(by)).html_safe + t("browse.note." + event + "_by_html", + :when => friendly_date_ago(at), + :exact_time => l(at), + :user => note_author(by)) end end diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb index 11cfe50306..99b8d00a3f 100644 --- a/app/helpers/open_graph_helper.rb +++ b/app/helpers/open_graph_helper.rb @@ -10,8 +10,8 @@ def opengraph_tags(title = nil) "og:description" => t("layouts.intro_text") } - tags.map do |property, content| + safe_join(tags.map do |property, content| tag(:meta, :property => property, :content => content) - end.join("").html_safe + end, "\n") end end diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 1217c03be8..8f0f70dbfa 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -37,10 +37,10 @@ <% if comment.visible %>