X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7441f15b4fd59735ae00a16b47cfcf7eb99260a6..0e0c89b95c16abd7bc548bea7bff03cbb715b3b3:/app/views/diary_entry/_diary_entry.html.erb?ds=sidebyside
diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 930f20e5e..ec2f22601 100644
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -4,10 +4,10 @@
<%= user_thumbnail diary_entry.user %>
<% end %>
-
<%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+ <%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %>
- <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+ <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'index', :display_name => nil, :language => diary_entry.language_code)) %>
@@ -21,10 +21,10 @@
<% end %>
- <% if params[:action] == 'list' %>
- - <%= link_to t('.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
+ <% if params[:action] == 'index' %>
+ - <%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %>
- <%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %>
- - <%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
+ - <%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %>
<% end %>
<% if current_user && current_user == diary_entry.user %>