Merge remote-tracking branch 'upstream/pull/1984'

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

diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb
index 448b2a5d619e1b97d9d5d20e5c9febe72c878d84..8d1acec759699d511058061152f5fcd966dad15c 100644 (file)
--- a/app/controllers/issue_comments_controller.rb
+++ b/app/controllers/issue_comments_controller.rb
@@ -2,6 +2,7 @@ class IssueCommentsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

+  before_action :set_locale

   before_action :require_user
   before_action :check_permission
 
   before_action :require_user
   before_action :check_permission
 


@@ -10,7 +11,7 @@ class IssueCommentsController < ApplicationController
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     comment.save!
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     comment.save!

-    notice = t("issues.comment.comment_created")
+    notice = t(".comment_created")

     reassign_issue(@issue) if params[:reassign]
     redirect_to @issue, :notice => notice
   end
     reassign_issue(@issue) if params[:reassign]
     redirect_to @issue, :notice => notice
   end


@@ -23,7 +24,7 @@ class IssueCommentsController < ApplicationController
 
   def check_permission
     unless current_user.administrator? || current_user.moderator?
 
   def check_permission
     unless current_user.administrator? || current_user.moderator?

-      flash[:error] = t("application.require_admin.not_an_admin")
+      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")

       redirect_to root_path
     end
   end
       redirect_to root_path
     end
   end