From 4bcc88161c881bca9d7193f43acdc13ae9c4efa7 Mon Sep 17 00:00:00 2001 From: Adam Hoyle Date: Wed, 8 Sep 2021 17:55:27 +0100 Subject: [PATCH] Refactor osm-community-index and local chapters models --- app/controllers/site_controller.rb | 4 +-- app/models/communities.rb | 55 ----------------------------- app/models/local_chapter.rb | 36 +++++++++++++++++++ app/models/osm_community_index.rb | 52 +++++++++++++++++++++++++++ app/views/site/communities.html.erb | 2 +- 5 files changed, 91 insertions(+), 58 deletions(-) delete mode 100644 app/models/communities.rb create mode 100644 app/models/local_chapter.rb create mode 100644 app/models/osm_community_index.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 8323ae5e7..c2d5a73ae 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -107,8 +107,8 @@ class SiteController < ApplicationController end def communities - @locale = params[:communities_locale] || I18n.locale - @local_chapters = Communities.local_chapters(@locale) + @locale = I18n.locale + @local_chapters = LocalChapter.local_chapters_with_locale(@locale) end def export; end diff --git a/app/models/communities.rb b/app/models/communities.rb deleted file mode 100644 index 008735224..000000000 --- a/app/models/communities.rb +++ /dev/null @@ -1,55 +0,0 @@ -class Communities - require "yaml" - - @local_chapters = {} - - def self.local_chapters(locale) - @local_chapters[locale] ||= local_chapter_for(locale) - end - - def self.local_chapter_for(locale) - @local_chapters_index ||= load_local_chapters - locale_dict = locale_dict_for(locale) - localised_chapters = [] - @local_chapters_index.each do |chapter| - id = chapter[:id] - name = locale_dict.dig(id, "name") || chapter[:name] - url = chapter[:url] - localised_chapters.push({ :id => id, :name => name, :url => url }) - end - localised_chapters - end - - def self.load_local_chapters - json_file = File.expand_path("node_modules/osm-community-index/dist/resources.json", Dir.pwd) - community_index = JSON.parse(File.read(json_file)) - local_chapters = [] - community_index["resources"].each do |id, resource| - resource.each do |key, value| - next unless key == "type" && value == "osm-lc" && id != "OSMF" - - strings = resource["strings"] - chapter_name = strings["name"] || "!! " + strings["community"] - url = strings["url"] - local_chapters.push({ :id => id, :name => chapter_name, :url => url }) - end - end - local_chapters - end - - def self.locale_dict_for(locale_in) - locale = locale_in.to_s.tr("-", "_") - full_local_path = File.expand_path("node_modules/osm-community-index/i18n/#{locale}.yaml", Dir.pwd) - locale_dict = {} - if File.exist?(full_local_path) - locale_dict = YAML.safe_load(File.read(full_local_path))[locale] - else - shortened_locale = locale.split("_").first - if shortened_locale != locale - shortened_local_path = File.expand_path("node_modules/osm-community-index/i18n/#{shortened_locale}.yaml", Dir.pwd) - locale_dict = YAML.safe_load(File.read(shortened_local_path))[shortened_locale] if File.exist?(shortened_local_path) - end - end - locale_dict - end -end diff --git a/app/models/local_chapter.rb b/app/models/local_chapter.rb new file mode 100644 index 000000000..99e6963ec --- /dev/null +++ b/app/models/local_chapter.rb @@ -0,0 +1,36 @@ +class LocalChapter + + attr_reader :id, :name, :url + + @localised_chapters = {} + + def initialize(id, name, url) + @id = id + @name = name + @url = url + end + + def self.local_chapters_with_locale(locale) + @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) + local_chapters = [] + community_index["resources"].each do |id, resource| + resource.each do |key, value| + next unless key == "type" && value == "osm-lc" && id != "OSMF" + + strings = resource["strings"] + name = localised_strings.dig(id, "name") || strings["name"] || strings["community"] + url = strings["url"] + local_chapters.push(LocalChapter.new(id, name, url)) + end + end + local_chapters + end + +end \ No newline at end of file diff --git a/app/models/osm_community_index.rb b/app/models/osm_community_index.rb new file mode 100644 index 000000000..1f2bfd420 --- /dev/null +++ b/app/models/osm_community_index.rb @@ -0,0 +1,52 @@ +class OsmCommunityIndex + require "yaml" + + @localised_strings = {} + + def self.community_index + @community_index ||= community_index_from_json + end + + def self.localised_strings(locale) + @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)) + end + + def self.locale_hash_from_json(locale_in) + locale = locale_in.to_s.tr("-", "_") + # try the passed in locale + json = load_locale_json(locale) + unless json.nil? + return json + end + + # now try it without it's country part (eg 'en' instead of 'en_GB') + shortened_locale = locale.split("_").first + unless shortened_locale === locale + json = load_locale_json(shortened_locale) + unless json.nil? + return json + end + end + + # if nothing else works, then return "en" + load_locale_json("en") + end + + def self.load_locale_json(locale) + json_path = Rails.root.join("node_modules/osm-community-index/i18n/#{locale}.yaml") + if File.exist?(json_path) + response = YAML.safe_load(File.read(json_path))[locale] + else + response = nil + end + response + end + +end diff --git a/app/views/site/communities.html.erb b/app/views/site/communities.html.erb index d09c36caa..265b26e80 100644 --- a/app/views/site/communities.html.erb +++ b/app/views/site/communities.html.erb @@ -11,7 +11,7 @@

<%= t ".local_chapters.list_text", :locale => @locale %>

<%= t ".other_groups.title", :locale => @locale %>

-- 2.39.5