X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e412ac319cb54df831ff2e277b90d51d57364de5..44286b46b1962c3bf1d1568faf0a7f38a2a634c2:/lib/osm_community_index/local_chapter.rb?ds=sidebyside

diff --git a/lib/osm_community_index/local_chapter.rb b/lib/osm_community_index/local_chapter.rb
index 866346570..6df3c1bc9 100644
--- a/lib/osm_community_index/local_chapter.rb
+++ b/lib/osm_community_index/local_chapter.rb
@@ -28,6 +28,7 @@ module OsmCommunityIndex
       community_index["resources"].each do |id, resource|
         resource.each do |key, value|
           next unless key == "type" && value == "osm-lc" && id != "OSMF"
+
           raw_local_chapters.push({ :id => id, :resource => resource })
         end
       end
@@ -38,10 +39,11 @@ module OsmCommunityIndex
       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")
+        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.split("_").join("-")
+        locale_rails = locale.tr("_", "-")
+        data = {}
 
         raw_local_chapters.each do |chapter|
           id = chapter[:id]
@@ -50,15 +52,12 @@ module OsmCommunityIndex
           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 = {}
-          data["osm_community_index"] = {}
-          data["osm_community_index"]["local_chapter"] = {}
-          data["osm_community_index"]["local_chapter"][id] = strings
-          I18n.backend.store_translations locale_rails, data
+          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