X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..c38a50fc5f43a185dda39fd1aa235a2bda8ad83b:/app/views/diary_entry/view.html.erb?ds=inline

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 23a5230c1..9871da8cc 100644
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
   <div id="userinformation" >
     <%= user_image @entry.user %>
-    <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+    <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
@@ -10,31 +10,29 @@
 
 <a id="comments"></a>
 <div class='comments'>
-  <% if @reported_comment %>
-    <%= render :partial => 'diary_comment', :collection => @reported_comment %>
-  <% else %>
-    <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
-  <% end %>
+<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 </div>
-<%= if_logged_in(:div) do %>
-  <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>
 
-  <%= error_messages_for 'diary_comment' %>
 
-  <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
-    <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
-    <%= submit_tag t('diary_entry.view.save_button') %>
-  <% end %>
-  <% if @user and @entry.subscribers.exists?(@user.id) %>
-    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
-  <% elsif @user %>
-    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
-  <% end %>
-<% end %>
+<div>
+  <% if current_user %>
+    <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
 
-<%= if_not_logged_in(:div) do %>
-  <h3 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
-<% end %>
+    <%= error_messages_for 'diary_comment' %>
+
+    <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
+      <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
+      <%= submit_tag t('.save_button') %>
+    <% end %>
+    <% if @entry.subscribers.exists?(current_user.id) %>
+      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+    <% else %>
+      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+    <% end %>
+  <% else %>
+    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
+  <% end %>
+</div>
 
 <% content_for :auto_discovery_link_tag do -%>
 <%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %>