Merge branch 'master' into compliance_controls_policycompliance_controls_policy

18 files changed, 333 insertions, 39 deletions

diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
new file mode 100644
index 000000000..a9652fc89
--- /dev/null
+++ b/config/breadcrumbs.rb
@@ -0,0 +1,249 @@
+crumb :root do
+  link I18n.t('layouts.home'), root_path
+end
+
+crumb :workbench do |workbench|
+  link workbench.name, workbench_path(workbench)
+end
+
+crumb :referential do |referential|
+  link referential.name, referential_path(referential)
+  parent :workbench, current_offer_workbench
+end
+
+crumb :referential_companies do |referential|
+  link I18n.t('companies.index.title'), referential_companies_path(referential)
+  parent :referential, referential
+end
+
+crumb :referential_company do |referential, company|
+  link company.name, referential_company_path(referential, company)
+  parent :referential_companies, referential
+end
+
+crumb :referential_networks do |referential|
+  link I18n.t('networks.index.title'), referential_networks_path
+  parent :referential, referential
+end
+
+crumb :referential_network do |referential, network|
+  link  network.name, referential_network_path(referential, network)
+  parent :referential_networks, referential
+end
+
+crumb :referential_group_of_lines do |referential|
+  link I18n.t('group_of_lines.index.title'), referential_networks_path(referential)
+  parent :referential, referential
+end
+
+crumb :referential_group_of_line do |referential, group_of_line|
+  link  group_of_line.name, referential_group_of_line_path(referential, group_of_line)
+  parent :referential_group_of_lines, referential
+end
+
+crumb :referential_route_sections do |referential|
+  link I18n.t('route_sections.index.title'), referential_route_sections_path(referential)
+  parent :referential, referential
+end
+
+crumb :referential_route_section do |referential, route_section|
+  link  route_section.departure.name, referential_route_section_path(referential, route_section)
+  parent :referential_route_sections, referential
+end
+
+
+crumb :time_tables do |referential|
+  link I18n.t('time_tables.index.title'), referential_time_tables_path(referential)
+  parent :referential, referential
+end
+
+crumb :time_table do |referential, time_table|
+  link time_table.comment, referential_time_table_path(referential, time_table)
+  parent :time_tables, referential
+end
+
+crumb :timebands do |referential|
+  link I18n.t('timebands.index.title'), referential_timebands_path(referential)
+  parent :referential, referential
+end
+
+crumb :timeband do |referential, timeband|
+  link timeband.name, referential_timeband_path(referential, timeband)
+  parent :timebands, referential
+end
+
+crumb :compliance_check_sets do |workbench|
+  link I18n.t('compliance_check_sets.index.title'), workbench_compliance_check_sets_path(workbench)
+  parent :workbench, workbench
+end
+
+crumb :compliance_check_set do |workbench, compliance_check_set|
+  link compliance_check_set.name, workbench_compliance_check_set_path(workbench, compliance_check_set)
+  parent :compliance_check_sets, workbench
+end
+
+crumb :imports do |workbench|
+  link I18n.t('imports.index.title'), workbench_imports_path(workbench)
+  parent :workbench, workbench
+end
+
+crumb :import do |workbench, import|
+  link import.name, workbench_import_path(workbench, import)
+  parent :imports, workbench
+end
+
+crumb :organisation do |organisation|
+  link organisation.name, organisation_path(organisation)
+end
+
+crumb :compliance_control_sets do
+  link I18n.t('compliance_control_sets.index.title'), compliance_control_sets_path
+end
+
+crumb :compliance_control_set do |compliance_control_set|
+  link compliance_control_set.name, compliance_control_set_path(compliance_control_set)
+  parent :compliance_control_sets
+end
+
+crumb :compliance_control do |compliance_control|
+  link compliance_control.name, compliance_control_set_compliance_control_path(compliance_control.compliance_control_set, compliance_control)
+  parent :compliance_control_set, compliance_control.compliance_control_set
+end
+
+crumb :stop_area_referential do |stop_area_referential|
+  link I18n.t('stop_area_referentials.show.title'), stop_area_referential_path(stop_area_referential)
+end
+
+crumb :stop_areas do |stop_area_referential|
+  link I18n.t('stop_areas.index.title'), stop_area_referential_stop_areas_path(stop_area_referential)
+  parent :stop_area_referential, stop_area_referential
+end
+
+crumb :stop_area do |stop_area_referential, stop_area|
+  link stop_area.name, stop_area_referential_stop_area_path(stop_area_referential, stop_area)
+  parent :stop_areas, stop_area_referential
+end
+
+crumb :line_referential do |line_referential|
+  link I18n.t('line_referentials.show.title'), line_referential_path(line_referential)
+end
+
+crumb :companies do |line_referential|
+  link I18n.t('companies.index.title'), line_referential_companies_path(line_referential)
+  parent :line_referential, line_referential
+end
+
+crumb :company do |company|
+  link company.name, line_referential_company_path(company.line_referential, company)
+  parent :companies, company.line_referential
+end
+
+crumb :networks do |line_referential|
+  link I18n.t('networks.index.title'), line_referential_networks_path(line_referential)
+  parent :line_referential, line_referential
+end
+
+crumb :network do |network|
+  link network.name, line_referential_network_path(network.line_referential, network)
+  parent :networks, network.line_referential
+end
+
+crumb :group_of_lines do |line_referential|
+  link I18n.t('group_of_lines.index.title'), line_referential_group_of_lines_path(line_referential)
+  parent :line_referential, line_referential
+end
+
+crumb :group_of_line do |group_of_line|
+  link group_of_line.name, line_referential_group_of_line_path(group_of_line.line_referential, group_of_line)
+  parent :group_of_lines, group_of_line.line_referential
+end
+
+crumb :lines do |line_referential|
+  link I18n.t('lines.index.title'), line_referential_lines_path
+  parent :line_referential, line_referential
+end
+
+crumb :line do |line|
+  link line.name, line_referential_line_path(line.line_referential, line)
+  parent :lines, line.line_referential
+end
+
+crumb :calendars do
+  link I18n.t('calendars.index.title'), calendars_path
+end
+
+crumb :calendar do |calendar|
+  link calendar.name, calendar_path(calendar)
+  parent :calendars
+end
+
+crumb :referential_line do |referential, line|
+  link line.name, referential_line_path(referential, line)
+  parent :referential, referential
+end
+
+crumb :line_footnotes do |referential, line|
+  link line.name, referential_line_footnotes_path(referential, line)
+  parent :referential_line, referential, line
+end
+
+crumb :routing_constraint_zones do |referential, line|
+  link I18n.t('routing_constraint_zones.index.title'), referential_line_routing_constraint_zones_path(referential, line)
+  parent :referential_line, referential, line
+end
+
+crumb :routing_constraint_zone do |referential, line, routing_constraint_zone|
+  link routing_constraint_zone.name, referential_line_routing_constraint_zone_path(referential, line, routing_constraint_zone)
+  parent :routing_constraint_zones, referential, line
+end
+
+crumb :route do |referential, route|
+  link I18n.t('routes.index.title', route: route.name), referential_line_route_path(referential, route.line, route)
+  parent :referential_line, referential, route.line
+end
+
+crumb :journey_patterns do |referential, route|
+  link I18n.t('journey_patterns.index.title'), referential_line_route_journey_patterns_collection_path(referential, route.line, route)
+  parent :route, referential, route
+end
+
+crumb :referential_stop_areas do |referential|
+  link I18n.t('stop_areas.index.title'), referential_stop_areas_path(referential)
+  parent :referential, referential
+end
+
+crumb :referential_stop_area do |referential, stop_area|
+  link stop_area.name, referential_stop_area_path(referential, stop_area)
+  parent :referential_stop_areas, referential
+end
+
+crumb :vehicle_journeys do |referential, route|
+  link I18n.t('vehicle_journeys.index.title', route: route.name), referential_line_route_vehicle_journeys_path(referential, route.line, route)
+  parent :route, referential, route
+end
+
+# crumb :compliance_controls do|compliance_control_sets|
+#   link
+#   parent :compliance_control_sets, compliance_control_sets
+# end
+
+# crumb :project do |project|
+#   link project.name, project_path(project)
+#   parent :projects
+# end
+
+# crumb :project_issues do |project|
+#   link "Issues", project_issues_path(project)
+#   parent :project, project
+# end
+
+# crumb :issue do |issue|
+#   link issue.title, issue_path(issue)
+#   parent :project_issues, issue.project
+# end
+
+# If you want to split your breadcrumbs configuration over multiple files, you
+# can create a folder named `config/breadcrumbs` and put your configuration
+# files there. All *.rb files (e.g. `frontend.rb` or `products.rb`) in that
+# folder are loaded and reloaded automatically when you change them, just like
+# this file (`config/breadcrumbs.rb`).
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b3312be4a..8bf94f5da 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -62,6 +62,9 @@ Rails.application.configure do
   # Reflex api url
   config.reflex_api_url = "https://195.46.215.128/ws/reflex/V1/service=getData"
 
