aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2018-05-07 07:06:43 -0700
committercedricnjanga2018-05-07 07:06:43 -0700
commit5352fad45a9d51a3a65c8d16ad9c48a1225a38ab (patch)
treecb5e795801db21a24f383d5fb6cf13f3a31bfe01
parent3750a1da0650b692046d7422537a310ba5c5bfd6 (diff)
downloadchouette-core-5352fad45a9d51a3a65c8d16ad9c48a1225a38ab.tar.bz2
Refs #Adapt CCSet CSV export filename to app language
-rw-r--r--app/controllers/compliance_check_messages_controller.rb2
-rw-r--r--config/locales/compliance_check_messages.en.yml1
-rw-r--r--config/locales/compliance_check_messages.fr.yml1
3 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/compliance_check_messages_controller.rb b/app/controllers/compliance_check_messages_controller.rb
index 36745981e..597dc7b6c 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_set_messages.compliance_check_set_errors')}_#{line_code}_#{Date.today.to_s}.csv"
}
end
end
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: