Refactor i18n so that all community information is available

This makes it easier to use non-chapter communities on the site in future.

diff --git a/app/views/site/communities.html.erb b/app/views/site/communities.html.erb
index aee536c0552e2c43bbe08278b9bca12b89679146..0e5dec3e76d17a9af6472bfa86e8115885851091 100644 (file)
--- a/app/views/site/communities.html.erb
+++ b/app/views/site/communities.html.erb
@@ -9,7 +9,7 @@
 <p><%= t ".local_chapters.list_text" %></p>
 <ul>
   <% @local_chapters.each do |chapter| %>
 <p><%= t ".local_chapters.list_text" %></p>
 <ul>
   <% @local_chapters.each do |chapter| %>

-    <li><a href="<%= chapter.url %>"><%= t "osm_community_index.local_chapter.#{chapter.id}.name" %></a></li>
+    <li><a href="<%= chapter.url %>"><%= t "osm_community_index.communities.#{chapter.id}.name" %></a></li>

   <% end %>
 </ul>
 
   <% end %>
 </ul>
 

diff --git a/config/initializers/osm_community_index.rb b/config/initializers/osm_community_index.rb
index 1400ef028d3fcbbc36e79865eb979f2641dcec8d..0a32bf2ebb429373706d373b630cf64cc195af53 100644 (file)
--- a/config/initializers/osm_community_index.rb
+++ b/config/initializers/osm_community_index.rb
@@ -1,3 +1,3 @@
 Rails.configuration.after_initialize do
 Rails.configuration.after_initialize do

-  OsmCommunityIndex::LocalChapter.add_to_i18n
+  OsmCommunityIndex.add_to_i18n

 end
 end

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index 519306d8f72a008dc0d1dc261050ba0c231478c8..1e868580da3da03c9dc70a4c407f666657155f90 100644 (file)
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -1,2 +1,26 @@
 module OsmCommunityIndex
 module OsmCommunityIndex

+  def self.add_to_i18n
+    communities = Community.all
+    files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*"))
+    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
+      locale_rails = locale.tr("_", "-")
+      data = {}
+
+      communities.each do |community|
+        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"]
+
+        data.deep_merge!({ "osm_community_index" => { "communities" => { id => strings } } })
+      end
+
+      I18n.backend.store_translations locale_rails, data
+    end
+  end

 end
 end

diff --git a/lib/osm_community_index/local_chapter.rb b/lib/osm_community_index/local_chapter.rb
deleted file mode 100644 (file)
index d83f134..0000000
--- a/lib/osm_community_index/local_chapter.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module OsmCommunityIndex
-  class LocalChapter
-    def self.add_to_i18n
-      local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
-      files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*"))
-      files.each do |file|
-        locale = File.basename(file, ".yaml")
-        community_index_yaml = YAML.safe_load(File.read(file))[locale]
-        # rails wants en-GB but osm-community-index has en_GB
-        locale_rails = locale.tr("_", "-")
-        data = {}
-
-        local_chapters.each do |chapter|
-          id = chapter[:id]
-
-          strings = community_index_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"] || chapter["strings"]["name"] || chapter["strings"]["community"]
-
-          data.deep_merge!({ "osm_community_index" => { "local_chapter" => { id => strings } } })
-        end
-
-        I18n.backend.store_translations locale_rails, data
-      end
-    end
-  end
-end