diff options
| author | cedricnjanga | 2017-07-06 14:52:19 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-07-06 14:52:19 +0200 |
| commit | 89c704a459bcd72cf9c720ccb034b3c877ea2525 (patch) | |
| tree | 2ac61acbebd9d0f10a3b01a5e83d1ed0ff588ab1 | |
| parent | 6f63feeb32883b57d05bed7f3817e01caba12289 (diff) | |
| download | chouette-core-89c704a459bcd72cf9c720ccb034b3c877ea2525.tar.bz2 | |
Change format of error message format + some typos
| -rw-r--r-- | app/assets/javascripts/cleanup.coffee | 6 | ||||
| -rw-r--r-- | app/models/clean_up.rb | 2 | ||||
| -rw-r--r-- | 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}' |