merge translated tags branch

2014-05-29 23:11:34 -04:00
parent 3f61415388 aebeffb888
commit eb81f06eb2
15 changed files with 109 additions and 7 deletions
--- a/app/views/posts/partials/index/_excerpt.html.erb
+++ b/app/views/posts/partials/index/_excerpt.html.erb
@@ -41,6 +41,10 @@
    </div>
  <% elsif post_set.has_wiki? %>
    <div class="prose">
+      <% if post_set.wiki_page.other_names.present? %>
+        <p><%= wiki_page_other_names_list(post_set.wiki_page) %></p>
+      <% end %>
+
      <%= format_text(post_set.wiki_page.presenter.excerpt) %>

      <% if post_set.wiki_page.artist %>