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

4 files changed, 13 insertions, 1 deletions

diff --git a/config/locales/compliance_control_blocks.en.yml b/config/locales/compliance_control_blocks.en.yml
index fbface6b2..150157ff3 100644
--- a/config/locales/compliance_control_blocks.en.yml
+++ b/config/locales/compliance_control_blocks.en.yml
@@ -18,3 +18,8 @@ fr:
       title: Create a control block
     edit:
       title: "Edit the control block : %{compliance_control_block}"
+    metas:
+      control:
+        zero: "No controls"
+        one: "1 control"
+        other: "%{count} controls"
diff --git a/config/locales/compliance_control_blocks.fr.yml b/config/locales/compliance_control_blocks.fr.yml
index 66df008be..1222b5c1a 100644
--- a/config/locales/compliance_control_blocks.fr.yml
+++ b/config/locales/compliance_control_blocks.fr.yml
@@ -18,3 +18,8 @@ fr:
       title: Créer un groupe de contrôle(s)
     edit:
       title: "Editer le groupe de contrôle : %{compliance_control_block}"
+    metas:
+      control:
+        zero: "Aucun contrôle"
+        one: "1 contrôle"
+        other: "%{count} contrôles"
\ No newline at end of file
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index 0c476a46d..f9d7d23d2 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -13,6 +13,7 @@ en:
         route: 'Route'
         routing_constraint_zone: 'RoutingConstraint'
         vehicle_journey: 'VehicleJourney'
+    search_no_results: 'No compliance controls matching your query'
     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})"
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 70227b01f..b77b4e6d4 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -4,7 +4,7 @@ fr:
       prefix: 'Copie de'
     filters:
       criticity: Criticité
-      name: "Chercher le nom ou code d'un contrôl"
+      name: "Chercher le nom ou code d'un contrôle"
       subclass: Objet
       subclasses:
         generic: 'Généric'
@@ -13,6 +13,7 @@ fr:
         route: 'Itinéraire'
         routing_constraint_zone: 'ITL'
         vehicle_journey: 'Course'
+    search_no_results: 'Aucun contrôle ne correspond à votre recherche'
     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})"