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

[rails.git] / app / views / site / communities.html.erb

diff --git a/app/views/site/communities.html.erb b/app/views/site/communities.html.erb
index e238d73779fd5e03c163eddce88e6b4898013feb..21b5c235c541d2e204999eab7c2bdbb982b06a5e 100644 (file)
--- a/app/views/site/communities.html.erb
+++ b/app/views/site/communities.html.erb
@@ -1,19 +1,24 @@
 <% content_for :heading do %>
-  <%= tag.h1 do %>
-    <%= t ".title" %>
-  <% end %>
+  <h1><%= t ".title" %></h1>
 <% end %>
 
-<%= tag.div do %>
-  <p><%= t ".lede_text" %></p>
-  <h2><%= t ".local_chapters.title" %></h2>
-  <p><%= t ".local_chapters.about_text" %></p>
-  <p><%= t ".local_chapters.list_text" %></p>
-  <ul>
-    <% @local_chapters.each do |chapter| %>
-      <li><a href="<%= chapter.url %>"><%= chapter.name %> / <%= t "osm_community_index.local_chapter." + chapter.id + ".name" %></a></li>
-    <% end %>
-  </ul>
-  <h2><%= t ".other_groups.title" %></h2>
-  <p><%= t ".other_groups.about_html" %></p>
-<% end %>
+<p class="lead"><%= t ".lede_text" %></p>
+
+<h2><%= t ".local_chapters.title" %></h2>
+<p><%= t ".local_chapters.about_text" %></p>
+<p><%= t ".local_chapters.list_text" %></p>
+<ul>
+  <% @local_chapters.each do |chapter| %>
+    <li>
+      <% if chapter.url %>
+        <a href="<%= chapter.url %>"><%= t "osm_community_index.communities.#{chapter.id}.name" %></a>
+      <% else %>
+        <%= t "osm_community_index.communities.#{chapter.id}.name" %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+
+<h2><%= t ".other_groups.title" %></h2>
+<p><%= t ".other_groups.other_groups_html", :communities_wiki_link => link_to(t(".other_groups.communities_wiki"),
+                                                                              t(".other_groups.communities_wiki_url")) %>