mastofe

commit: eed7484cd6541b93452cd7aa62a3f61c361c89cc
parent: 02194838dd64558cd974e68cb0bf800dffd25c91
Author: mayaeh <mayaeh@marimo-net.org>
Date:   Wed, 17 Jan 2018 20:41:24 +0900

Change mailer image url (#6279)

* Change image URL in mailer to full path

* Add application_mailer.view_profile localization.

Diffstat:
M
app/views/notification_mailer/favourite.html.haml
2
+-
M
app/views/notification_mailer/follow.html.haml
2
+-
M
app/views/notification_mailer/follow_request.html.haml
2
+-
M
app/views/notification_mailer/mention.html.haml
2
+-
M
app/views/notification_mailer/reblog.html.haml
2
+-
M
config/locales/en.yml
1
+

6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag asset_pack_path('icon_grade.svg')
+                                      = image_tag full_pack_url('icon_grade.svg'), alt:''
 
                               %h1= t 'notification_mailer.favourite.title'
                               %p.lead= t('notification_mailer.favourite.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag asset_pack_path('icon_person_add.svg')
+                                      = image_tag full_pack_url('icon_person_add.svg'), alt: ''
 
                               %h1= t 'notification_mailer.follow.title'
                               %p.lead= t('notification_mailer.follow.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag asset_pack_path('icon_person_add.svg')
+                                      = image_tag full_pack_url('icon_person_add.svg'), alt: ''
 
                               %h1= t 'notification_mailer.follow_request.title'
                               %p.lead= t('notification_mailer.follow_request.body', name: @account.acct)
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag asset_pack_path('icon_reply.svg')
+                                      = image_tag full_pack_url('icon_reply.svg'), alt: ''
 
                               %h1= t 'notification_mailer.mention.title'
                               %p.lead= t('notification_mailer.mention.body', name: @status.account.acct)
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag asset_pack_path('icon_cached.svg')
+                                      = image_tag full_pack_url('icon_cached.svg'), alt: ''
 
                               %h1= t 'notification_mailer.reblog.title'
                               %p.lead= t('notification_mailer.reblog.body', name: @account.acct)
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -343,6 +343,7 @@ en:
     settings: 'Change e-mail preferences: %{link}'
     signature: Mastodon notifications from %{instance}
     view: 'View:'
+    view_profile: View Profile
     view_status: View status
   applications:
     created: Application successfully created