X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/11f457e84238cf4e53b0d5f7ee8bad4d5d50a14e..f0f111aced146d78b4c31a6175c0150bc6497c50:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 183f8004a..155e619d7 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -12,7 +12,7 @@ class MessageController < ApplicationController
   # clicks send.
   # The user_id param is the id of the user that the message is being sent to.
   def new
-    @title = 'send message'
+    @title = t 'message.new.title'
     @to_user = User.find(params[:user_id])
     if params[:message]
       @message = Message.new(params[:message])
@@ -21,7 +21,7 @@ class MessageController < ApplicationController
       @message.sent_on = Time.now.getutc
    
       if @message.save
-        flash[:notice] = 'Message sent'
+        flash[:notice] = t 'message.new.message_sent'
         Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
@@ -45,7 +45,7 @@ class MessageController < ApplicationController
 
   # Show a message
   def read
-    @title = 'read message'
+    @title = t 'message.read.title'
     @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
     @message.message_read = true if @message.to_user_id == @user.id
     @message.save
@@ -55,7 +55,7 @@ class MessageController < ApplicationController
 
   # Display the list of messages that have been sent to the user.
   def inbox
-    @title = 'inbox'
+    @title = t 'message.inbox.title'
     if @user and params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
@@ -64,7 +64,7 @@ class MessageController < ApplicationController
 
   # Display the list of messages that the user has sent to other users.
   def outbox
-    @title = 'outbox'
+    @title = t 'message.outbox.title'
     if @user and params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name
@@ -78,14 +78,14 @@ class MessageController < ApplicationController
       message = Message.find_by_id(id)
       if params[:mark] == 'unread'
         message_read = false 
-        mark_type = 'unread'
+        notice = t 'message.mark.as_unread'
       else
         message_read = true
-        mark_type = 'read'
+        notice = t 'message.mark.as_read'
       end
       message.message_read = message_read
       if message.save
-        flash[:notice] = "Message marked as #{mark_type}"
+        flash[:notice] = notice
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end