+  # IEV url
+  config.iev_url = ENV.fetch('IEV_URL', 'http://localhost:8080')
+
   config.rails_host = "http://www.example.com"
   # file to data for demo
   config.demo_data = "tmp/demo.zip"
diff --git a/config/locales/breadcrumbs.en.yml b/config/locales/breadcrumbs.en.yml
deleted file mode 100644
index 6fec15b85..000000000
--- a/config/locales/breadcrumbs.en.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-en:
-  breadcrumbs:
-    vehicle_journeys: "Passing times"
-    vehicle_journey_frequencies: "Times bands"
-    referentials: "Home"
-    users: "Users"
-    imports: Imports
diff --git a/config/locales/breadcrumbs.fr.yml b/config/locales/breadcrumbs.fr.yml
deleted file mode 100644
index 725549f14..000000000
--- a/config/locales/breadcrumbs.fr.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fr:
-  breadcrumbs:
-    vehicle_journeys: "Horaires"
-    vehicle_journey_frequencies: "Créneaux horaires"
-    root: "Accueil"
-    users: "Utilisateurs"
-    imports: Imports
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index d8bc6962b..94c7ec529 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -2,12 +2,26 @@ en:
   compliance_controls:
     clone:
       prefix: 'Copy of'
+    filters:
+      criticity: Severity
+      name: "Search by a control's name or code"
+      subclass: Object
+      subclasses:
+        generic: 'Generic'
+        journey_pattern: 'JourneyPattern'
+        line: 'Line'
+        route: 'Route'
+        routing_constraint_zone: 'RoutingConstraint'
+        vehicle_journey: 'VehicleJourney'
     min_max_values: "the minimum (%{min}) is not supposed to be greater than the maximum (%{max})"
     errors:
       incoherent_control_sets: "Impossible to assign a control to a set (id: %{direct_set_name}) differing from the one of its group (id: %{indirect_set_name})"
       mandatory_control_type: "A control type must be selected"
     show:
       title: "Compliance control"
