From 74bfe8b9e502167ee6147427c704e78dffce7085 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 4 Mar 2007 13:53:19 +0000
Subject: [PATCH] replaced hardcoded strings in wiki views

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@291 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 wiki/app/views/wiki/edit.rhtml               |  2 +-
 wiki/app/views/wiki/history.rhtml            |  2 +-
 wiki/app/views/wiki/show.rhtml               | 10 ++++++----
 wiki/app/views/wiki/special_page_index.rhtml |  2 +-
 wiki/lang/fr.yml                             |  2 ++
 5 files changed, 11 insertions(+), 7 deletions(-)

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 @@
 <div class="contextual">
-<%= 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') %>
 </div>
 
 <h2><%= @page.pretty_title %></h2>
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 @@
 <div class="contextual">
-<%= 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') %>
 </div>
 
 <h2><%= @page.pretty_title %></h2>
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 @@
 <div class="contextual">
 <%= 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') %>
 </div>
 
-<h2><%= @page.pretty_title %></h2>
+<h2><%=h @page.pretty_title %></h2>
 
 <% if @content.version != @page.content.version %>
 <div class="box">
     <div style="float:right;">
-    <%= 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(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) if @content.version > 1 %>
     <%= " - " + link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) if @content.version < @page.content.version %>
     </div>    
-    <%= "Version #{@content.version} du #{format_time(@content.updated_on)}"  %>
+    <%= "<strong>#{l(:label_version)} #{@content.version}</strong> - #{format_time(@content.updated_on)}"  %>
+    <em>(<%= @content.author ? @content.author.name : "anonyme" %>)</em><br />
+    <%=h @content.comment %>
 </div>
 <% 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 @@
-<h2>Page index</h2>
+<h2><%= l(:label_page_index) %></h2>
 
 <% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
 <ul><% @pages.each do |page| %>
diff --git a/wiki/lang/fr.yml b/wiki/lang/fr.yml
index 31e17c689..c0568eb5a 100644
--- a/wiki/lang/fr.yml
+++ b/wiki/lang/fr.yml
@@ -320,6 +320,8 @@ label_search: Recherche
 label_result: %d résultat
 label_result_plural: %d résultats
 label_wiki: Wiki
+label_page_index: Index des pages
+label_current_version: Version actuelle
 
 button_login: Connexion
 button_submit: Soumettre