Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 9b39f1c0588152d814d7104576697bd37f7f7da0..29b74c8480fb97799450d8b26c17ea6f0775f738 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -18,8 +18,8 @@ class MessageController < ApplicationController
         flash[:error] = t "message.new.limit_exceeded"
       else
         @message = Message.new(message_params)
         flash[:error] = t "message.new.limit_exceeded"
       else
         @message = Message.new(message_params)

-        @message.to_user_id = @this_user.id
-        @message.from_user_id = current_user.id
+        @message.recipient = @this_user
+        @message.sender = current_user

         @message.sent_on = Time.now.getutc
 
         if @message.save
         @message.sent_on = Time.now.getutc
 
         if @message.save


@@ -38,7 +38,7 @@ class MessageController < ApplicationController
   def reply
     message = Message.find(params[:message_id])
 
   def reply
     message = Message.find(params[:message_id])
 

-    if message.to_user_id == current_user.id
+    if message.recipient == current_user

       message.update(:message_read => true)
 
       @message = Message.new(
       message.update(:message_read => true)
 
       @message = Message.new(


@@ -64,8 +64,8 @@ class MessageController < ApplicationController
     @title = t "message.read.title"
     @message = Message.find(params[:message_id])
 
     @title = t "message.read.title"
     @message = Message.find(params[:message_id])
 

-    if @message.to_user_id == current_user.id || @message.from_user_id == current_user.id
-      @message.message_read = true if @message.to_user_id == current_user.id
+    if @message.recipient == current_user || @message.sender == current_user
+      @message.message_read = true if @message.recipient == current_user

       @message.save
     else
       flash[:notice] = t "message.read.wrong_user", :user => current_user.display_name
       @message.save
     else
       flash[:notice] = t "message.read.wrong_user", :user => current_user.display_name