Include properly CleanUp error message in i18n message

2 files changed, 14 insertions, 15 deletions

diff --git a/app/controllers/clean_ups_controller.rb b/app/controllers/clean_ups_controller.rb
index fde015efd..6c0df0830 100644
--- a/app/controllers/clean_ups_controller.rb
+++ b/app/controllers/clean_ups_controller.rb
@@ -1,22 +1,22 @@
 class CleanUpsController < ChouetteController
   respond_to :html, :only => [:create]
 
-  belongs_to :referential 
+  belongs_to :referential
 
   def create
-    clean_up = CleanUp.new( params[:clean_up])
+    clean_up = CleanUp.new(params[:clean_up])
+
     if clean_up.invalid?
       flash[:alert] = clean_up.errors.full_messages.join("<br/>")
     else
       begin
         result = clean_up.clean
         flash[:notice] = result.notice.join("<br/>")
-      rescue
-        flash[:alert] = t('clean_ups.failure') + $!
+      rescue => e
+        flash[:alert] = t('clean_ups.failure', error_message: e.to_s)
       end
     end
     redirect_to referential_path(@referential)
-
   end
-  
+
 end
diff --git a/config/locales/clean_ups.yml b/config/locales/clean_ups.yml
index 48d22981e..1776d8e0b 100644
--- a/config/locales/clean_ups.yml
+++ b/config/locales/clean_ups.yml
@@ -9,22 +9,22 @@ en:
     success_c: "%{count} companies deleted"
     success_n: "%{count} networks deleted"
     success_g: "%{count} groups of lines deleted"
-    failure: "Fail when clean_up"
+    failure: "Fail when clean_up : %{error_message}"
     actions:
       clean_up: "clean up"
       confirm: "Clean up will destroy time tables which ended on requested date\nand next recursively all object without any time table\nPlease confirm this action"
-  activemodel:        
+  activemodel:
     attributes:
       clean_up:
         expected_date: "Final date : "
-        keep_lines: "keep lines" 
+        keep_lines: "keep lines"
         keep_stops: "keep stop areas"
         keep_companies: "keep companies"
         keep_networks: "keep networks"
         keep_group_of_lines: "keep groups of lines"
   titles:
     clean_up:
-      expected_date: "value included in clean up"  
+      expected_date: "value included in clean up"
 fr:
   clean_ups:
     success_tm: "%{count} calendrier(s) supprimé(s)"
@@ -36,7 +36,7 @@ fr:
     success_c: "%{count} transporteur(s) supprimé(s)"
     success_n: "%{count} réseau(x) supprimé(s)"
     success_g: "%{count} groupe(s) de lignes supprimé(s)"
-    failure: "Echec de la purge "
+    failure: "Echec de la purge : %{error_message}"
     actions:
       clean_up: "Purger"
       confirm: "La purge détruit les calendriers se finissant au plus tard à la date indiquée \npuis en cascade les objets qui n'ont pas ou plus de calendrier\nConfirmer cette action SVP"
@@ -44,12 +44,11 @@ fr:
     attributes:
       clean_up:
         expected_date: "Date limite : "
-        keep_lines: "conserver les lignes" 
+        keep_lines: "conserver les lignes"
         keep_stops: "conserver les arrêts"
-        keep_companies: "conserver les transporteurs" 
+        keep_companies: "conserver les transporteurs"
         keep_networks: "conserver les réseaux"
         keep_group_of_lines: "conserver les groupes de lignes"
   titles:
     clean_up:
-      expected_date: "valeur incluse dans la purge"  
-
+      expected_date: "valeur incluse dans la purge"