Ie Report : wording change between Import and Validation

7 files changed, 24 insertions, 10 deletions

diff --git a/app/views/compliance_checks/show.html.erb b/app/views/compliance_checks/show.html.erb
index da544a4b3..1a1f842f5 100644
--- a/app/views/compliance_checks/show.html.erb
+++ b/app/views/compliance_checks/show.html.erb
@@ -13,12 +13,12 @@
   <div class="links">
     <%= link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.actions.report"), report_referential_compliance_check_path(@referential, @compliance_check.id) if @compliance_check.compliance_check_validation_report? %>
   </div>
-  <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @compliance_check} ) %>
+  <%= render(partial: "shared/ie_report.html", locals: { job: @compliance_check, type: :validation } ) %>
 </div>
 
 <% content_for :sidebar do %>
   <ul class="actions">
-    <li><%= link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), :method => :delete, :data => {:confirm => t('compliance_checks.actions.destroy_confirm')}, :class => "remove" %></li>
+    <li><%= link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), method: :delete, data: {confirm: t('compliance_checks.actions.destroy_confirm')}, class: "remove" %></li>
   </ul>
 
   <%= history_tag(@compliance_check) %>
diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb
index 43b9773ae..bc9faf3f2 100644
--- a/app/views/exports/show.html.erb
+++ b/app/views/exports/show.html.erb
@@ -13,12 +13,12 @@
 <% end %>
 <div class="progress_bars">
   <%= progress_bar_tag(@export) %>
-</div>  
+</div>
 <div class="export_show">
   <div class="links">
     <%= link_to( font_awesome_classic_tag("fa-file-#{@export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %>
   </div>
-  <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @export} ) %>
+  <%= render( partial: "shared/ie_report.html", locals: { job: @export } ) %>
 </div>
 
 <% content_for :sidebar do %>
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index 3bdae3e2a..21e06d964 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -19,12 +19,12 @@
     <%= link_to font_awesome_classic_tag("fa-file-#{@import.filename_extension}-o") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, @import.id) if @import.file_path? %>
     <%= link_to font_awesome_classic_tag("fa-external-link") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, @import.id) if @import.compliance_check? %>
   </div>
-  <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @import} ) %>
+  <%= render(partial: "shared/ie_report.html", locals: {job: @import}) %>
 </div>
 
 <% content_for :sidebar do %>
   <ul class="actions">
-    <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import.id), :method => :delete, :data => {:confirm => t('imports.actions.destroy_confirm')}, :class => "remove" %></li>
+    <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import.id), method: :delete, data: {confirm: t('imports.actions.destroy_confirm')}, class: "remove" %></li>
   </ul>
 
   <%= history_tag(@import) %>
diff --git a/app/views/shared/_ie_report.html.erb b/app/views/shared/_ie_report.html.erb
index ef400f6ef..f4f6fa043 100644
--- a/app/views/shared/_ie_report.html.erb
+++ b/app/views/shared/_ie_report.html.erb
@@ -15,13 +15,13 @@
 
   <div class="tab-content">
     <div role="tabpanel" class="tab-pane active" id="ie_tab_line">
-        <%= render partial: 'shared/ie_report_line', locals: { job: job } %>
+        <%= render partial: 'shared/ie_report_line', locals: { job: job, type: (defined?(type) ? type : :default) } %>
     </div>
     <div role="tabpanel" class="tab-pane" id="ie_tab_file">
       <%= render partial: 'shared/ie_report_file', locals: { job: job } %>
     </div>
   </div>
   <% else %>
-    <%= render partial: 'shared/ie_report_line', locals: { job: job } %>
+    <%= render partial: 'shared/ie_report_line', locals: { job: job, type: (defined?(type) ? type : :default) } %>
   <% end %>
 </div>
diff --git a/app/views/shared/_ie_report_line.html.erb b/app/views/shared/_ie_report_line.html.erb
index 8dac052c8..8c635baa8 100644
--- a/app/views/shared/_ie_report_line.html.erb
+++ b/app/views/shared/_ie_report_line.html.erb
@@ -19,8 +19,8 @@
         <label><%= t(".table.line.state") %></label>
         <select class="filter-line-status form-control">
           <option></option>
-          <option value="true"><%=t('.saved_lines') %></option>
-          <option value="false"><%=t('.unsaved_lines') %></option>
+          <option value="true"><%=t(".state.#{type}.valid") %></option>
+          <option value="false"><%=t(".state.#{type}.invalid") %></option>
         </select>
       </div>
     </form>
diff --git a/config/locales/ie_report.en.yml b/config/locales/ie_report.en.yml
index d77559a8d..06e49c016 100644
--- a/config/locales/ie_report.en.yml
+++ b/config/locales/ie_report.en.yml
@@ -7,6 +7,13 @@ en:
           file: 'Files'
           line: 'Lines'
     ie_report_line:
+      state:
+        default:
+          valid: 'Saved lines'
+          invalid: 'Unsaved lines'
+        validation:
+          valid: 'Valid lines'
+          invalid: 'Invalid lines'
       read_lines: 'Read lines'
       saved_lines: 'Saved lines'
       unsaved_lines: 'Unsaved lines'
diff --git a/config/locales/ie_report.fr.yml b/config/locales/ie_report.fr.yml
index f55c0c9a6..844dfbbe0 100644
--- a/config/locales/ie_report.fr.yml
+++ b/config/locales/ie_report.fr.yml
@@ -7,6 +7,13 @@ fr:
           file: 'Fichiers'
           line: 'Lignes'
     ie_report_line:
+      state:
+        default:
+          valid: 'Lignes sauvegardés'
+          invalid: 'Lignes non-sauvegardés'
+        validation:
+          valid: 'Lignes valides'
+          invalid: 'Lignes invalides'
       read_lines: 'Lignes lues'
       saved_lines: 'Lignes sauvegardés'
       unsaved_lines: 'Lignes non-sauvegardés'