Merge remote-tracking branch 'upstream/pull/5312'

[rails.git] / app / mailers / user_mailer.rb

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 86e77703b697569f021e281e575349c8595753b2..dee3dafbed35562ab865f11c64fcad4d61e8a067 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -247,8 +247,8 @@ class UserMailer < ApplicationMailer
     end
   end
 
     end
   end
 

-  def with_recipient_locale(recipient, &block)
-    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
+  def with_recipient_locale(recipient, &)
+    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &)

   end
 
   def from_address(name, type, id, token, user_id = nil)
   end
 
   def from_address(name, type, id, token, user_id = nil)