Merge pull request #572 from af83/7030-import-show-i18n

Refs #7030 Fix import#show missing translations

7 files changed, 28 insertions, 17 deletions

diff --git a/app/views/imports/import/_gtf.html.slim b/app/views/imports/import/_gtf.html.slim
index 8b92f2e92..0c72f007f 100644
--- a/app/views/imports/import/_gtf.html.slim
+++ b/app/views/imports/import/_gtf.html.slim
@@ -14,7 +14,7 @@
     = table_builder_2 @import.resources,
       [ \
         TableBuilderHelper::Column.new( \
-          name: t('.referential_name'), \
+          name: t('imports.show.referential_name'), \
           attribute: 'name', \
           sortable: false, \
           link_to: lambda do |item| \
diff --git a/app/views/imports/import/_netex.html.slim b/app/views/imports/import/_netex.html.slim
index 2f341016a..38ebfd46f 100644
--- a/app/views/imports/import/_netex.html.slim
+++ b/app/views/imports/import/_netex.html.slim
@@ -1,8 +1,8 @@
 .row
   .col-lg-6.col-md-6.col-sm-12.col-xs-12
-    - metadata = { t('.parent') => link_to(@import.parent.name, [@import.parent.workbench, @import.parent]) }
-    - metadata = metadata.update({t('.status') => import_status(@import.status, verbose: true) })
-    - metadata = metadata.update({t('.referential') => @import.referential ? link_to(@import.referential.name, [@import.referential]) : "-" })
+    - metadata = { t('imports.show.parent') => link_to(@import.parent.name, [@import.parent.workbench, @import.parent]) }
+    - metadata = metadata.update({Import::Base.tmf(:status) => import_status(@import.status, verbose: true) })
+    - metadata = metadata.update({Import::Base.tmf(:referential) => @import.referential ? link_to(@import.referential.name, [@import.referential]) : "-" })
     = definition_list t('metadatas'), metadata
 
 .col-lg-12
@@ -11,9 +11,9 @@
 
 - if @import.resources.present?
   .col-lg-12
-    h2 = t('.table_title')
+    h2 = t('imports.show.netex.table_title')
   .col-lg-12
-    = t('.table_explanation')
+    = t('imports.show.netex.table_explanation')
   .col-lg-12
     = table_builder_2 @import.resources.where(resource_type: :file),
       [ \
@@ -28,12 +28,12 @@
           sortable: false, \
         ), \
         TableBuilderHelper::Column.new( \
-          name: 'Résultat des tests' , \
+          name: t('imports.show.table.test_results') , \
           attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', n.metrics.deep_symbolize_keys) }, \
           sortable: false, \
         ), \
         TableBuilderHelper::Column.new( \
-          name: 'Téléchargement' , \
+          name: t('imports.show.table.download') , \
           attribute: Proc.new { |n| '<i class="fa fa-download" aria-hidden="true"></i>'.html_safe }, \
           sortable: false, \
           link_to: lambda do |import_resource| \
diff --git a/app/views/imports/import/_workbench.html.slim b/app/views/imports/import/_workbench.html.slim
index e41ceb0f0..d35089784 100644
--- a/app/views/imports/import/_workbench.html.slim
+++ b/app/views/imports/import/_workbench.html.slim
@@ -1,7 +1,7 @@
 .row
   .col-lg-6.col-md-6.col-sm-12.col-xs-12
-    - metadata = { t('.data_recovery') => '-', t('.filename') => @import.try(:file_identifier)}
-    - metadata = metadata.update({t('.status') => import_status(@import.status, verbose: true) })
+    - metadata = { t('.data_recovery') => '-', t('imports.show.filename') => @import.try(:file_identifier)}
+    - metadata = metadata.update({Import::Base.tmf(:status) => import_status(@import.status, verbose: true) })
     = definition_list t('metadatas'), metadata
 
 .col-lg-12
@@ -25,7 +25,7 @@ ruby:
     = table_builder_2 @import.resources,
       [ \
         TableBuilderHelper::Column.new( \
-          name: t('.referential_name'), \
+          name: t('imports.show.referential_name'), \
           attribute: 'name', \
           sortable: false, \
           link_to: lambda do |item| \
diff --git a/config/locales/import_resources.en.yml b/config/locales/import_resources.en.yml
index 4b1f9c394..ebb481dcc 100644
--- a/config/locales/import_resources.en.yml
+++ b/config/locales/import_resources.en.yml
@@ -3,9 +3,7 @@ en:
     resources: &resources
       index:
         title: "NeTEx conformity"
-        table_state: "%{lines_imported} line(s) imported on %{lines_in_zipfile} presents in zipfile"
-        table_title: "Satus of anlyzed files"
-        table_explanation: "When calendriers.xml and/or commun.xml are not imported, then all lines file are not processed."
+        table_state: "%{lines_imported} line(s) imported on %{lines_in_zipfile} presents in zip file"
         metrics: "%{error_count} errors, %{warning_count} warnings"
   import_resources:
     <<: *resources
diff --git a/config/locales/import_resources.fr.yml b/config/locales/import_resources.fr.yml
index 8ddb3fb6b..ca9b6c8e5 100644
--- a/config/locales/import_resources.fr.yml
+++ b/config/locales/import_resources.fr.yml
@@ -3,8 +3,6 @@ fr:
     resources: &resources
       table: &table
         table_state: "%{lines_imported} ligne(s) importée(s) sur %{lines_in_zipfile} présente(s) dans l'archive"
-        table_title: "Etat des fichiers analysés"
-        table_explanation: "Dans le cas ou le(s) fichiers calendriers.xml et/ou commun.xml sont dans un état non importé, alors tous les fichiers lignes sont automatiquement dans un état non traité."
       index:
         <<: *table
         title: "Rapport de conformité NeTEx"
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 344ee05a8..ed34043c5 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -33,6 +33,13 @@ en:
       organisation_control: Organization control
       results: "%{count} validated referential(s) out of %{total} in the file"
       summary: Summay of import compliance check sets <span title="Lorem ipsum..." class="fa fa-lg fa-info-circle text-info"></span>
+      parent: Parent
+      netex:
+        table_title: "Satus of anlyzed files"
+        table_explanation: "When calendriers.xml and/or commun.xml are not imported, then all lines file are not processed."
+      table:
+        test_results: Test results
+        download: Download
     compliance_check_task: "Validate Report"
     severities:
       info: "Information"
@@ -95,6 +102,7 @@ en:
         max_distance_for_connection_link: "Max distance for connection link"
         ignore_last_word: "ignore last word"
         ignore_end_chars: "ignore last chars"
+        referential: Referential
       import:
         <<: *attrs
         base:
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 870896111..5affd2c0c 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -33,6 +33,13 @@ fr:
       organisation_control: Contrôle organisation
       results: "%{count} jeu(x) de données validé(s) sur %{total}"
       summary: Bilan des jeux de contrôles d'import <span title="Lorem ipsum..." class="fa fa-lg fa-info-circle text-info"></span>
+      parent: Parent
+      netex:
+        table_title: "Etat des fichiers analysés"
+        table_explanation: "Dans le cas ou le(s) fichiers calendriers.xml et/ou commun.xml sont dans un état non importé, alors tous les fichiers lignes sont automatiquement dans un état non traité."
+      table:
+        test_results: Résultats des tests
+        download: Téléchargement
     compliance_check_task: "Validation"
     severities:
       info: "Information"
@@ -99,7 +106,7 @@ fr:
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
         ignore_last_word: "ignorer le dernier mot"
         ignore_end_chars: "ignorer les n derniers caractères"
-
+        referential: Jeu de données
       import:
         <<: *attrs
         base: