aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLuc Donnet2018-05-15 12:01:58 +0200
committerGitHub2018-05-15 12:01:58 +0200
commit19865cf74318aa70e3f41506f8134037eeabd750 (patch)
treeeee1b213f5eb46f4ebeee4f826f5cca5a36efdd4 /app
parent578aa5f70c672a619582a861b616a738ce7fe91f (diff)
parentcb1b4d0eaa39697fedbeddf3b790bc2647dbf30b (diff)
downloadchouette-core-19865cf74318aa70e3f41506f8134037eeabd750.tar.bz2
Merge pull request #557 from af83/6949-compliance-check-set-csv-export-filename
Refs #Adapt CCSet CSV export filename to app language
Diffstat (limited to 'app')
-rw-r--r--app/controllers/compliance_check_messages_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/compliance_check_messages_controller.rb b/app/controllers/compliance_check_messages_controller.rb
index 36745981e..3c9009959 100644
--- a/app/controllers/compliance_check_messages_controller.rb
+++ b/app/controllers/compliance_check_messages_controller.rb
@@ -7,7 +7,7 @@ class ComplianceCheckMessagesController < ChouetteController
def index
index! do |format|
format.csv {
- send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "compliance_check_set_errors_#{line_code}_#{Date.today.to_s}.csv"
+ send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "#{t('compliance_check_messages.compliance_check_set_errors')}_#{line_code}_#{Time.now.strftime('%d_%m_%Y_%H_%M')}.csv"
}
end
end
@@ -22,10 +22,10 @@ class ComplianceCheckMessagesController < ChouetteController
end
def compliance_check_resource
- ComplianceCheckResource.find(params[:compliance_check_resource_id])
+ ComplianceCheckResource.find(params[:compliance_check_resource_id])
end
- private
+ private
def line_code
Chouette::Line.find_by_objectid("#{compliance_check_resource.reference}").get_objectid.local_id