X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14ac1babc2517320a2c90fa9b4ac36a5a6e68018..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index b1a94a77d..be7b8d145 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -166,7 +166,7 @@ class Notifier < ActionMailer::Base end end -private + private def with_recipient_locale(recipient) old_locale = I18n.locale @@ -181,8 +181,8 @@ private end def from_address(name, type, id, digest) - if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN - "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>" + if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN + "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>" else EMAIL_FROM end