+      metadatas:
+        compliance_control_block: "Control block informations"
+    new:
     index:
       title: "Compliance control"
     new:
@@ -20,6 +34,8 @@ en:
       show: Show
       destroy: Destroy
       destroy_confirm: Are you sure ?
+    metas:
+      no_prerequisite: "None"
     route_control/zdl_stop_area:
       messages:
         3_route_1: "The route with %{source_objectid} objectid connect the stop points %{target_0_label} (%{target_0_objectid}) and %{target_1_label} (%{target_1_objectid}) which belong to the same ZDL"
@@ -31,6 +47,7 @@ en:
         "If the route has an opposite route, it must :
           - reference the opposite route
           - have an opposite route in relation with the tested route"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/journey_pattern:
       messages:
         3_route_3: "The route with %{source_objectid} objectid doesn't have any journey pattern"
@@ -43,6 +60,7 @@ en:
       messages:
         3_route_5: "The route with %{source_objectid} objectid has a first stop from the %{target_0_label} ZDL whereas its oppoite route's last stop is from the ZDL %{target_1_label}"
       description: "Deux itinéraires en aller/retour doivent desservir les mêmes terminus"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/minimum_length:
       messages:
         3_route_6: "The route with %{source_objectid} objectid does not connect enough stop points (required 2 stop points)"
@@ -105,6 +123,7 @@ en:
       messages:
         3_line_1: "On line :%{source_label} (%{source_objectid}), no route has an opposite route"
       description: "The routes of a line must have an opposite route"
+      prerequisite: Lign has multiple routes
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : the %{source_label} attribute value (%{error_value}) does not respect the following pattern : %{reference_value}"
@@ -185,4 +204,6 @@ en:
         compliance_control_block: "Control Block"
         minimum: "Minimum"
         maximum: "Maximum"
-        target: "Target"
\ No newline at end of file
+        target: "Target"
+        prerequisite: "Prerequisite"
+        predicate: "Predicate"
\ No newline at end of file
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 50083bc54..69773f61c 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -2,12 +2,25 @@ fr:
   compliance_controls:
     clone:
       prefix: 'Copie de'
