diff options
| author | Luc Donnet | 2018-05-15 12:01:58 +0200 |
|---|---|---|
| committer | GitHub | 2018-05-15 12:01:58 +0200 |
| commit | 19865cf74318aa70e3f41506f8134037eeabd750 (patch) | |
| tree | eee1b213f5eb46f4ebeee4f826f5cca5a36efdd4 | |
| parent | 578aa5f70c672a619582a861b616a738ce7fe91f (diff) | |
| parent | cb1b4d0eaa39697fedbeddf3b790bc2647dbf30b (diff) | |
| download | chouette-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
| -rw-r--r-- | app/controllers/compliance_check_messages_controller.rb | 6 | ||||
| -rw-r--r-- | config/locales/compliance_check_messages.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/compliance_check_messages.fr.yml | 1 |
3 files changed, 5 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 diff --git a/config/locales/compliance_check_messages.en.yml b/config/locales/compliance_check_messages.en.yml index ade4329a2..ea91c21f2 100644 --- a/config/locales/compliance_check_messages.en.yml +++ b/config/locales/compliance_check_messages.en.yml @@ -30,6 +30,7 @@ en: 3_shape_1: "Tracé %{source_objectid} : le tracé passe trop loin de l'arrêt %{target_0_label} (%{target_0_objectid}) : %{error_value} > %{reference_value}" 3_shape_2: "Tracé %{source_objectid} : le tracé n'est pas défini entre les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid})" 3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections" + compliance_check_set_errors: compliance_check_set_errors activerecord: attributes: compliance_check_message: diff --git a/config/locales/compliance_check_messages.fr.yml b/config/locales/compliance_check_messages.fr.yml index 21f100f46..6c0b54aec 100644 --- a/config/locales/compliance_check_messages.fr.yml +++ b/config/locales/compliance_check_messages.fr.yml @@ -30,6 +30,7 @@ fr: 3_shape_1: "Tracé %{source_objectid} : le tracé passe trop loin de l'arrêt %{target_0_label} (%{target_0_objectid}) : %{error_value} > %{reference_value}" 3_shape_2: "Tracé %{source_objectid} : le tracé n'est pas défini entre les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid})" 3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections" + compliance_check_set_errors: erreurs_validation activerecord: attributes: compliance_check_message: |