def signup_confirm(user, token)
with_recipient_locale user do
- # If we are passed an email address verification token, create
- # the confirumation URL for account activation.
- #
- # Otherwise the email has already been verified e.g. through
- # a trusted openID provider and the account is active and a
- # confirmation URL is not needed.
- if token
- @url = url_for(:host => SERVER_URL,
- :controller => "user", :action => "confirm",
- :display_name => user.display_name,
- :confirm_string => token.token)
- end
+ @url = url_for(:host => SERVER_URL,
+ :controller => "user", :action => "confirm",
+ :display_name => user.display_name,
+ :confirm_string => token.token)
mail :to => user.email,
- :subject => I18n.t('notifier.signup_confirm.subject')
+ :subject => I18n.t("notifier.signup_confirm.subject")
end
end
:confirm_string => token.token)
mail :to => user.new_email,
- :subject => I18n.t('notifier.email_confirm.subject')
+ :subject => I18n.t("notifier.email_confirm.subject")
end
end
:token => token.token)
mail :to => user.email,
- :subject => I18n.t('notifier.lost_password.subject')
+ :subject => I18n.t("notifier.lost_password.subject")
end
end
@possible_points = possible_points
mail :to => trace.user.email,
- :subject => I18n.t('notifier.gpx_notification.success.subject')
+ :subject => I18n.t("notifier.gpx_notification.success.subject")
end
end
@error = error
mail :to => trace.user.email,
- :subject => I18n.t('notifier.gpx_notification.failure.subject')
+ :subject => I18n.t("notifier.gpx_notification.failure.subject")
end
end
mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
:to => message.recipient.email,
- :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title)
+ :subject => I18n.t("notifier.message_notification.subject_header", :subject => message.title)
end
end
- def diary_comment_notification(comment)
- with_recipient_locale comment.diary_entry.user do
- @to_user = comment.diary_entry.user.display_name
+ def diary_comment_notification(comment, recipient)
+ with_recipient_locale recipient do
+ @to_user = recipient.display_name
@from_user = comment.user.display_name
@text = comment.body
@title = comment.diary_entry.title
:display_name => comment.user.display_name,
:title => "Re: #{comment.diary_entry.title}")
- mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
- :to => comment.diary_entry.user.email,
- :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name)
+ mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
+ :to => recipient.email,
+ :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
end
end
def friend_notification(friend)
with_recipient_locale friend.befriendee do
@friend = friend
+ @viewurl = url_for(:host => SERVER_URL,
+ :controller => "user", :action => "view",
+ :display_name => @friend.befriender.display_name)
+ @friendurl = url_for(:host => SERVER_URL,
+ :controller => "user", :action => "make_friend",
+ :display_name => @friend.befriender.display_name)
mail :to => friend.befriendee.email,
- :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name)
+ :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
end
end
def note_comment_notification(comment, recipient)
with_recipient_locale recipient do
@noteurl = browse_note_url(comment.note, :host => SERVER_URL)
- @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, @locale)
+ @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
@comment = comment.body
@owner = recipient == comment.note.author
@event = comment.event
- if comment.author
- @commenter = comment.author.display_name
- else
- @commenter = I18n.t("notifier.note_comment_notification.anonymous")
- end
+ @commenter = if comment.author
+ comment.author.display_name
+ else
+ I18n.t("notifier.note_comment_notification.anonymous")
+ end
- if @owner
- subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
- else
- subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
- end
+ subject = if @owner
+ I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
+ else
+ I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
+ end
mail :to => recipient.email, :subject => subject
end
end
-private
+ def changeset_comment_notification(comment, recipient)
+ with_recipient_locale recipient do
+ @root_url = root_url(:host => SERVER_URL)
+ @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
+ @comment = comment.body
+ @owner = recipient == comment.changeset.user
+ @commenter = comment.author.display_name
+ @commenter_url = user_url(comment.author.display_name, :host => SERVER_URL)
+ @changeset_comment = comment.changeset.tags["comment"].presence
+ @time = comment.created_at
+ @changeset_author = comment.changeset.user.display_name
+
+ subject = if @owner
+ I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+ else
+ I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
+ end
+
+ attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
+ attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
- def with_recipient_locale(recipient)
- old_locale = I18n.locale
+ mail :to => recipient.email, :subject => subject
+ end
+ end
- begin
- I18n.locale = recipient.preferred_language_from(I18n.available_locales)
+ private
+
+ def user_avatar_file_path(user)
+ image = user.image
+ if image.file?
+ return image.path(:small)
+ else
+ return "#{Rails.root}/app/assets/images/users/images/small.png"
+ end
+ end
+ def with_recipient_locale(recipient)
+ I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do
yield
- ensure
- I18n.locale = old_locale
end
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}>"
+ def from_address(name, type, id, digest, user_id = nil)
+ if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
+ if user_id
+ "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
+ else
+ "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+ end
else
EMAIL_FROM
end
projects / rails.git / blobdiff