diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
| commit | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (patch) | |
| tree | cf6269fa490b4533999d68acb969a1a86447666b /app/views/notification_mailer | |
| parent | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff) | |
| parent | ff6b8a6443c2c97d185927053bdc8816e0e03434 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views/notification_mailer')
| -rw-r--r-- | app/views/notification_mailer/_status.html.haml | 5 | ||||
| -rw-r--r-- | app/views/notification_mailer/_status.text.erb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index f82ada146..57b5688bd 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -24,6 +24,11 @@ %bdi= display_name(status.account) = "@#{status.account.acct}" + - if status.spoiler_text? + %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' } + %p + = Formatter.instance.format_spoiler(status) + %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' } = Formatter.instance.format(status) diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb index 85a0136b7..8999a1f8e 100644 --- a/app/views/notification_mailer/_status.text.erb +++ b/app/views/notification_mailer/_status.text.erb @@ -1,3 +1,8 @@ +<% if status.spoiler_text? %> +<%= raw status.spoiler_text %> +---- + +<% end %> <%= raw Formatter.instance.plaintext(status) %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> |