Rework locale selection

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 01822656609cc58f710011be937492979b2bb210..a9bc0d10170a9aea10b6f68df9e01408edf6da1e 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -175,14 +175,8 @@ class Notifier < ActionMailer::Base
   private
 
   def with_recipient_locale(recipient)
   private
 
   def with_recipient_locale(recipient)

-    old_locale = I18n.locale
-
-    begin
-      I18n.locale = recipient.preferred_language_from(I18n.available_locales)
-
+    I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do

       yield
       yield

-    ensure
-      I18n.locale = old_locale

     end
   end
 
     end
   end