friend map translations

[rails.git] / app / views / diary_entry / list.rhtml

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 9852313bbd7e669d308af8586fd2ed0c49562580..00937d89e0001d9c765596ceb2cc0575dec7b5a2 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -7,37 +7,33 @@
 
 <% if @this_user %>
   <% if @user == @this_user %>
 
 <% if @this_user %>
   <% if @user == @this_user %>

-    <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
+    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>

   <% end %>
 <% else %>
   <% if @user %>
   <% end %>
 <% else %>
   <% if @user %>

-    <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
+    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>

   <% end %>
 <% end %>
 
 
 <% if @entries.empty? %>
   <% end %>
 <% end %>
 
 
 <% if @entries.empty? %>

-       <p>No diary entries</p>
-
+  <p><%= t 'diary_entry.list.no_entries' %></p>

 <% else %>
 <% else %>

+  <p><%= t 'diary_entry.list.recent_entries' %></p>
+
+  <hr />
+
+  <%= render :partial => 'diary_entry', :collection => @entries %>

        
        

-       <p>Recent diary entries:</p>
-       <hr />
-       <%= render :partial => 'diary_entry', :collection => @entries %>
-       
-       <%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %>
-       <% if @entry_pages.current.next and @entry_pages.current.previous %>
-       |
-       <% end %>
-       <%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
-       
-       <br />
-       
+  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+  <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
+  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+
+  <br />

 <% end %>
 
 <%= rss_link_to :action => 'rss' %>
 <% end %>
 
 <%= rss_link_to :action => 'rss' %>

-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
-

 
 

-<br />
-<br />
\ No newline at end of file
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<% end %>