X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..4028f4cdb91f616bc774dc9b9fa8c7183eb1f6dd:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 018226566..a9bc0d101 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -175,14 +175,8 @@ class Notifier < ActionMailer::Base
   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
-    ensure
-      I18n.locale = old_locale
     end
   end