X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ad900553cb722617bf3d3d7dc6b9af47678b5ef0..44286b46b1962c3bf1d1568faf0a7f38a2a634c2:/lib/osm_community_index/local_chapter.rb

diff --git a/lib/osm_community_index/local_chapter.rb b/lib/osm_community_index/local_chapter.rb
index 3471d78b0..6df3c1bc9 100644
--- a/lib/osm_community_index/local_chapter.rb
+++ b/lib/osm_community_index/local_chapter.rb
@@ -1,68 +1,64 @@
 module OsmCommunityIndex
   class LocalChapter
-    attr_reader :id, :name, :url
+    attr_reader :id, :url
 
-    @localised_chapters = {}
-
-    def initialize(id, name, url)
+    def initialize(id, url)
       @id = id
-      @name = name
       @url = url
     end
 
-    def self.local_chapters_with_locale(locale)
-      load_local_chapter_localisation
-      @localised_chapters[locale] ||= load_local_chapters(locale)
+    def self.local_chapters
+      @chapters = init_local_chapters
     end
 
-    def self.load_local_chapter_localisation
-      community_index = OsmCommunityIndex.community_index
-      localisation_files = Dir.children(Rails.root.join("node_modules/osm-community-index/i18n/"))
-      localisation_files.each do |file|
-        locale = File.basename(file,".yaml")
-        # rails wants en-GB but osm-community-index has en_GB
-        locale_rails = locale.split("_").join("-")
-        full_path = Rails.root.join("node_modules/osm-community-index/i18n/#{file}")
-        locale_data = YAML.safe_load(File.read(full_path))[locale]
-
-        community_index["resources"].each do |id, resource|
-          resource.each do |key, value|
-            next unless key == "type" && value == "osm-lc" && id != "OSMF"
-
-            strings = locale_data[id] || {}
-            strings['name'] = locale_data['name'] || resource["strings"]["name"] || resource["strings"]["community"]
-
-            data = {}
-            data["osm_community_index"] = {}
-            data["osm_community_index"]["local_chapter"] = {}
-            data["osm_community_index"]["local_chapter"][id] = strings
-            # data["osm_community_index.local_chapter." + id] = localisation
-            I18n.backend.store_translations locale_rails, data
-
-            if locale == "en"
-              puts locale_rails + " " + id + " " + data.to_s
-            end
-          end
-        end
+    def self.init_local_chapters
+      raw_local_chapters = load_raw_local_chapters
+      local_chapters = []
+      raw_local_chapters.each do |chapter|
+        id = chapter[:id]
+        url = chapter[:resource]["strings"]["url"]
+        local_chapters.push(LocalChapter.new(id, url))
       end
-
+      local_chapters
     end
 
-    def self.load_local_chapters(locale)
+    def self.load_raw_local_chapters
       community_index = OsmCommunityIndex.community_index
-      localised_strings = OsmCommunityIndex.localised_strings(locale)
-      local_chapters = []
+      raw_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))
+          raw_local_chapters.push({ :id => id, :resource => resource })
         end
       end
-      local_chapters
+      raw_local_chapters
+    end
+
+    def self.add_to_i18n
+      raw_local_chapters = load_raw_local_chapters
+      files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*"))
+      files.each do |file|
+        locale = File.basename(file, ".yaml")
+        community_index_yaml = YAML.safe_load(File.read(file))[locale]
+        # rails wants en-GB but osm-community-index has en_GB
+        locale_rails = locale.tr("_", "-")
+        data = {}
+
+        raw_local_chapters.each do |chapter|
+          id = chapter[:id]
+          resource = chapter[:resource]
+
+          strings = community_index_yaml[id] || {}
+          # if the name isn't defined then fall back on community,
+          # as per discussion here: https://github.com/osmlab/osm-community-index/issues/483
+          strings["name"] = strings["name"] || resource["strings"]["name"] || resource["strings"]["community"]
+
+          data.deep_merge!({ "osm_community_index" => { "local_chapter" => { id => strings } } })
+        end
+
+        I18n.backend.store_translations locale_rails, data
+      end
     end
   end
 end