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 ba687966f5cc50867cd631b2c31920b049604117..21b5c235c541d2e204999eab7c2bdbb982b06a5e 100644 (file)
--- a/app/views/site/communities.html.erb
+++ b/app/views/site/communities.html.erb
@@ -9,9 +9,16 @@
 <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.communities.#{chapter.id}.name" %></a></li>
+    <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>
   <% end %>
 </ul>
 
 <h2><%= t ".other_groups.title" %></h2>

-<p><%= t ".other_groups.about_html" %></p>
+<p><%= t ".other_groups.other_groups_html", :communities_wiki_link => link_to(t(".other_groups.communities_wiki"),
+                                                                              t(".other_groups.communities_wiki_url")) %>