Merge branch 'master' of github.com:af83/stif-boiv

4 files changed, 38 insertions, 35 deletions

diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index e86cb1cf9..0393c7bdd 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -49,6 +49,7 @@ Apartment.configure do |config|
     'ImportMessage',
     'ImportResource',
     'ComplianceControl',
+    'GenericAttributeControl::MinMax',
     'ComplianceControlSet',
     'ComplianceControlBlock',
     'ComplianceCheck',
diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml
index 497ca50c3..b7133aea5 100644
--- a/config/locales/compliance_control_sets.en.yml
+++ b/config/locales/compliance_control_sets.en.yml
@@ -1,24 +1,25 @@
-fr:
+en:
   compliance_control_sets:
     index:
-      title: Control games
-      new: Creating a control set
-      edit: Editing a Control Game
+      title: Compliance control set
+      new: New compliance control set
+      edit: Edit compliance control set
     actions:
-          new: Add
-          edit: Edit
-          destroy: Delete
-          destroy_confirm: Are you sure to remove the control games ?
+      new: Add
+      edit: Edit
+      destroy: Destroy
+      add_compliance_control: Add a compliance control
+      destroy_confirm: Are you sur ?
     filters:
-          name: Specify a control game name...
-    search_no_results: No control game matches your search
+      name: 'Enter name ...'
+    search_no_results: 'No compliance control set found'
   activerecord:
-          models:
-            compliance_control_set: Calendar
-          attributes:
-            compliance_control_set:
-              name: Name
-              assignment: Affectation
-              owner_jdc: Owner of the control game
-              control_numbers: Nb contrôle
-              updated_at: Update
\ No newline at end of file
+    models:
+      compliance_control_set: Calendar
+    attributes:
+      compliance_control_set:
+        name: Name
+        assignment: Assignment
+        owner_jdc: Owner
+        control_numbers: Control number
+        updated_at: Updated at
diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml
index f5bb7c67b..8310aa0db 100644
--- a/config/locales/compliance_control_sets.fr.yml
+++ b/config/locales/compliance_control_sets.fr.yml
@@ -5,20 +5,21 @@ fr:
       new: Création d'un jeux de contrôle
       edit: Édition d'un jeux de contrôle
     actions:
-          new: Ajouter
-          edit: Editer
-          destroy: Supprimer
-          destroy_confirm: Etes vous sûr de supprimer ce jeux de contrôle ?
+      new: Ajouter
+      edit: Editer
+      destroy: Supprimer
+      add_compliance_control: Ajouter un JDC
+      destroy_confirm: Etes vous sûr de supprimer ce jeux de contrôle ?
     filters:
-          name: Indiquez un nom de jeux de contrôle...
-    search_no_results: Aucun jeu de contrôle ne correspond à votre recherche
+      name: 'Indiquez un nom de jeux de contrôle...'
+    search_no_results: 'Aucun jeu de contrôle ne correspond à votre recherche'
   activerecord:
-          models:
-            compliance_control_set: Calendrier
-          attributes:
-            compliance_control_set:
-              name: Nom
-              assignment: Affectation
-              owner_jdc: Propriétaire du jeu de contrôle
-              control_numbers: Nb contrôle
-              updated_at: Mis a jour
\ No newline at end of file
+    models:
+      compliance_control_set: Calendrier
+    attributes:
+      compliance_control_set:
+        name: Nom
+        assignment: Affectation
+        owner_jdc: Propriétaire du jeu de contrôle
+        control_numbers: Nb contrôle
+        updated_at: Mis a jour
diff --git a/config/routes.rb b/config/routes.rb
index ef625db1f..1d34a4854 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,7 +70,7 @@ ChouetteIhm::Application.routes.draw do
   resources :api_keys, :only => [:edit, :update, :new, :create, :destroy]
 
   resources :compliance_control_sets do
-    resources :compliance_controls
+    resources :compliance_controls, except: :index
   end
 
   resources :stop_area_referentials, :only => [:show] do