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

[rails.git] / lib / osm_community_index.rb

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index 9afb33a7ed569d9224fd4cf21b4f8ca4e69ff0ea..c395a376881541abdc8c0b7d364584b39be0aac9 100644 (file)
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -2,7 +2,11 @@ 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")
   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 = YAML.safe_load_file("node_modules/osm-community-index/i18n/en.yaml")["en"]
+    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|
 
     files = Rails.root.glob("node_modules/osm-community-index/i18n/*.yaml")
     files.each do |file|


@@ -34,7 +38,11 @@ module OsmCommunityIndex
                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.
                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
     return translated_name if translated_name
 
     # Otherwise fall back to the (English-language) resource name