From b38e57ac8c4e43e93adc5df40572dad71ed8d77e Mon Sep 17 00:00:00 2001
From: Carl Chenet <chaica@ohmytux.com>
Date: Tue, 15 Nov 2016 15:52:45 +0100
Subject: [PATCH] i18n of messages/index

---
 app/views/messages/index.html.erb | 31 +++++++++++++++----------------
 config/locales/en.yml             | 18 ++++++++++++++++++
 config/locales/fr.yml             | 18 ++++++++++++++++++
 3 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
index e333aab..bb6bef2 100644
--- a/app/views/messages/index.html.erb
+++ b/app/views/messages/index.html.erb
@@ -10,15 +10,15 @@
 <div class="box wide">
   <div class="legend" style="float: right;">
     <% if @direction == :out %>
-      <a href="/messages">View Received</a>
+      <a href="/messages"><%= t('.viewreceived') %></a>
     <% else %>
-      <a href="/messages/sent">View Sent</a>
+      <a href="/messages/sent"><%= t('.viewsent') %></a>
     <% end %>
   </div>
   <div class="legend">
-    Private Messages
+    <%= t('.privatemessages') %>
     <% if @direction == :out %>
-      Sent
+      <%= t('.sent') %>
     <% end %>
   </div>
 
@@ -28,9 +28,9 @@
       <tr>
         <th width="3%"><%= check_box_tag "delete_all",
           :id => "delete_all" %></th>
-        <th width="15%"><%= @direction == :in ? "From" : "To" %></th>
-        <th width="17%"><%= @direction == :in ? "Received" : "Sent" %></th>
-        <th width="60%">Subject</th>
+        <th width="15%"><%= @direction == :in ? t('.from') : t('.tomsg') %></th>
+        <th width="17%"><%= @direction == :in ? t('.received') : t('.sent') %></th>
+        <th width="60%"><%= t('.subjectlabel') %></th>
       </tr>
       <% @messages.includes(:author, :recipient).each do |message| %>
         <tr class="<%= message.has_been_read? ? "" : "bold" %>">
@@ -46,53 +46,52 @@
               <a href="/u/<%= message.recipient.username %>"><%=
                 message.recipient.username %></a>
             <% end %></td>
-          <td><%= time_ago_in_words_label(message.created_at) %></td>
+          <td><%= distance_of_time_in_words(message.created_at, Time.now) %></td>
           <td><a href="/messages/<%= message.short_id %>"><%= message.subject
             %></a></td>
         </tr>
       <% end %>
       </table>
       <p>
-      <%= submit_tag "Delete Selected" %>
+      <%= submit_tag t('.deleteselected') %>
       </p>
     <% end %>
   <% else %>
     <p>
-    You do not have any <%= @direction == :in ? "" : "sent" %> private
-      messages.
+    <%= t('.donothavemessages', :from => :in ? "" : t('.sentlower') )%>
     </p>
   <% end %>
 
   <br>
 
   <div class="legend">
-    Compose Message
+    <%= t('.composemessage') %>
   </div>
 
   <%= form_for @new_message, :method => :post do |f| %>
     <%= error_messages_for @new_message %>
 
     <div class="boxline">
-      <%= f.label :recipient_username, "To:", :class => "required" %>
+      <%= f.label :recipient_username, t('.tomsglabel'), :class => "required" %>
       <%= f.text_field :recipient_username, :size => 20,
         :autocomplete => "off" %>
     </div>
 
     <div class="boxline">
-      <%= f.label :subject, "Subject:", :class => "required" %>
+      <%= f.label :subject, t('.subject'), :class => "required" %>
       <%= f.text_field :subject, :style => "width: 500px;",
         :autocomplete => "off" %>
     </div>
 
     <div class="boxline">
-      <%= f.label :body, "Message:", :class => "required" %>
+      <%= f.label :body, t('.message'), :class => "required" %>
       <%= f.text_area :body, :style => "width: 500px;", :rows => 5,
         :autocomplete => "off" %>
     </div>
 
     <div class="boxline">
       <p></p>
-      <%= submit_tag "Send Message" %>
+      <%= submit_tag t('.sendmessage') %>
     </div>
   <% end %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ace09b8..676c7ec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,6 +92,24 @@ en:
       password: "New Password:"
       again: "(Again):"
       setpassbutton: "Set New Password"
+  messages:
+    index:
+      viewreceived: "View Received"
+      viewsent: "View Sent"
+      subjectlabel: "Subject"
+      privatemessages: "Private Messages"
+      sent: "Sent"
+      from: "From"
+      tomsg: "To"
+      received: "Received"
+      deleteselected: "Delete Selected"
+      donothavemessages: "You do not have any %{from} private messages."
+      sentlower: "sent"
+      composemessage: "Compose Message"
+      tomsglabel: "To:"
+      subject: "Subject:"
+      message: "Message:"
+      sendmessage: "Send Message"
   moderations:
     index:
       moderationlogtitle: "Moderation Log"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 41e8372..0751ed3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -104,6 +104,24 @@ fr:
       filtereddesc: "Description"
       filteredstories: "Infos"
       filteredsave: "Sauver les filtres"
+  messages:
+    index:
+      viewreceived: "Voir messages reçus"
+      viewsent: "Voir messages envoyés"
+      subjectlabel: "Sujet"
+      privatemessages: "Messages privés"
+      sent: "Envoyés"
+      from: "De"
+      tomsg: "À"
+      received: "Reçus"
+      deleteselected: "Supprimer ceux sélectionnés"
+      donothavemessages: "Vous n'avez pas de %{from} messages privés."
+      sentlower: "sent"
+      composemessage: "Écrire un message"
+      tomsglabel: "À :"
+      subject: "Sujet :"
+      message: "Message :"
+      sendmessage: "Envoyer le message"
   moderations:
     index:
       moderationlogtitle: "Journal de modération"