X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47362f432a9bd10196b27aa1667e6166b76f4b66..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/lib/osm_community_index.rb?ds=inline

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index 7ce379d0f..c395a3768 100644
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -2,11 +2,16 @@ module OsmCommunityIndex
   def self.add_to_i18n
     # Filter the communities here to avoid loading excessive numbers of translations
     communities = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
+    community_en_yaml = if File.exist?("node_modules/osm-community-index/i18n/en.yaml")
+                          YAML.safe_load_file("node_modules/osm-community-index/i18n/en.yaml")["en"]
+                        else
+                          {}
+                        end
 
     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]
+      community_locale_yaml = YAML.safe_load_file(file)[locale]
       # rails wants language-COUNTRY but osm-community-index uses underscores
       locale_rails = locale.tr("_", "-")
 
@@ -14,7 +19,7 @@ module OsmCommunityIndex
         id = community.id
 
         strings = community_locale_yaml[id] || {}
-        strings["name"] = resolve_name(community, community_locale_yaml)
+        strings["name"] = resolve_name(community, community_locale_yaml, community_en_yaml)
 
         obj.deep_merge!("osm_community_index" => { "communities" => { id => strings } })
       end
@@ -23,16 +28,21 @@ module OsmCommunityIndex
     end
   end
 
-  def self.resolve_name(community, community_locale_yaml)
+  def self.resolve_name(community, community_locale_yaml, community_en_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")
+    template = community_locale_yaml.dig("_defaults", community.type, "name") ||
+               community_en_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
+    begin
+      translated_name = format(template.gsub("{", "%{"), { :community => community_name }) if template && community_name
+    rescue KeyError => e
+      Rails.logger.warn e.full_message
+    end
     return translated_name if translated_name
 
     # Otherwise fall back to the (English-language) resource name