Update bundle

[rails.git] / lib / osm_community_index.rb

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index eb7948514369eff689f3d90bd2bc3f2a7fa863b7..7ce379d0f54cae7b755d78035dc7585a245c49f7 100644 (file)
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -1,7 +1,9 @@
 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/*.yaml"))
+    # 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]


@@ -12,9 +14,7 @@ module OsmCommunityIndex
         id = community.id
 
         strings = community_locale_yaml[id] || {}
         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["name"] = strings["name"] || community.strings["name"] || community.strings["community"]
+        strings["name"] = resolve_name(community, community_locale_yaml)

 
         obj.deep_merge!("osm_community_index" => { "communities" => { id => strings } })
       end
 
         obj.deep_merge!("osm_community_index" => { "communities" => { id => strings } })
       end


@@ -22,4 +22,23 @@ module OsmCommunityIndex
       I18n.backend.store_translations locale_rails, data
     end
   end
       I18n.backend.store_translations locale_rails, data
     end
   end

+
+  def self.resolve_name(community, community_locale_yaml)
+    # If theres an explicitly translated name then use that
+    translated_name = community_locale_yaml.dig(community.id, "name")
+    return translated_name if translated_name
+
+    # If not, then look up the default translated name for this type of community, and interpolate the template
+    template = community_locale_yaml.dig("_defaults", community.type, "name")
+    community_name = community_locale_yaml.dig("_communities", community.strings["communityID"])
+    # Change the `{community}` placeholder to `%{community}` and use Ruby's Kernel.format to fill it in.
+    translated_name = format(template.gsub("{", "%{"), { :community => community_name }) if template && community_name
+    return translated_name if translated_name
+
+    # Otherwise fall back to the (English-language) resource name
+    return community.strings["name"] if community.strings["name"]
+
+    # Finally use the (English-language) community name
+    community.strings["community"]
+  end

 end
 end