Merge remote-tracking branch 'upstream/pull/3832'

[rails.git] / lib / osm_community_index.rb

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index 1e868580da3da03c9dc70a4c407f666657155f90..ca9d2d3b3bb5cee059b263f45804d7e0c99cbbd7 100644 (file)
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -1,23 +1,24 @@
 module OsmCommunityIndex
   def self.add_to_i18n
 module OsmCommunityIndex
   def self.add_to_i18n

-    communities = Community.all
-    files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*"))
+    # Filter the communities here to avoid loading excessive numbers of translations
+    communities = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
+
+    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]
     files.each do |file|
       locale = File.basename(file, ".yaml")
       community_locale_yaml = YAML.safe_load(File.read(file))[locale]

-      # rails wants en-GB but osm-community-index has en_GB
+      # rails wants language-COUNTRY but osm-community-index uses underscores

       locale_rails = locale.tr("_", "-")
       locale_rails = locale.tr("_", "-")

-      data = {}

 
 

-      communities.each do |community|
-        id = community[:id]
+      data = communities.each_with_object({}) do |community, obj|
+        id = community.id

 
         strings = community_locale_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 = community_locale_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"] || community["strings"]["name"] || community["strings"]["community"]
+        strings["name"] = strings["name"] || community.strings["name"] || community.strings["community"]

 
 

-        data.deep_merge!({ "osm_community_index" => { "communities" => { id => strings } } })
+        obj.deep_merge!("osm_community_index" => { "communities" => { id => strings } })

       end
 
       I18n.backend.store_translations locale_rails, data
       end
 
       I18n.backend.store_translations locale_rails, data