nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5578 from gdpelican/bugfix/json-exporter

Browse source 
Fix bad email formatting
This commit is contained in:
Jonne Haß 2015-01-20 13:32:18 +01:00
commit 3674a5a00c
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/mailers/export_mailer.rb
View file

@ -4,7 +4,7 @@ class ExportMailer < ActionMailer::Base
def export_complete_for(user)
@user = user
mail(to: @user.email, subject: I18n.t('notifier.export_email.subject')) do |format|
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.deliver
@ -13,7 +13,7 @@ class ExportMailer < ActionMailer::Base
def export_failure_for(user)
@user = user
mail(to: @user.email, subject: I18n.t('notifier.export_failure_email.subject')) do |format|
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.deliver

2
app/views/users/export_email.markerb
View file

@ -1 +1 @@
<%= t('notifier.export_email.body', url: @user.export.url, username: @user.username) %>
<%= t('notifier.export_email.body', url: download_profile_user_url, name: @user.first_name) %>

2
app/views/users/export_failure_email.markerb
View file

@ -1 +1 @@
<%= t('notifier.export_failure_email.body', username: @user.username) %>
<%= t('notifier.export_failure_email.body', name: @user.first_name) %>

10
config/locales/diaspora/en.yml
View file

@ -782,19 +782,19 @@ en:
[1]: %{url}
export_email:
subject: "Your personal data is ready for download, %{username}"
subject: "Your personal data is ready for download, %{name}"
body: |-
Hello %{username}
Hello %{name},
Your data has been processed and is ready for download by following [this link][%{url}].
Your data has been processed and is ready for download by following [this link](%{url}).
Cheers,
The diaspora* email robot!
export_failure_email:
subject: "We're sorry, there was an issue with your data, %{username}"
subject: "We're sorry, there was an issue with your data, %{name}"
body: |-
Hello %{username}
Hello %{name}
We''ve encountered an issue while processing your personal data for download.
Please try again!