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 @@
- Private Messages
+ <%= t('.privatemessages') %>
<% if @direction == :out %>
- Sent
+ <%= t('.sent') %>
<% end %>
@@ -28,9 +28,9 @@
<%= check_box_tag "delete_all",
:id => "delete_all" %> |
- <%= @direction == :in ? "From" : "To" %> |
- <%= @direction == :in ? "Received" : "Sent" %> |
- Subject |
+ <%= @direction == :in ? t('.from') : t('.tomsg') %> |
+ <%= @direction == :in ? t('.received') : t('.sent') %> |
+ <%= t('.subjectlabel') %> |
<% @messages.includes(:author, :recipient).each do |message| %>
">
@@ -46,53 +46,52 @@
<%=
message.recipient.username %>
<% end %>
- <%= time_ago_in_words_label(message.created_at) %> |
+ <%= distance_of_time_in_words(message.created_at, Time.now) %> |
<%= message.subject
%> |
<% end %>
- <%= submit_tag "Delete Selected" %>
+ <%= submit_tag t('.deleteselected') %>
<% end %>
<% else %>
- You do not have any <%= @direction == :in ? "" : "sent" %> private
- messages.
+ <%= t('.donothavemessages', :from => :in ? "" : t('.sentlower') )%>
<% end %>
- Compose Message
+ <%= t('.composemessage') %>
<%= form_for @new_message, :method => :post do |f| %>
<%= error_messages_for @new_message %>
- <%= f.label :recipient_username, "To:", :class => "required" %>
+ <%= f.label :recipient_username, t('.tomsglabel'), :class => "required" %>
<%= f.text_field :recipient_username, :size => 20,
:autocomplete => "off" %>
- <%= f.label :subject, "Subject:", :class => "required" %>
+ <%= f.label :subject, t('.subject'), :class => "required" %>
<%= f.text_field :subject, :style => "width: 500px;",
:autocomplete => "off" %>
- <%= f.label :body, "Message:", :class => "required" %>
+ <%= f.label :body, t('.message'), :class => "required" %>
<%= f.text_area :body, :style => "width: 500px;", :rows => 5,
:autocomplete => "off" %>
- <%= submit_tag "Send Message" %>
+ <%= submit_tag t('.sendmessage') %>
<% end %>
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"