The list_bbox_rss won't work at all without a bbox. Thow an error when it's not supplied

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 183f8004a19ed1831c28e52ceab1a28dd9e99333..b4cc6bfa84398db7cdd4eddded5b4b623390e187 100644 (file)
--- 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
   # 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])
     @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
       @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
         Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end


@@ -29,6 +29,7 @@ class MessageController < ApplicationController
       @title = params[:title]
     end
   rescue ActiveRecord::RecordNotFound
       @title = params[:title]
     end
   rescue ActiveRecord::RecordNotFound

+    @title = t'message.no_such_user.title'

     render :action => 'no_such_user', :status => :not_found
   end
 
     render :action => 'no_such_user', :status => :not_found
   end
 


@@ -40,22 +41,24 @@ class MessageController < ApplicationController
     @to_user = User.find(message.from_user_id)
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     @to_user = User.find(message.from_user_id)
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound

+    @title = t'message.no_such_user.title'

     render :action => 'no_such_user', :status => :not_found
   end
 
   # Show a message
   def read
     render :action => 'no_such_user', :status => :not_found
   end
 
   # 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
   rescue ActiveRecord::RecordNotFound
     @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
   rescue ActiveRecord::RecordNotFound

+    @title = t'message.no_such_user.title'

     render :action => 'no_such_user', :status => :not_found
   end
 
   # Display the list of messages that have been sent to the user.
   def inbox
     render :action => 'no_such_user', :status => :not_found
   end
 
   # 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
     if @user and params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name


@@ -64,7 +67,7 @@ class MessageController < ApplicationController
 
   # Display the list of messages that the user has sent to other users.
   def outbox
 
   # 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
     if @user and params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name


@@ -78,18 +81,19 @@ class MessageController < ApplicationController
       message = Message.find_by_id(id)
       if params[:mark] == 'unread'
         message_read = false 
       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
       else
         message_read = true

-        mark_type = 'read'
+        notice = t 'message.mark.as_read'

       end
       message.message_read = message_read
       if message.save
       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
   rescue ActiveRecord::RecordNotFound
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end
   rescue ActiveRecord::RecordNotFound

+    @title = t'message.no_such_user.title'

     render :action => 'no_such_user', :status => :not_found
   end
 end
     render :action => 'no_such_user', :status => :not_found
   end
 end