+    filters:
+      criticity: Criticité
+      name: "Chercher le nom ou code d'un contrôl"
+      subclass: Objet  
+      subclasses:
+        generic: 'Généric'
+        journey_pattern: 'JourneyPattern'
+        line: 'Ligne'
+        route: 'Itinéraire'
+        routing_constraint_zone: 'ITL'
+        vehicle_journey: 'Course'
     min_max_values: "la valeur de minimum (%{min}) ne doit pas être superieur à la valuer du maximum (%{max})"
     errors:
       incoherent_control_sets: "Le contrôle ne peut pas être associé à un jeu de contrôle (id: %{direct_set_name}) différent de celui de son groupe (id: %{indirect_set_name})"
       mandatory_control_type: "Un type de contrôle doit être sélectionné"
     show:
       title: "Consulter un contrôle"
+      metadatas:
+        compliance_control_block: "Informations sur le groupe de contrôle"
     new:
       title: "Ajouter un contrôle"
     edit:
@@ -20,6 +33,8 @@ fr:
       show: Consulter
       destroy: Supprimer
       destroy_confirm: Etes vous sûr de supprimer ce contrôle ?
+    metas:
+      no_prerequisite: "Aucun"
     route_control/zdl_stop_area:
       messages:
         3_route_1: "L'itinéraire %{source_objectid} dessert successivement les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid}) de la même zone de lieu"
@@ -31,6 +46,7 @@ fr:
         "Si l'itinéraire référence un itinéraire inverse, celui-ci doit :
           - référencer l'itinéraire inverse
           - avoir un sens opposé à l'itinéraire testé"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/journey_pattern:
       messages:
         3_route_3: "L'itinéraire %{source_objectid} n'a pas de mission"
@@ -43,6 +59,7 @@ fr:
       messages:
         3_route_5: "L'itinéraire %{source_objectid} dessert au départ un arrêt de la ZDL %{target_0_label} alors que l'itinéraire inverse dessert à l'arrivée un arrêt de la ZDL %{target_1_label}"
       description: "Deux itinéraires en aller/retour doivent desservir les mêmes terminus"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/minimum_length:
       messages:
         3_route_6: "L'itinéraire %{source_objectid} ne dessert pas assez d'arrêts (minimum 2 requis)"
@@ -105,6 +122,7 @@ fr:
       messages:
         3_line_1: "Sur la ligne %{source_label} (%{source_objectid}), aucun itinéraire n'a d'itinéraire inverse"
       description: "Les itinéraires d'une ligne doivent être associés en aller/retour"
+      prerequisite: Ligne disposant de plusieurs itinéraires
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : l'attribut % à une valeur %{error_value} qui ne respecte pas le motif %{reference_value}"
@@ -125,7 +143,7 @@ fr:
   activerecord:
     models:
       compliance_control:
-        one: "controle"
+        one: "contrôle"
         other: "contrôles"
       route_control/zdl_stop_area:
         one: "Deux arrêts d’une même ZDL ne peuvent pas se succéder dans un itinéraire"
@@ -136,7 +154,7 @@ fr:
       route_control/duplicates:
         one: "Détection de double définition d'itinéraire"
       route_control/opposite_route_terminus:
-        one: "Vérification des terminus de l'itinéraire inverse"
+       one: "Vérification des terminus de l'itinéraire inverse"
       route_control/minimum_length:
         one: "Un itinéraire doit contenir au moins 2 arrêts"
       route_control/omnibus_journey_pattern:
@@ -144,7 +162,7 @@ fr:
       route_control/unactivated_stop_points:
         one: "Itinéraire & arrêt désactivé"
       route_control/stop_points_in_journey_pattern:
-        one: "Un itinéraire doit contenir au moins 2 arrêts"
+        one: "Utilisation des arrêts par les missions"
       journey_pattern_control/duplicates:
         one: "Doublon de missions dans une ligne"
       journey_pattern_control/vehicle_journey:
@@ -185,4 +203,6 @@ fr:
         compliance_control_block: "Groupe de contrôle"
         minimum: "Minimum"
         maximum: "Maximum"
-        target: "Cible"
\ No newline at end of file
+        target: "Cible"
+        prerequisite: "Prérequis"
+        predicate: "Prédicat"
\ No newline at end of file
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index 528ab3477..bf6b45020 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -1,8 +1,8 @@
 en:
   import_messages:
     compliance_check_messages:
