X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/721dd9c27d299455b9159457a095716f797389f1..32c0a7e5a874d0369bcde1bc8cbdb1f04d1463c1:/app/views/diary_entry/list.rhtml?ds=sidebyside diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index 9852313bb..00937d89e 100644 --- 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 %> - <%= 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 %> - <%= 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? %> -

No diary entries

- +

<%= t 'diary_entry.list.no_entries' %>

<% else %> +

<%= t 'diary_entry.list.recent_entries' %>

+ +
+ + <%= render :partial => 'diary_entry', :collection => @entries %> -

Recent diary entries:

-
- <%= 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 %> - -
- + <%= 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 %> + +
<% end %> <%= rss_link_to :action => 'rss' %> -<%= auto_discovery_link_tag :atom, :action => 'rss' %> - -
-
\ No newline at end of file +<% content_for :head do %> +<%= auto_discovery_link_tag :atom, :action => 'rss' %> +<% end %>