From 737c28add278b56d0e8def940df1118e063380c6 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Mon, 7 May 2018 07:04:01 -0700
Subject: Refs #6950 Adapt import CSV export filename to app language

---
 app/controllers/import_messages_controller.rb | 8 +++++++-
 config/locales/import_messages.en.yml         | 1 +
 config/locales/import_messages.fr.yml         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index e9a071177..0c9607449 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -9,7 +9,7 @@ class ImportMessagesController < ChouetteController
   def index
     index! do |format|
       format.csv {
-        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "import_errors_#{@import_resource.name.gsub('.xml', '')}_#{Date.today.to_s}.csv"
+        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors_')}_#{line_code}_#{Date.today.to_s}.csv"
       }
     end
   end
@@ -23,4 +23,10 @@ class ImportMessagesController < ChouetteController
     @import_resource ||= Import::Resource.find(params[:import_resource_id])
   end
 
+  private
+
+  def line_code
+    Chouette::Line.find_by_objectid("#{@import_resource.reference}").get_objectid.local_id
+  end
+
 end
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index 3ed98aaa6..27035ba84 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -54,6 +54,7 @@ en:
     2_netexstif_servicejourneypattern_3_1: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet ServiceJourneyPattern d'identifiant %{source_objectid} n'a pas de valeur pour l'attribut ServiceJourneyPatternType"
     2_netexstif_servicejourneypattern_3_2: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet ServiceJourneyPattern d'identifiant %{source_objectid} a une valeur interdite %{error_value} pour l'attribut ServiceJourneyPatternType différente de 'passenger'"
     2_netexstif_servicejourneypattern_4: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number}, objet ServiceJourneyPattern d'identifiant %{source_objectid} : les attributs 'order' des StopPointInJourneyPattern ne sont pas croissants."
+    import_errors: import_errors
   activerecord:
     attributes:
       import_message:
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 5d82b9125..76d9d904c 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -54,6 +54,7 @@ fr:
     2_netexstif_servicejourneypattern_3_1: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet ServiceJourneyPattern d'identifiant %{source_objectid} n'a pas de valeur pour l'attribut ServiceJourneyPatternType"
     2_netexstif_servicejourneypattern_3_2: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet ServiceJourneyPattern d'identifiant %{source_objectid} a une valeur interdite %{error_value} pour l'attribut ServiceJourneyPatternType différente de 'passenger'"
     2_netexstif_servicejourneypattern_4: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number}, objet ServiceJourneyPattern d'identifiant %{source_objectid} : les attributs 'order' des StopPointInJourneyPattern ne sont pas croissants."
+    import_errors: erreurs_import
   activerecord:
     attributes:
       import_message:
-- 
cgit v1.2.3


From 7cf366a2d0e43c53d0f0a3e05f5fc63fb57b58b8 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Tue, 15 May 2018 11:17:59 +0200
Subject: Fix filename for import resource Refs #6950 @1

---
 app/controllers/import_messages_controller.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index 0c9607449..0f62598bf 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -9,7 +9,7 @@ class ImportMessagesController < ChouetteController
   def index
     index! do |format|
       format.csv {
-        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors_')}_#{line_code}_#{Date.today.to_s}.csv"
+        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors')}_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.strftime("%d/%m/%Y_%H:%M")}.csv"
       }
     end
   end
@@ -23,10 +23,4 @@ class ImportMessagesController < ChouetteController
     @import_resource ||= Import::Resource.find(params[:import_resource_id])
   end
 
-  private
-
-  def line_code
-    Chouette::Line.find_by_objectid("#{@import_resource.reference}").get_objectid.local_id
-  end
-
 end
-- 
cgit v1.2.3