-      corrupt_zip_file: "The zip file of WorkbenchImport %{import_name} is corrupted and cannot be read"
-      inconsistent_zip_file: "The zip file of WorkbenchImport %{import_name} contains the following spurious directories %{spurious_dirs}, which are ignored"
+      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"
       referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
@@ -15,6 +15,7 @@ en:
       2_netexstif_3_3: "la frame NETEX_OFFRE_LIGNE du fichier %{source_filename} ne contient pas la frame %{error_value} obligatoire"
       2_netexstif_3_4: "la frame NETEX_OFFRE_LIGNE du fichier %{source_filename} contient une frame %{error_value} non acceptée"
       2_netexstif_4: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'identifiant %{source_objectid} de l'objet %{error_value} ne respecte pas la syntaxe %{reference_value}"
+      2_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{error_value} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
       2_netexstif_6: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a un état de modification interdit : 'delete'"
       2_netexstif_7: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} définit une référence %{reference_value} de syntaxe invalide : %{error_value}"
       2_netexstif_8_1: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} définit une référence %{error_value} de type externe : référence interne attendue"
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 15de6eed8..7d3bbf23b 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -1,8 +1,8 @@
 fr:
   import_messages:
     compliance_check_messages:
-      corrupt_zip_file: "Le fichier zip du WorkbenchImport %{import_name} est corrompu, et ne peut être lu" 
-      inconsistent_zip_file: "Le fichier zip du WorkbenchImport %{import_name} contient les repertoirs illegeaux %{spurious_dirs} qui seront ignorés"
+      corrupt_zip_file: "Le fichier zip %{source_filename} est corrompu, et ne peut être lu"
+      inconsistent_zip_file: "Le fichier zip %{source_filename} contient des repertoires non prévus : %{spurious_dirs} qui seront ignorés"
       referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
@@ -15,6 +15,7 @@ fr:
       2_netexstif_3_3: "la frame NETEX_OFFRE_LIGNE du fichier %{source_filename} ne contient pas la frame %{error_value} obligatoire"
       2_netexstif_3_4: "la frame NETEX_OFFRE_LIGNE du fichier %{source_filename} contient une frame %{error_value} non acceptée"
       2_netexstif_4: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'identifiant %{source_objectid} de l'objet %{error_value} ne respecte pas la syntaxe %{reference_value}"
+      2_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{error_value} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
       2_netexstif_6: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a un état de modification interdit : 'delete'"
       2_netexstif_7: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} définit une référence %{reference_value} de syntaxe invalide : %{error_value}"
       2_netexstif_8_1: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} définit une référence %{error_value} de type externe : référence interne attendue"
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index f3bcad9e9..10434dd19 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -55,8 +55,10 @@ en:
         other: "imports"
     errors:
       models:
-        imports:
-          wrong_file_extension: "The imported file must be a zip file"
+        import:
+          attributes:
+            file:
+              wrong_file_extension: "The imported file must be a zip file"
     attributes:
       import:
         resources: "File to import"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 6e74fa33c..099488a6b 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -55,8 +55,10 @@ fr:
         other: "imports"
     errors:
       models:
-        imports:
-          wrong_file_extension: "Le fichier importé doit être au format zip"
+        import:
+          attributes:
+            file:
+              wrong_file_extension: "Le fichier importé doit être au format zip"
     attributes:
       import:
         resources: "Fichier à importer"
diff --git a/config/locales/referential_suites.en.yml b/config/locales/referential_suites.en.yml
index 1a77d9026..aa6fef0e2 100644
--- a/config/locales/referential_suites.en.yml
+++ b/config/locales/referential_suites.en.yml
@@ -1,2 +1,5 @@
-en:
+fr:
   referential_suites:
+    errors:
+      inconsistent_current: "The current referential (%{name}) does not belong to this referential suite"
+      inconsistent_new: "The new referential (%{name}) does not belong to this referential suite"
diff --git a/config/locales/referential_suites.fr.yml b/config/locales/referential_suites.fr.yml
index c87b32fc7..9cb1e33d3 100644
--- a/config/locales/referential_suites.fr.yml
+++ b/config/locales/referential_suites.fr.yml
@@ -1,2 +1,5 @@
-fr:
+en:
   referential_suites:
+    errors:
+      inconsistent_current: "Le current referential (%{name}) n'appartient pas à cette referential suite"
+      inconsistent_new: "Le new referential (%{name}) n'appartient pas à cette referential suite"
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index 14b4dbe66..7923ba5f2 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -38,6 +38,7 @@ en:
       edit: "Edit this data space"
       clone: "Clone this data space"
     errors:
