From 89c704a459bcd72cf9c720ccb034b3c877ea2525 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 6 Jul 2017 14:52:19 +0200
Subject: Change format of error message format + some typos

---
 app/assets/javascripts/cleanup.coffee | 6 +++---
 app/models/clean_up.rb                | 2 +-
 config/locales/fr.yml                 | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/cleanup.coffee b/app/assets/javascripts/cleanup.coffee
index 7f6594018..7e291aa9e 100644
--- a/app/assets/javascripts/cleanup.coffee
+++ b/app/assets/javascripts/cleanup.coffee
@@ -4,11 +4,11 @@ $(document).on("change", 'input[name="clean_up[date_type]"]', (e) ->
 
   if type == 'before'
     end_date.hide()
-    $("label[for='clean_up_begin_date_3i']").html("Date de fin de purge");
+    $("label[for='clean_up_begin_date_3i']").html("Date de fin de la purge");
   else if type == 'after'
     end_date.hide()
-    $("label[for='clean_up_begin_date_3i']").html("Date de début de purge");
+    $("label[for='clean_up_begin_date_3i']").html("Date de début de la purge");
   else
-    $("label[for='clean_up_begin_date_3i']").html("Date de début de purge");
+    $("label[for='clean_up_begin_date_3i']").html("Date de début de la purge");
     end_date.show()
 )
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index 75fedc732..08e84faa0 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -83,7 +83,7 @@ class CleanUp < ActiveRecord::Base
         day if day.public_send(operator, self.begin_date)
       end
     else
-      days_in_cleanup_periode = (self.begin_date..self.end_date)
+      days_in_cleanup_periode = ((self.begin_date + 1.day)...self.end_date)
       to_exclude_days = days_in_period & days_in_cleanup_periode
     end
 
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 782844ba4..3d5dc4c2c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -14,6 +14,8 @@ fr:
     formats:
       short: "%d/%m/%Y"
       short_with_time: "%d/%m/%Y à %Hh%M"
+  errors:
+    format: "%{message}"
 
   last_update: 'Dernière mise à jour<br>le %{time}'
   last_sync: 'Dernière mise à jour le %{time}'
-- 
cgit v1.2.3