Refs #6306 Add I18n to CSV export columns

8 files changed, 41 insertions, 4 deletions

diff --git a/app/models/compliance_check_message_export.rb b/app/models/compliance_check_message_export.rb
index bbaaa8e3f..9b7f90fac 100644
--- a/app/models/compliance_check_message_export.rb
+++ b/app/models/compliance_check_message_export.rb
@@ -22,7 +22,7 @@ class ComplianceCheckMessageExport
   end
 
   def column_names
-    ["criticity", "message key", "resource objectid", "link", "message"]
+    ["criticity", "message_key", "resource_objectid", "link", "message"].map {|c| ComplianceCheckMessage.tmf(c)}
   end
 
   def to_csv(options = {})
diff --git a/app/models/import/message_export.rb b/app/models/import/message_export.rb
index 7a7add08c..7d03783ed 100644
--- a/app/models/import/message_export.rb
+++ b/app/models/import/message_export.rb
@@ -22,7 +22,7 @@ class Import::MessageExport
   end
 
   def column_names
-    ["criticity", "message key", "message", "file name", "line", "column"]
+    ["criticity", "message_key", "message", "filename", "line", "column"].map {|c| Import::Message.tmf(c)}
   end
 
   def to_csv(options = {})
diff --git a/config/locales/compliance_check_messages.en.yml b/config/locales/compliance_check_messages.en.yml
index 88841f308..ade4329a2 100644
--- a/config/locales/compliance_check_messages.en.yml
+++ b/config/locales/compliance_check_messages.en.yml
@@ -30,3 +30,11 @@ 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"
+  activerecord:
+    attributes:
+      compliance_check_message:
+        criticity: Criticity
+        message_key: Message key
+        resource_objectid: Resource objectid
+        link: Link
+        message: Message
\ No newline at end of file
diff --git a/config/locales/compliance_check_messages.fr.yml b/config/locales/compliance_check_messages.fr.yml
index 167ef411a..21f100f46 100644
--- a/config/locales/compliance_check_messages.fr.yml
+++ b/config/locales/compliance_check_messages.fr.yml
@@ -30,3 +30,11 @@ 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"
+  activerecord:
+    attributes:
+      compliance_check_message:
+        criticity: Criticité
+        message_key: Clé du message
+        resource_objectid: Objectid de la resource
+        link: Lien
+        message: Message
\ No newline at end of file
diff --git a/config/locales/compliance_checks.en.yml b/config/locales/compliance_checks.en.yml
index f960755da..679a136f0 100644
--- a/config/locales/compliance_checks.en.yml
+++ b/config/locales/compliance_checks.en.yml
@@ -3,6 +3,9 @@ en:
     attributes:
       compliance_check:
         code: Code
+        name: Name
+        comment: Comment
+        criticity: Criticity
   compliance_checks:
     filters:
       subclass: Object
diff --git a/config/locales/compliance_checks.fr.yml b/config/locales/compliance_checks.fr.yml
index 041ab4f43..650062cbe 100644
--- a/config/locales/compliance_checks.fr.yml
+++ b/config/locales/compliance_checks.fr.yml
@@ -4,8 +4,8 @@ fr:
       compliance_check:
         code: Code
         name: Nom
-        criticity: Criticité
         comment: Commentaire
+        criticity: Criticité
   compliance_checks:
     filters:
       subclass: Objet
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index 9f370d319..3ed98aaa6 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -1,5 +1,5 @@
 en:
-  import_message:
+  import_messages:
     corrupt_zip_file: "The zip file %{source_filename} is corrupted and cannot be read"
     inconsistent_zip_file: "The zip file %{source_filename} contains unexpected directories: %{spurious_dirs}, which are ignored"
     missing_calendar_in_zip_file: "The folder %{source_filename} lacks a calendar file"
@@ -54,3 +54,12 @@ 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."
+  activerecord:
+    attributes:
+      import_message:
+        criticity: Criticity
+        message_key: Message key
+        message: Message
+        filename: Filename
+        line: Line
+        column: Column
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 5ecef68d1..a7de99a6c 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -54,3 +54,12 @@ 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."
+  activerecord:
+    attributes:
+      import_message:
+        criticity: Criticité
+        message_key: Clé du message
+        message: Message
+        filename: Nom du fichier
+        line: Ligne
+        column: Colomne
\ No newline at end of file