Fix localization for compliance_control_set and compliance_control model name Refs #2198

4 files changed, 42 insertions, 48 deletions

diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml
index c2b6aae8e..ae0d2bc53 100644
--- a/config/locales/compliance_control_sets.en.yml
+++ b/config/locales/compliance_control_sets.en.yml
@@ -15,12 +15,14 @@ en:
       name: 'Enter name ...'
     search_no_results: 'No compliance control set found'
   activerecord:
-          models:
-            compliance_control_set: Calendar
-          attributes:
-            compliance_control_set:
-              name: Name
-              assigned_to: Assigned to
-              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:
+        one: compliance_control_set
+        other: compliance_control_sets
+    attributes:
+      compliance_control_set:
+        name: Name
+        assigned_to: Assigned to
+        owner_jdc: Owner of the control game
+        control_numbers: Nb contrôle
+        updated_at: Update
diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml
index b7e93c40c..833ad723a 100644
--- a/config/locales/compliance_control_sets.fr.yml
+++ b/config/locales/compliance_control_sets.fr.yml
@@ -15,12 +15,14 @@ fr:
       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
-              assigned_to: 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:
+        one: jeu de contrôles
+        other: jeux de contrôles
+    attributes:
+      compliance_control_set:
+        name: Nom
+        assigned_to: Affectation
+        owner_jdc: Propriétaire du jeu de contrôle
+        control_numbers: Nb contrôle
+        updated_at: Mis a jour
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index bb6b94377..bef39515c 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -1,20 +1,5 @@
 en:
-  activerecord:
-    models:
-      one: "compliance control"
-      other: "compliance controls"
-    attributes:
-      compliance_control:
-        name: "Name"
-        criticity: "Criticity"
-        comment: "Comment"
-        code: "Code"
   compliance_controls:
-    actions:
-      new: "Add a new compliance control"
-      edit: "Edit this compliance control"
-      destroy: "Remove this compliance control"
-      destroy_confirm: "Are you sure you want destroy this compliance control?"
     show:
       title: "Compliance control"
     index:
@@ -123,3 +108,13 @@ en:
         messages:
           3_generic_3: "% : the % attribute's value (%) of % is in conflict with : %"
         description: "The attribute's value must be unique compared to the other objects ofthe same type (related to the same line)"
+  activerecord:
+    models:
+      one: "compliance control"
+      other: "compliance controls"
+    attributes:
+      compliance_control:
+        name: "Name"
+        criticity: "Criticity"
+        comment: "Comment"
+        code: "Code"
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 1eff5d0e6..05e47665c 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -1,20 +1,5 @@
 fr:
-  activerecord:
-    models:
-      one: "jeu de controle"
-      other: "jeux de controle"
-    attributes:
-      compliance_control:
-        name: "Nom"
-        criticity: "Criticité"
-        comment: "Commentaire"
-        code: "Code"
   compliance_controls:
-    actions:
-      new: "Ajouter un jeu de controle"
-      edit: "Editer un jeu de controle"
-      destroy: "Supprimer un jeu de controle"
-      destroy_confirm: "Etes vous sûr de vouloir détruire le jeu de controle ?"
     show:
       title: "Jeu de controle"
     index:
@@ -123,3 +108,13 @@ fr:
         messages:
           3_generic_3: "La valeur de l'attribut doit être unique au sein des objets de la ligne"
         description: "% : l'attribut % de % à une valeur % en conflit avec %"
+  activerecord:
+    models:
+      one: "controle"
+      other: "contrôles"
+    attributes:
+      compliance_control:
+        name: "Nom"
+        criticity: "Criticité"
+        comment: "Commentaire"
+        code: "Code"