Merge branch 'next-minor'v0.7.18.0

1 files changed, 15 insertions, 22 deletions

diff --git a/app/mailers/export_mailer.rb b/app/mailers/export_mailer.rb
index da4af5f30..e7219353d 100644
--- a/app/mailers/export_mailer.rb
+++ b/app/mailers/export_mailer.rb
@@ -2,38 +2,31 @@
 
 class ExportMailer < ApplicationMailer
   def export_complete_for(user)
-    @user = user
-
-    mail(to: @user.email, subject: I18n.t('notifier.export_email.subject', name: @user.name)) do |format|
-      format.html { render 'users/export_email' }
-      format.text { render 'users/export_email' }
-    end
+    send_mail(user, I18n.t("notifier.export_email.subject", name: user.name),
+              I18n.t("notifier.export_email.body", url: download_profile_user_url, name: user.first_name))
   end
 
   def export_failure_for(user)
-    @user = user
-
-    mail(to: @user.email, subject: I18n.t('notifier.export_failure_email.subject', name: @user.name)) do |format|
-      format.html { render 'users/export_failure_email' }
-      format.text { render 'users/export_failure_email' }
-    end
+    send_mail(user, I18n.t("notifier.export_failure_email.subject", name: user.name),
+              I18n.t("notifier.export_failure_email.body", name: user.first_name))
   end
 
   def export_photos_complete_for(user)
-    @user = user
-
-    mail(to: @user.email, subject: I18n.t('notifier.export_photos_email.subject', name: @user.name)) do |format|
-      format.html { render 'users/export_photos_email' }
-      format.text { render 'users/export_photos_email' }
-    end
+    send_mail(user, I18n.t("notifier.export_photos_email.subject", name: user.name),
+              I18n.t("notifier.export_photos_email.body", url: download_photos_user_url, name: user.first_name))
   end
 
   def export_photos_failure_for(user)
-    @user = user
+    send_mail(user, I18n.t("notifier.export_photos_failure_email.subject", name: user.name),
+              I18n.t("notifier.export_photos_failure_email.body", name: user.first_name))
+  end
+
+  private
 
-    mail(to: @user.email, subject: I18n.t('notifier.export_photos_failure_email.subject', name: @user.name)) do |format|
-      format.html { render 'users/export_photos_failure_email' }
-      format.text { render 'users/export_photos_failure_email' }
+  def send_mail(user, subject, body)
+    mail(to: user.email, subject: subject) do |format|
+      format.html { render "notifier/plain_markdown_email", locals: {body: body} }
+      format.text { render "notifier/plain_markdown_email", locals: {body: body} }
     end
   end
 end