Pay heed to rubocop

This commit is contained in:
Adam Hoyle 2021-10-17 23:34:26 +01:00
parent 97e70e93bb
commit f234bf3a46
2 changed files with 7 additions and 20 deletions

View file

@ -1,6 +1,5 @@
module OsmCommunityIndex
class LocalChapter
attr_reader :id, :name, :url
@localised_chapters = {}
@ -15,8 +14,6 @@ module OsmCommunityIndex
@localised_chapters[locale] ||= load_local_chapters(locale)
end
protected
def self.load_local_chapters(locale)
community_index = OsmCommunityIndex.community_index
localised_strings = OsmCommunityIndex.localised_strings(locale)
@ -33,7 +30,5 @@ module OsmCommunityIndex
end
local_chapters
end
end
end
end

View file

@ -12,8 +12,6 @@ module OsmCommunityIndex
@localised_strings[locale] ||= locale_hash_from_json(locale)
end
protected
def self.community_index_from_json
json_file = Rails.root.join("node_modules/osm-community-index/dist/resources.json")
JSON.parse(File.read(json_file))
@ -23,17 +21,13 @@ module OsmCommunityIndex
locale = locale_in.to_s.tr("-", "_")
# try the passed in locale
json = load_locale_json(locale)
unless json.nil?
return json
end
return json unless json.nil?
# now try it without it's country part (eg 'en' instead of 'en_GB')
shortened_locale = locale.split("_").first
unless shortened_locale === locale
unless shortened_locale == locale
json = load_locale_json(shortened_locale)
unless json.nil?
return json
end
return json unless json.nil?
end
# if nothing else works, then return "en"
@ -42,11 +36,9 @@ module OsmCommunityIndex
def self.load_locale_json(locale)
json_path = Rails.root.join("node_modules/osm-community-index/i18n/#{locale}.yaml")
if File.exist?(json_path)
return YAML.safe_load(File.read(json_path))[locale]
end
return YAML.safe_load(File.read(json_path))[locale] if File.exist?(json_path)
nil
end
end
end
end