diff --git a/wiki/app/views/wiki/edit.rhtml b/wiki/app/views/wiki/edit.rhtml index e8edd8d6a..f8f2ea041 100644 --- a/wiki/app/views/wiki/edit.rhtml +++ b/wiki/app/views/wiki/edit.rhtml @@ -1,5 +1,5 @@
-<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

<%= @page.pretty_title %>

diff --git a/wiki/app/views/wiki/history.rhtml b/wiki/app/views/wiki/history.rhtml index c82ba952c..580a6eeb3 100644 --- a/wiki/app/views/wiki/history.rhtml +++ b/wiki/app/views/wiki/history.rhtml @@ -1,5 +1,5 @@
-<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

<%= @page.pretty_title %>

diff --git a/wiki/app/views/wiki/show.rhtml b/wiki/app/views/wiki/show.rhtml index a24b91fca..92037d8dc 100644 --- a/wiki/app/views/wiki/show.rhtml +++ b/wiki/app/views/wiki/show.rhtml @@ -1,19 +1,21 @@
<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %> <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> -<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-

<%= @page.pretty_title %>

+

<%=h @page.pretty_title %>

<% if @content.version != @page.content.version %>
- <%= link_to('Version actuelle', :action => 'index', :page => @page.title) %> (<%= @page.content.version %>) + <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %> (<%= @page.content.version %>) <%= " - " + link_to(('« ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) if @content.version > 1 %> <%= " - " + link_to((l(:label_next) + ' »'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) if @content.version < @page.content.version %>
- <%= "Version #{@content.version} du #{format_time(@content.updated_on)}" %> + <%= "#{l(:label_version)} #{@content.version} - #{format_time(@content.updated_on)}" %> + (<%= @content.author ? @content.author.name : "anonyme" %>)
+ <%=h @content.comment %>
<% end %> diff --git a/wiki/app/views/wiki/special_page_index.rhtml b/wiki/app/views/wiki/special_page_index.rhtml index 0d23d9653..35bdb5a38 100644 --- a/wiki/app/views/wiki/special_page_index.rhtml +++ b/wiki/app/views/wiki/special_page_index.rhtml @@ -1,4 +1,4 @@ -

Page index

+

<%= l(:label_page_index) %>

<% if @pages.empty? %>

<%= l(:label_no_data) %>

<% end %>