+      inconsistent_organisation: "Organisation of asscociated workbench is (%{indirect_name}), while directly associated organisation is (%{direct_name}), they need to be equal"
       validity_period: "Invalid validity periode"
       pg_excluded: "can't begins with pg_"
       public_excluded: "public is a reserved value"
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index b90f6e5b6..6aa81b33d 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -2,7 +2,7 @@ fr:
   referentials:
     filters:
       name_or_number_or_objectid: 'Indiquez un nom de ligne, nom court ou objectid'
-      name: 'Indiquez un nom de référentiel...'
+      name: 'Indiquez un nom de jeu de données...'
       line: 'Indiquez une ligne...'
     search_no_results: 'Aucun jeu de données ne correspond à votre recherche'
     error_period_filter: "Le filtre par période doit contenir une date de début et de fin valides"
@@ -38,6 +38,7 @@ fr:
       edit: "Editer ce jeu de données"
       clone: "Cloner ce jeu de données"
     errors:
+      inconsistent_organisation: "L'organisation asscociée par espace de travail est (%{indirect_name}), mais l'organisation associée directement est (%{direct_name}), elles doivent être identiques."
       validity_period: "Période de validité invalide"
       pg_excluded: "ne peut pas commencer par pg_ (valeurs réservées)"
       public_excluded: "public est une valeur réservée"
@@ -102,8 +103,8 @@ fr:
       referential:
         slug: "caractères autorisés : alphanumériques minuscules et 'souligné' et doit commencer par une lettre"
         prefix: "caractères autorisés : alphanumériques et 'souligné'"
-        upper_corner: "latitude,longitude dans le référentiel WGS84, le séparateur de décimales est 'point'"
-        lower_corner: "latitude,longitude dans le référentiel WGS84, le séparateur de décimales est 'point'"
+        upper_corner: "latitude,longitude dans le jeu de données WGS84, le séparateur de décimales est 'point'"
+        lower_corner: "latitude,longitude dans le jeu de données WGS84, le séparateur de décimales est 'point'"
 
   simple_form:
     labels:
diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml
index 83a96732d..31838f1a7 100644
--- a/config/locales/routes.fr.yml
+++ b/config/locales/routes.fr.yml
@@ -81,7 +81,7 @@ fr:
         number: "Indice"
         comment: "Commentaire"
         direction: "Direction"
-        wayback: "Direction"
+        wayback: "Sens"
         stop_points: "Nb arrêts"
         journey_patterns: "Nb missions"
         opposite_route: "Itinéraire associé"
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml
index 051ef1c96..3a2fcd598 100644
--- a/config/locales/workbenches.en.yml
+++ b/config/locales/workbenches.en.yml
@@ -11,9 +11,9 @@ en:
         see: "See the list"
         no_content: "No content yet."
     referential_count:
-      zero: "Currently, there is no referential in your workbench"
-      one: "Currently, there is one referential in your workbench"
-      other: "Currently, there are #{count} referentials in your workbench"
+      zero: "There is no referential in your workbench"
+      one: "There is one referential in your workbench"
+      other: "There are #{count} referentials in your workbench"
   activerecord:
     models:
       workbench:
diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml
index 7a614efc5..0f8a516e3 100644
--- a/config/locales/workbenches.fr.yml
+++ b/config/locales/workbenches.fr.yml
@@ -1,9 +1,9 @@
 fr:
   workbenches:
     referential_count:
-      zero: "Aucun jeu de données à l'heure actuelle"
-      one: "1 jeu de données à l'heure actuelle"
-      other: "#{count} jeux de données à l'heure actuelle"
+      zero: "Aucun jeu de données dans cet espace de travail"
+      one: "1 jeu de données dans cet espace de travail"
+      other: "#{count} jeux de données dans cet espace de travail"
   activerecord:
     models:
       workbench:
diff --git a/config/routes.rb b/config/routes.rb
index b105e77d6..27c3c3044 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,7 @@ ChouetteIhm::Application.routes.draw do
   resources :api_keys, :only => [:edit, :update, :new, :create, :destroy]
 
   resources :compliance_control_sets do
+    get :simple, on: :member
     get :clone, on: :member
     resources :compliance_controls, except: :index do
       get :select_type, on: :collection