diff options
| author | Luc Donnet | 2018-05-15 11:23:16 +0200 |
|---|---|---|
| committer | GitHub | 2018-05-15 11:23:16 +0200 |
| commit | 578aa5f70c672a619582a861b616a738ce7fe91f (patch) | |
| tree | f3e1247135b5033f7aaae485f5ce907e5dc631c9 | |
| parent | 4c94257d93c33bc2d6a2c4f146ebe0843763c89a (diff) | |
| parent | 7cf366a2d0e43c53d0f0a3e05f5fc63fb57b58b8 (diff) | |
| download | chouette-core-578aa5f70c672a619582a861b616a738ce7fe91f.tar.bz2 | |
Merge pull request #556 from af83/6950-import-csv-export-filename
Refs #6950 Adapt import CSV export filename to app language
| -rw-r--r-- | app/controllers/import_messages_controller.rb | 2 | ||||
| -rw-r--r-- | config/locales/import_messages.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/import_messages.fr.yml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb index e9a071177..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 => "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')}_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.strftime("%d/%m/%Y_%H:%M")}.csv" } 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 e61980e36..a8dd31f8a 100644 --- a/config/locales/import_messages.fr.yml +++ b/config/locales/import_messages.fr.yml @@ -67,6 +67,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: |