Make a few more things translatable.

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index d2fa9bd5fa54744d80749285fb9a137d77b0a734..155e619d756660da9ea1d3b6975093099dce2256 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -2,23 +2,26 @@ class MessageController < ApplicationController
   layout 'site'
 
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user
+  before_filter :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :reply, :mark]
 
   # Allow the user to write a new message to another user. This action also 
   # deals with the sending of that message to the other user when the user
   # 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])
       @message.to_user_id = @to_user.id
       @message.from_user_id = @user.id
-      @message.sent_on = Time.now
+      @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
@@ -34,7 +37,7 @@ class MessageController < ApplicationController
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
     @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
     @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"
-    @user_id = message.from_user_id
+    @to_user = User.find(message.from_user_id)
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     render :action => 'no_such_user', :status => :not_found
@@ -42,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
@@ -52,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
@@ -61,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
@@ -75,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