X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e62e2b5edb8100ff4b29cf34abfb8a9316c9996..adc81f010d0e888a06684e3544b296fb85e520c8:/lib/osm_community_index.rb diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb index fb3d7b28e..7ce379d0f 100644 --- a/lib/osm_community_index.rb +++ b/lib/osm_community_index.rb @@ -3,7 +3,7 @@ module OsmCommunityIndex # Filter the communities here to avoid loading excessive numbers of translations communities = Community.where(:type => "osm-lc").where.not(:id => "OSMF") - files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*.yaml")) + 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] @@ -14,9 +14,7 @@ module OsmCommunityIndex 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 @@ -24,4 +22,23 @@ module OsmCommunityIndex 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