From 466de96a91ece362400ec7ffe73ed243f9ce3067 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 27 Jun 2023 18:13:33 +0100 Subject: [PATCH] Fix new rubocop warnings --- app/helpers/user_mailer_helper.rb | 2 +- app/models/language.rb | 2 +- lib/osm_community_index.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/user_mailer_helper.rb b/app/helpers/user_mailer_helper.rb index 39977f5a73..e5d6e39aca 100644 --- a/app/helpers/user_mailer_helper.rb +++ b/app/helpers/user_mailer_helper.rb @@ -29,7 +29,7 @@ def style_message(html) # Because we can't use stylesheets in HTML emails, we need to inline the # styles. Rather than copy-paste the same string of CSS into every message, # we apply it once here, after the message has been composed. - html.gsub(/

/, '

') + html.gsub("

", '

') end def style_left diff --git a/app/models/language.rb b/app/models/language.rb index 1158721e8d..f346c8a748 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -14,7 +14,7 @@ class Language < ApplicationRecord def self.load(file) Language.transaction do - YAML.safe_load(File.read(file)).each do |k, v| + YAML.safe_load_file(file).each do |k, v| Language.update(k, :english_name => v["english"], :native_name => v["native"]) rescue ActiveRecord::RecordNotFound Language.create do |l| diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb index 7ce379d0f5..a5c2fba72d 100644 --- a/lib/osm_community_index.rb +++ b/lib/osm_community_index.rb @@ -6,7 +6,7 @@ def self.add_to_i18n files = Rails.root.glob("node_modules/osm-community-index/i18n/*.yaml") files.each do |file| locale = File.basename(file, ".yaml") - community_locale_yaml = YAML.safe_load(File.read(file))[locale] + community_locale_yaml = YAML.safe_load_file(file)[locale] # rails wants language-COUNTRY but osm-community-index uses underscores locale_rails = locale.tr("_", "-")