Set the locale for issue and report views

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 21c717581fb979b3f86aec62008e80c69541c172..08092c073c7de0b14938edafc6c28f445f457c18 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -2,6 +2,7 @@ class ReportsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

+  before_action :set_locale

   before_action :require_user
 
   def new
   before_action :require_user
 
   def new


@@ -9,7 +10,7 @@ class ReportsController < ApplicationController
       @report = Report.new
       @report.issue = Issue.find_or_initialize_by(create_new_report_params)
     else
       @report = Report.new
       @report.issue = Issue.find_or_initialize_by(create_new_report_params)
     else

-      redirect_to root_path, :notice => t("reports.new.missing_params")
+      redirect_to root_path, :notice => t(".missing_params")

     end
   end
 
     end
   end
 


@@ -20,16 +21,16 @@ class ReportsController < ApplicationController
     if @report.save
       @report.issue.save
       @report.issue.reopen! unless @report.issue.open?
     if @report.save
       @report.issue.save
       @report.issue.reopen! unless @report.issue.open?

-      redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t("issues.create.successful_report")
+      redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")

     else
     else

-      redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t("issues.create.provide_details")
+      redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t(".provide_details")

     end
   end
 
   private
 
   def required_new_report_params_present?
     end
   end
 
   private
 
   def required_new_report_params_present?

-    create_new_report_params['reportable_id'].present? && create_new_report_params['reportable_type'].present?
+    create_new_report_params["reportable_id"].present? && create_new_report_params["reportable_type"].present?

   end
 
   def create_new_report_params
   end
 
   def create_new_report_params