3 files changed, 6 insertions, 11 deletions
diff --git a/app/controllers/discussions_controller.rb b/app/controllers/discussions_controller.rb
index cf658b6..48f6652 100644
--- a/app/controllers/discussions_controller.rb
+++ b/app/controllers/discussions_controller.rb
@@ -12,7 +12,7 @@ class DiscussionsController < ApplicationController
   # GET /discussions/1.json
   def show
     @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
-    redirect_to discussions_url, :notice => t("views.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+    redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
     
     @discussion.mark_as_read_for(current_user)
   end
@@ -36,17 +36,12 @@ class DiscussionsController < ApplicationController
     end
     
     if @discussion.save
-      redirect_to @discussion, :notice => t("views.discussions.started")
+      redirect_to @discussion, :notice => t("inboxes.discussions.started")
     else
       render :action => "new"
     end
   end
   
-  def leave
-    @discussion.remove_speaker(current_user)
-    redirect_to discussions_url, :notice => t("views.discussions.leaved")
-  end
-  
   private
   
   def load_and_check_discussion_recipient
@@ -64,7 +59,7 @@ class DiscussionsController < ApplicationController
           Message.create(:discussion => discussion, :user => current_user, :body => message.body) if message.body
         end
         # перекидываем на нее
-        redirect_to discussion_url(discussion), :notice => t("views.discussions.exists", :user => user[Inboxes::config.user_name])
+        redirect_to discussion_url(discussion), :notice => t("inboxes.discussions.exists", :user => user[Inboxes::config.user_name])
       end
     end
   end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index a302237..7baf8df 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -2,7 +2,7 @@ class MessagesController < ApplicationController
   
   def create
     @discussion = Discussion.find(params[:discussion_id])
-    redirect_to root_url, :notice => t("views.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+    redirect_to root_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
     
     @message = Message.new(params[:message])
     @message.user = current_user
diff --git a/app/controllers/speakers_controller.rb b/app/controllers/speakers_controller.rb
index 17cedb9..db90dbe 100644
--- a/app/controllers/speakers_controller.rb
+++ b/app/controllers/speakers_controller.rb
@@ -13,7 +13,7 @@ class SpeakersController < ApplicationController
   def destroy
     @speaker = Speaker.find(params[:id])
     @speaker.destroy
-    flash[:notice] = t("views.speakers.removed")
+    flash[:notice] = @speaker.user == current_user ? t("inboxes.discussions.leaved") : t("inboxes.speakers.removed")
     redirect_to @discussion.speakers.any? && @discussion.can_participate?(current_user) ? @discussion : discussions_url
   end
   
@@ -21,6 +21,6 @@ class SpeakersController < ApplicationController
   
   def init_and_check_permissions
     @discussion = Discussion.find(params[:discussion_id])
-    redirect_to discussions_url, :notice => t("views.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+    redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
   end
 end