diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 5910682..8983200 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,9 +1,9 @@
<% if @message.author_user_id == @user.id %> - Back to Sent Messages + <%= t('.backtosentmessages') %> <% else %> - Back to Messages + <%= t('.backtomessages') %> <% end %>
@@ -11,22 +11,22 @@ <%= @message.subject %>
- Sent from + <%= t('.sentfrom') %> <% if @message.author %> <%= @message.author.username %> <% if @message.author.is_admin? %> - (administrator) + <%= t('.administrator') %> <% elsif @message.author.is_moderator? %> - (moderator) + <%= t('.moderator') %> <% end %> <% else %> <%= @message.author_username %> <% end %> - to + <%= t('.tomsg') %> <%= @message.recipient.username %> - <%= time_ago_in_words_label(@message.created_at) %> + <%= distance_of_time_in_words(@message.created_at, Time.now) %>
@@ -39,14 +39,14 @@
<%= form_tag message_path(@message.short_id), :method => :delete do %> - <%= submit_tag "Delete Message" %> + <%= submit_tag t('.deletemessage') %> <% end %>
<%= form_tag message_path(@message.short_id) + "/keep_as_new", :method => :post do %> - <%= submit_tag "Keep As New" %> + <%= submit_tag t('.keepasnew') %> <% end %>
@@ -56,9 +56,9 @@
- Compose Reply + <%= t('.composereply') %> <% if @new_message %> - To <%= @new_message.recipient_username %> + <%= t('.toupper') %> <%= @new_message.recipient_username %> <% end %>
@@ -80,11 +80,10 @@

- <%= submit_tag "Send Message" %> + <%= submit_tag t('.sendmessage') %>
<% end %> <% else %> - This message cannot be replied to. Please contact a moderator for - assistance. + <%= t('.cantreply') %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 676c7ec..36c46b6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -110,6 +110,18 @@ en: subject: "Subject:" message: "Message:" sendmessage: "Send Message" + show: + backtosentmessages: "Back to Sent Messages" + backtomessages: "Back to Messages" + sentfrom: "Sent From" + administrator: "(administrator)" + moderator: "(moderator)" + tomsg: "to" + deletemessage: "Delete Message" + keepasnew: "Keep As New" + composereply: "Compose Reply" + toupper: "To" + sendmessage: "Send Message" moderations: index: moderationlogtitle: "Moderation Log" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0751ed3..8f7e9c9 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -122,6 +122,19 @@ fr: subject: "Sujet :" message: "Message :" sendmessage: "Envoyer le message" + show: + backtosentmessages: "Retour aux messages envoyés" + backtomessages: "Retour aux messages" + sentfrom: "Envoyé depuis" + tomsg: "à" + administrator: "(administrateur)" + moderator: "(modérateur)" + deletemessage: "Supprimer le message" + keepasnew: "Garder comme non-lu" + composereply: "Écrire une réponse" + toupper: "À" + sendmessage: "Envoyer le message" + cantreply: "Il n'est pas possible de répondre à ce message. Merci de contacter un modérateur pour assistance." moderations: index: moderationlogtitle: "Journal de modération"